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/appl/module.cxx | |
| 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/appl/module.cxx')
| -rw-r--r-- | sfx2/source/appl/module.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index fe416c37431d..3c783fe5cbf3 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -23,7 +23,6 @@ #include <cstdarg> #include <sfx2/module.hxx> #include <sfx2/app.hxx> -#include "arrdecl.hxx" #include <sfx2/sfxresid.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/tbxctrl.hxx> @@ -190,7 +189,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) for (sal_uInt16 nFactory=0; nFactory<pImpl->pFactArr->size(); ++nFactory) { - if (pFact->nId == (*pImpl->pFactArr)[nFactory]->nId) + if (pFact->nId == (*pImpl->pFactArr)[nFactory].nId) { pImpl->pFactArr->erase( pImpl->pFactArr->begin() + nFactory ); SAL_WARN("sfx.appl", "ChildWindow registered multiple times!"); @@ -211,7 +210,7 @@ void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact ) #ifdef DBG_UTIL for ( sal_uInt16 n=0; n<pImpl->pTbxCtrlFac->size(); n++ ) { - SfxTbxCtrlFactory *pF = (*pImpl->pTbxCtrlFac)[n]; + SfxTbxCtrlFactory *pF = &(*pImpl->pTbxCtrlFac)[n]; if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { @@ -233,7 +232,7 @@ void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact ) #ifdef DBG_UTIL for ( sal_uInt16 n=0; n<pImpl->pStbCtrlFac->size(); n++ ) { - SfxStbCtrlFactory *pF = (*pImpl->pStbCtrlFac)[n]; + SfxStbCtrlFactory *pF = &(*pImpl->pStbCtrlFac)[n]; if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { @@ -255,7 +254,7 @@ void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact ) #ifdef DBG_UTIL for ( sal_uInt16 n=0; n<pImpl->pMenuCtrlFac->size(); n++ ) { - SfxMenuCtrlFactory *pF = (*pImpl->pMenuCtrlFac)[n]; + SfxMenuCtrlFactory *pF = &(*pImpl->pMenuCtrlFac)[n]; if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { |