From a247b8257a904372fcc2330bd8820176d4a71ebd Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Tue, 12 Aug 2014 23:58:14 +0900
Subject: 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>
---
 sfx2/source/statbar/stbitem.cxx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'sfx2/source/statbar')

diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 3de5bcd9ab84..942279b4b04a 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -33,7 +33,6 @@
 #include <sfx2/stbitem.hxx>
 #include "sfxtypes.hxx"
 #include <sfx2/msg.hxx>
-#include "arrdecl.hxx"
 #include <sfx2/bindings.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/module.hxx>
@@ -644,19 +643,19 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
             {
                 SfxStbCtrlFactArr_Impl &rFactories = *pFactories;
                 for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory )
-                if ( rFactories[nFactory]->nTypeId == aSlotType &&
-                     ( ( rFactories[nFactory]->nSlotId == 0 ) ||
-                     ( rFactories[nFactory]->nSlotId == nSlotID) ) )
-                    return rFactories[nFactory]->pCtor( nSlotID, nStbId, *pBar );
+                if ( rFactories[nFactory].nTypeId == aSlotType &&
+                     ( ( rFactories[nFactory].nSlotId == 0 ) ||
+                     ( rFactories[nFactory].nSlotId == nSlotID) ) )
+                    return rFactories[nFactory].pCtor( nSlotID, nStbId, *pBar );
             }
         }
 
         SfxStbCtrlFactArr_Impl &rFactories = pApp->GetStbCtrlFactories_Impl();
         for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory )
-        if ( rFactories[nFactory]->nTypeId == aSlotType &&
-             ( ( rFactories[nFactory]->nSlotId == 0 ) ||
-             ( rFactories[nFactory]->nSlotId == nSlotID) ) )
-            return rFactories[nFactory]->pCtor( nSlotID, nStbId, *pBar );
+        if ( rFactories[nFactory].nTypeId == aSlotType &&
+             ( ( rFactories[nFactory].nSlotId == 0 ) ||
+             ( rFactories[nFactory].nSlotId == nSlotID) ) )
+            return rFactories[nFactory].pCtor( nSlotID, nStbId, *pBar );
     }
 
     return NULL;
-- 
cgit