shell,sfx2,sd: inline some use-once typedefs

Change-Id: Ifde52b0d92163f99d399b4a9544a196defad1ba4

6 files changed, 28 insertions, 37 deletions

diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 8306dfe5f5a6..1fc4e524f59f 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -53,24 +53,22 @@ typedef boost::ptr_map<sal_uInt16, SfxPoolItem> SfxItemPtrMap;
 
 TYPEINIT0(SfxShell);
 
-typedef boost::ptr_vector<SfxSlot> SfxVerbSlotArr_Impl;
-
 using namespace com::sun::star;
 
 struct SfxShell_Impl: public SfxBroadcaster
 {
-    OUString                 aObjectName;   // Name of Sbx-Objects
-    SfxItemPtrMap            aItems;        // Data exchange on Item level
-    SfxViewShell*            pViewSh;       // SfxViewShell if Shell is
+    OUString                    aObjectName;   // Name of Sbx-Objects
+    SfxItemPtrMap               aItems;        // Data exchange on Item level
+    SfxViewShell*               pViewSh;       // SfxViewShell if Shell is
                                             // ViewFrame/ViewShell/SubShell list
-    SfxViewFrame*            pFrame;        // Frame, if  <UI-active>
-    SfxRepeatTarget*         pRepeatTarget; // SbxObjectRef xParent;
+    SfxViewFrame*               pFrame;        // Frame, if  <UI-active>
+    SfxRepeatTarget*            pRepeatTarget; // SbxObjectRef xParent;
     bool                        bActive;
     sal_uIntPtr                 nDisableFlags;
     sal_uIntPtr                 nHelpId;
     svtools::AsynchronLink*     pExecuter;
     svtools::AsynchronLink*     pUpdater;
-    SfxVerbSlotArr_Impl         aSlotArr;
+    boost::ptr_vector<SfxSlot>  aSlotArr;
 
     com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aVerbList;
     ::sfx2::sidebar::ContextChangeBroadcaster maContextChangeBroadcaster;
diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index 595e1b481277..c073542f6e58 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -167,8 +167,6 @@ void ColorListBoxWrapper::SetControlValue( Color aColor )
 
 
 typedef std::vector< ControlWrapperBase* >  ControlWrpVec;
-typedef ControlWrpVec::iterator             ControlWrpVecI;
-typedef ControlWrpVec::const_iterator       ControlWrpVecCI;
 
 struct MultiControlWrapperHelper_Impl
 {
@@ -191,21 +189,21 @@ void MultiControlWrapperHelper::RegisterControlWrapper( ControlWrapperBase& rWra
 
 void MultiControlWrapperHelper::ModifyControl( TriState eEnable, TriState eShow )
 {
-    for( ControlWrpVecI aIt = mxImpl->maVec.begin(), aEnd = mxImpl->maVec.end(); aIt != aEnd; ++aIt )
+    for( ControlWrpVec::iterator aIt = mxImpl->maVec.begin(), aEnd = mxImpl->maVec.end(); aIt != aEnd; ++aIt )
         (*aIt)->ModifyControl( eEnable, eShow );
 }
 
 bool MultiControlWrapperHelper::IsControlDontKnow() const
 {
     bool bIs = !mxImpl->maVec.empty();
-    for( ControlWrpVecCI aIt = mxImpl->maVec.begin(), aEnd = mxImpl->maVec.end(); bIs && (aIt != aEnd); ++aIt )
+    for( ControlWrpVec::const_iterator aIt = mxImpl->maVec.begin(), aEnd = mxImpl->maVec.end(); bIs && (aIt != aEnd); ++aIt )
         bIs &= (*aIt)->IsControlDontKnow();
     return bIs;
 }
 
 void MultiControlWrapperHelper::SetControlDontKnow( bool bSet )
 {
-    for( ControlWrpVecI aIt = mxImpl->maVec.begin(), aEnd = mxImpl->maVec.end(); aIt != aEnd; ++aIt )
+    for( ControlWrpVec::iterator aIt = mxImpl->maVec.begin(), aEnd = mxImpl->maVec.end(); aIt != aEnd; ++aIt )
         (*aIt)->SetControlDontKnow( bSet );
 }
 
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 33592178024c..d04ab9546777 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -64,12 +64,10 @@ struct SfxVersionInfo
                             SfxVersionInfo();
 };
 
-typedef vector< SfxVersionInfo* > _SfxVersionTable;
-
 class SfxVersionTableDtor: private boost::noncopyable
 {
 private:
-    _SfxVersionTable        aTableList;
+    std::vector< SfxVersionInfo* >  aTableList;
 public:
                             SfxVersionTableDtor( const uno::Sequence < util::RevisionTag >& rInfo );
                             SfxVersionTableDtor( const uno::Sequence < document::CmisVersion > & rInfo );
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 2c728c085020..0e9984acaea1 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -153,7 +153,6 @@ class Updater_Impl;
 class DocTemplates_EntryData_Impl;
 class GroupData_Impl;
 
-typedef vector< NamePair_Impl* > NameList_Impl;
 typedef vector< GroupData_Impl* > GroupList_Impl;
 
 
@@ -185,12 +184,12 @@ class SfxDocTplService_Impl
     Sequence< OUString >        maTemplateDirs;
     Sequence< OUString >        maInternalTemplateDirs;
     OUString                    maRootURL;
-    NameList_Impl               maNames;
-    lang::Locale                      maLocale;
+    std::vector< NamePair_Impl* > maNames;
+    lang::Locale                maLocale;
     Content                     maRootContent;
     Updater_Impl*               mpUpdater;
-    bool                    mbIsInitialized : 1;
-    bool                    mbLocaleSet     : 1;
+    bool                        mbIsInitialized : 1;
+    bool                        mbLocaleSet     : 1;
 
     SfxURLRelocator_Impl        maRelocator;
 
@@ -198,7 +197,7 @@ class SfxDocTplService_Impl
     void                        getDefaultLocale();
     void                        getDirList();
     void                        readFolderList();
-    bool                    needsUpdate();
+    bool                        needsUpdate();
     OUString                    getLongName( const OUString& rShortName );
     bool                    setTitleForURL( const OUString& rURL, const OUString& aTitle );
     bool                    getTitleFromURL( const OUString& rURL, OUString& aTitle, OUString& aType, bool& bDocHasTitle );
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index e5e364844183..2d2386c86474 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -155,9 +155,6 @@ enum class SfxDockingConfig
     MOVEDOCKINGWINDOW
 };
 
-typedef std::vector<SfxChild_Impl*> SfxChildList_Impl;
-typedef std::vector<SfxChildWin_Impl*> SfxChildWindows_Impl;
-
 
 struct SfxObjectBarList_Impl
 {
@@ -221,8 +218,10 @@ protected:
     Rectangle               aUpperClientArea;
     SfxWorkWindow*          pParent;
     VclPtr<SfxSplitWindow>  pSplit[SFX_SPLITWINDOWS_MAX];
-    SfxChildList_Impl       aChildren;
-    SfxChildWindows_Impl    aChildWins;
+    std::vector<SfxChild_Impl*>
+                            aChildren;
+    std::vector<SfxChildWin_Impl*>
+                            aChildWins;
     SfxBindings*            pBindings;
     VclPtr<vcl::Window>     pWorkWin;
     SfxShell*               pConfigShell;
@@ -237,10 +236,10 @@ protected:
     bool                    bIsFullScreen : 1;
     bool                    bShowStatusBar : 1;
     sal_Int32               m_nLock;
-    OUString           m_aStatusBarResName;
-    OUString           m_aLayoutManagerPropName;
-    OUString           m_aTbxTypeName;
-    OUString           m_aProgressBarResName;
+    OUString                m_aStatusBarResName;
+    OUString                m_aLayoutManagerPropName;
+    OUString                m_aTbxTypeName;
+    OUString                m_aProgressBarResName;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xLayoutManagerListener;
 
 protected:
diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx
index d72c5faf1f55..ba5e655d6d9e 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -27,14 +27,14 @@ namespace sfx2 { namespace sidebar {
 namespace {
 
 typedef ::std::map<rtl::OUString,EnumContext::Application> ApplicationMap;
-typedef ::std::vector<rtl::OUString> ApplicationVector;
+
 static ApplicationMap maApplicationMap;
-static ApplicationVector maApplicationVector;
+static ::std::vector<rtl::OUString> maApplicationVector;
 
 typedef ::std::map<rtl::OUString,EnumContext::Context> ContextMap;
-typedef ::std::vector<rtl::OUString> ContextVector;
+
 static ContextMap maContextMap;
-static ContextVector maContextVector;
+static ::std::vector<rtl::OUString> maContextVector;
 
 }
 
@@ -211,8 +211,7 @@ EnumContext::Context EnumContext::GetContextEnum (const ::rtl::OUString& rsConte
 {
     ProvideContextContainers();
 
-    ContextMap::const_iterator iContext(
-        maContextMap.find(rsContextName));
+    ContextMap::const_iterator iContext( maContextMap.find(rsContextName) );
     if (iContext != maContextMap.end())
         return iContext->second;
     else