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/menu/mnuitem.cxx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'sfx2/source/menu')

diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index ebe6439853f9..ce1d1bb08ee2 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -51,7 +51,6 @@
 #include "virtmenu.hxx"
 #include <sfx2/mnuitem.hxx>
 #include <sfx2/tbxctrl.hxx>
-#include "arrdecl.hxx"
 #include <sfx2/module.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -272,20 +271,20 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB
             {
                 SfxMenuCtrlFactArr_Impl &rFactories = *pFactories;
                 for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory )
-                    if ( rFactories[nFactory]->nTypeId == aSlotType &&
-                         ( ( rFactories[nFactory]->nSlotId == 0 ) ||
-                           ( rFactories[nFactory]->nSlotId == nId) ) )
-                        return rFactories[nFactory]->pCtor( nId, rMenu, rBindings );
+                    if ( rFactories[nFactory].nTypeId == aSlotType &&
+                         ( ( rFactories[nFactory].nSlotId == 0 ) ||
+                           ( rFactories[nFactory].nSlotId == nId) ) )
+                        return rFactories[nFactory].pCtor( nId, rMenu, rBindings );
             }
         }
 
         SfxMenuCtrlFactArr_Impl &rFactories = pApp->GetMenuCtrlFactories_Impl();
 
         for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory )
-            if ( rFactories[nFactory]->nTypeId == aSlotType &&
-                 ( ( rFactories[nFactory]->nSlotId == 0 ) ||
-                   ( rFactories[nFactory]->nSlotId == nId) ) )
-                return rFactories[nFactory]->pCtor( nId, rMenu, rBindings );
+            if ( rFactories[nFactory].nTypeId == aSlotType &&
+                 ( ( rFactories[nFactory].nSlotId == 0 ) ||
+                   ( rFactories[nFactory].nSlotId == nId) ) )
+                return rFactories[nFactory].pCtor( nId, rMenu, rBindings );
     }
     return 0;
 }
-- 
cgit