inline some use-once typedefs

Change-Id: I02cbbba56a2ad83e0ac3d806265a7e0d6a29594d
Reviewed-on: https://gerrit.libreoffice.org/17495
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

6 files changed, 21 insertions, 30 deletions

diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx
index 4dca7093f4d1..27c7f9afe5af 100644
--- a/xmloff/inc/XMLEventImportHelper.hxx
+++ b/xmloff/inc/XMLEventImportHelper.hxx
@@ -36,7 +36,6 @@ struct XMLEventNameTranslation;
 
 typedef ::std::map< OUString, XMLEventContextFactory* > FactoryMap;
 typedef ::std::map< XMLEventName, OUString > NameMap;
-typedef ::std::list< NameMap* > NameMapList;
 
 
 /**
@@ -61,7 +60,7 @@ class XMLEventImportHelper
     NameMap* pEventNameMap;
 
     /// stack of previous aEventNameMap
-    NameMapList aEventNameMapList;
+    std::list< NameMap* > aEventNameMapList;
 
 public:
     XMLEventImportHelper();
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 3f9d42dc593b..178fa5833a59 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -43,13 +43,10 @@ namespace basegfx
     class B3DHomMatrix;
 }
 
-typedef ::std::vector< ImpSdXMLExpTransObj2DBase* > ImpSdXMLExpTransObj2DBaseList;
-typedef ::std::vector< ImpSdXMLExpTransObj3DBase* > ImpSdXMLExpTransObj3DBaseList;
-
 class SdXMLImExTransform2D
 {
-    ImpSdXMLExpTransObj2DBaseList   maList;
-    OUString                   msString;
+    std::vector< ImpSdXMLExpTransObj2DBase* > maList;
+    OUString                                  msString;
 
     void EmptyList();
 
@@ -69,8 +66,8 @@ public:
 
 class SdXMLImExTransform3D
 {
-    ImpSdXMLExpTransObj3DBaseList   maList;
-    OUString                   msString;
+    std::vector< ImpSdXMLExpTransObj3DBase* > maList;
+    OUString                                  msString;
 
     void EmptyList();
 
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 1f21426bbfbd..8088a5fc2756 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -151,8 +151,6 @@ struct SdXMLltXDrawPageId
   }
 };
 
-typedef std::map< sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >, SdXMLltXDrawPageId > DrawPageIdMap;
-
 class SvXMLUnitConverter;
 class SvXMLTokenMap;
 class SdXMLMasterStylesContext;
@@ -194,14 +192,15 @@ class SdXMLImport: public SvXMLImport
     sal_Int32                   mnNewPageCount;
     sal_Int32                   mnNewMasterPageCount;
 
-    bool                    mbIsDraw;
-    bool                    mbLoadDoc;
-    bool                    mbPreview;
+    bool                        mbIsDraw;
+    bool                        mbLoadDoc;
+    bool                        mbPreview;
 
-    DrawPageIdMap               maDrawPageIds;
+    std::map< sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >, SdXMLltXDrawPageId >
+                                maDrawPageIds;
 
-    OUString             msPageLayouts;
-    OUString             msPreview;
+    OUString                    msPageLayouts;
+    OUString                    msPreview;
 
     HeaderFooterDeclMap         maHeaderDeclsMap;
     HeaderFooterDeclMap         maFooterDeclsMap;
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 1e3e893d1b90..52fb0824ad5a 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -55,8 +55,6 @@ struct ltint32
   }
 };
 
-typedef std::map<sal_Int32,com::sun::star::uno::Reference< com::sun::star::drawing::XShape >,ltint32> IdShapeMap;
-
 struct ConnectionHint
 {
     com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxConnector;
@@ -97,7 +95,8 @@ struct XMLShapeImportHelperImpl
     // context for sorting shapes
     ShapeSortContext*           mpSortContext;
 
-    IdShapeMap                  maShapeIds;
+    std::map<sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XShape >, ltint32>
+                                maShapeIds;
 
     std::vector<ConnectionHint> maConnections;
 
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 593ff1892fed..cb05a6ab13d3 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -120,7 +120,6 @@ public:
     const OUString& GetDisplayName() const { return msDisplayName; }
 
 };
-typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList;
 
 // presentation:placeholder context
 
@@ -146,15 +145,15 @@ public:
     const OUString& GetName() const { return msName; }
     sal_Int32 GetX() const { return mnX; }
 };
-typedef ::std::vector< SdXMLPresentationPlaceholderContext* > ImpPlaceholderList;
 
 // style:presentation-page-layout context
 
 class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext
 {
     OUString               msName;
-    ImpPlaceholderList          maList;
-    sal_uInt16                  mnTypeId;
+    std::vector< SdXMLPresentationPlaceholderContext* >
+                           maList;
+    sal_uInt16             mnTypeId;
 
     const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
     SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
@@ -235,7 +234,7 @@ public:
 
 class SdXMLMasterStylesContext : public SvXMLImportContext
 {
-    ImpMasterPageList           maMasterPageList;
+    std::vector< SdXMLMasterPageContext* > maMasterPageList;
 
     const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
     SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 700cbae229c1..6a80964fc450 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -60,12 +60,10 @@ struct SvXMLNumFmtEntry
         aName(rN), nKey(nK), bRemoveAfterUse(bR) {}
 };
 
-typedef ::boost::ptr_vector<SvXMLNumFmtEntry> SvXMLNumFmtEntryArr;
-
 struct SvXMLEmbeddedElement
 {
-    sal_Int32       nFormatPos;
-    OUString   aText;
+    sal_Int32    nFormatPos;
+    OUString     aText;
 
     SvXMLEmbeddedElement( sal_Int32 nFP, const OUString& rT ) :
         nFormatPos(nFP), aText(rT) {}
@@ -83,7 +81,7 @@ class SvXMLNumImpData
     SvXMLTokenMap*      pStyleAttrTokenMap;
     SvXMLTokenMap*      pStyleElemAttrTokenMap;
     LocaleDataWrapper*  pLocaleData;
-    SvXMLNumFmtEntryArr aNameEntries;
+    boost::ptr_vector<SvXMLNumFmtEntry>      aNameEntries;
 
     uno::Reference< uno::XComponentContext > m_xContext;