diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-08-12 23:58:14 +0900 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-13 08:53:48 -0500 |
| commit | a247b8257a904372fcc2330bd8820176d4a71ebd (patch) | |
| tree | a5b0c4e19be964abdd7cf680d9d10bb52d2ede42 /sfx2/source/toolbox | |
| parent | a8c503a69c467526ef80ec36b7916e7b931f9101 (diff) | |
fdo#75757: remove inheritance to std::vector
... by replacing the following 3 classes with typedefs of std::vector:
SfxObjectShellArr_Impl / SfxViewFrameArr_Impl / SfxViewShellArr_Impl
and the following 4 with typedefs of boost::ptr_vector:
SfxChildWinFactArr_Impl / SfxMenuCtrlFactArr_Impl /
SfxStbCtrlFactArr_Impl / SfxTbxCtrlFactArr_Impl
Change-Id: I1754bd19ec418a3e7ba5c47fb6d8568e8fca9b29
Reviewed-on: https://gerrit.libreoffice.org/10891
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sfx2/source/toolbox')
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index d4152af0f4b4..25781db35c10 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -76,7 +76,6 @@ #include <sfx2/msgpool.hxx> #include "statcach.hxx" #include <sfx2/viewfrm.hxx> -#include "arrdecl.hxx" #include "sfxtypes.hxx" #include <sfx2/genlink.hxx> #include <sfx2/sfxresid.hxx> @@ -331,7 +330,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn // search for a factory with the given slot id for( nFactory = 0; nFactory < nCount; ++nFactory ) - if( (rFactories[nFactory]->nTypeId == aSlotType) && (rFactories[nFactory]->nSlotId == nSlotId) ) + if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == nSlotId) ) break; if( nFactory == nCount ) @@ -339,14 +338,14 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn // if no factory exists for the given slot id, see if we // have a generic factory with the correct slot type and slot id == 0 for ( nFactory = 0; nFactory < nCount; ++nFactory ) - if( (rFactories[nFactory]->nTypeId == aSlotType) && (rFactories[nFactory]->nSlotId == 0) ) + if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == 0) ) break; } if( nFactory < nCount ) { - pCtrl = rFactories[nFactory]->pCtor( nSlotId, nTbxId, *pBox ); - pCtrl->pImpl->pFact = rFactories[nFactory]; + pCtrl = rFactories[nFactory].pCtor( nSlotId, nTbxId, *pBox ); + pCtrl->pImpl->pFact = &rFactories[nFactory]; return pCtrl; } } @@ -357,7 +356,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn const sal_uInt16 nCount = rFactories.size(); for( nFactory = 0; nFactory < nCount; ++nFactory ) - if( (rFactories[nFactory]->nTypeId == aSlotType) && (rFactories[nFactory]->nSlotId == nSlotId) ) + if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == nSlotId) ) break; if( nFactory == nCount ) @@ -365,14 +364,14 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn // if no factory exists for the given slot id, see if we // have a generic factory with the correct slot type and slot id == 0 for( nFactory = 0; nFactory < nCount; ++nFactory ) - if( (rFactories[nFactory]->nTypeId == aSlotType) && (rFactories[nFactory]->nSlotId == 0) ) + if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == 0) ) break; } if( nFactory < nCount ) { - pCtrl = rFactories[nFactory]->pCtor( nSlotId, nTbxId, *pBox ); - pCtrl->pImpl->pFact = rFactories[nFactory]; + pCtrl = rFactories[nFactory].pCtor( nSlotId, nTbxId, *pBox ); + pCtrl->pImpl->pFact = &rFactories[nFactory]; return pCtrl; } } |