commit b93cfe09c21b996cd3f1c40037e0ebf712922006
author Caolán McNamara <caolanm@redhat.com> Wed Jul 13 20:20:31 2016 +0100
committer Caolán McNamara <caolanm@redhat.com> Wed Jul 13 20:20:31 2016 +0100
tree fc1e4d97640ab55aa20bd62c594f4cbc187eeeba
parent 9641e51cd71d537313f9b238a0bab73701128b3b

these can be references now

Change-Id: I4b58c362cd01387f05aa7bf70b3f47794fd5bc32

sfx2/source/control/msgpool.cxx

diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 1f9dec0..b771e1e 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -77,14 +77,14 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )

    for ( size_t nFunc = 0; nFunc < rInterface.Count(); ++nFunc )
    {
        SfxSlot *pDef = &rInterface.pSlots[nFunc];
        if ( pDef->GetGroupId() && /* pDef->GetGroupId() != GID_INTERN && */
             _pGroups->find(pDef->GetGroupId()) == SfxSlotGroupArr_Impl::npos )
        SfxSlot &rDef = rInterface.pSlots[nFunc];
        if ( rDef.GetGroupId() && /* rDef.GetGroupId() != GID_INTERN && */
             _pGroups->find(rDef.GetGroupId()) == SfxSlotGroupArr_Impl::npos )
        {
            if (pDef->GetGroupId() == GID_INTERN)
                _pGroups->insert(_pGroups->begin(), pDef->GetGroupId());
            if (rDef.GetGroupId() == GID_INTERN)
                _pGroups->insert(_pGroups->begin(), rDef.GetGroupId());
            else
                _pGroups->push_back(pDef->GetGroupId());
                _pGroups->push_back(rDef.GetGroupId());
        }
    }
}
@@ -216,9 +216,9 @@ const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface )
              _nCurMsg < pInterface->Count();
              ++_nCurMsg )
        {
            const SfxSlot* pMsg = &pInterface->pSlots[_nCurMsg];
            if ( pMsg->GetGroupId() == _pGroups->at(_nCurGroup) )
                return pMsg;
            const SfxSlot& rMsg = pInterface->pSlots[_nCurMsg];
            if (rMsg.GetGroupId() == _pGroups->at(_nCurGroup))
                return &rMsg;
        }
    }

@@ -261,9 +261,9 @@ const SfxSlot* SfxSlotPool::NextSlot()
    SfxInterface* pInterface = (*_pInterfaces)[nInterface];
    while ( ++_nCurMsg < pInterface->Count() )
    {
        SfxSlot* pMsg = &pInterface->pSlots[_nCurMsg];
        if ( pMsg->GetGroupId() == _pGroups->at(_nCurGroup) )
            return pMsg;
        SfxSlot& rMsg = pInterface->pSlots[_nCurMsg];
        if (rMsg.GetGroupId() == _pGroups->at(_nCurGroup))
            return &rMsg;
    }

    return SeekSlot(++_nCurInterface );