inline some use-once typedefs

Change-Id: Idddba2f3fd05265b08dbc88edb6152d34a166052
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94730
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 12 insertions, 21 deletions

diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index 23144a8fd5d5..3f2760babbad 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -142,10 +142,10 @@ private:
 
         explicit            Transformation( sal_Int32 nToken, sal_Int32 nValue ) : mnToken( nToken ), mnValue( nValue ) {}
     };
-    typedef ::std::vector< Transformation > TransformVec;
 
     mutable ColorMode   meMode;         /// Current color mode.
-    mutable TransformVec maTransforms;  /// Color transformations.
+    mutable std::vector< Transformation >
+                        maTransforms;  /// Color transformations.
     mutable sal_Int32   mnC1;           /// Red, red%, hue, scheme token, palette index, system token, or final RGB.
     mutable sal_Int32   mnC2;           /// Green, green%, saturation, or system default RGB.
     mutable sal_Int32   mnC3;           /// Blue, blue%, or luminance.
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index bab5eb4a077f..f3cdf0c0ca87 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -366,10 +366,10 @@ private:
         explicit     StreamProperty( const String& rItemName, sal_uInt16 nData ) :
                                 maItemName( rItemName ), mnData( nData ) {}
     };
-    typedef ::std::vector< StreamProperty > StreamPropertyVector;
 
     LargePropertyVector maLargeProps;
-    StreamPropertyVector maStreamProps;
+    std::vector< StreamProperty >
+                        maStreamProps;
     NameListRef         mxPropNames;
     sal_Int64           mnPropertiesStart;
     sal_Int64           mnPropertiesEnd;
@@ -548,13 +548,11 @@ struct VbaFormSiteInfo
     VbaFormSiteInfo() : mnId( 0 ), mnLength( 0 ), mbInStream( false ) {}
 };
 
-typedef ::std::vector< VbaFormSiteInfo > VbaFormSiteInfoVector;
-
 
 struct VbaFormSharedData
 {
-    OUStringVector      maClassInfoProgIds;
-    VbaFormSiteInfoVector maSiteInfos;
+    OUStringVector                 maClassInfoProgIds;
+    std::vector< VbaFormSiteInfo > maSiteInfos;
 };
 
 
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index 91fa5cdb0967..cc4705e6a046 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -77,9 +77,8 @@ private:
     static sal_Int32 getTokenPerfectHash( const char *pToken, sal_Int32 nLength );
     static const css::uno::Sequence< sal_Int8 > EMPTY_BYTE_SEQ;
 
-    typedef ::std::vector< css::uno::Sequence< sal_Int8 > > TokenNameVector;
-
-    TokenNameVector     maTokenNames;
+    std::vector< css::uno::Sequence< sal_Int8 > >
+                        maTokenNames;
     sal_Int32           mnAlphaTokens[26];
 };
 
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index f937ab1abb4f..8b8138d82e9b 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -47,8 +47,6 @@ struct UnknownAttribute
     void FillAttribute( css::xml::Attribute* pAttrib ) const;
 };
 
-typedef std::vector< UnknownAttribute > UnknownAttributeList;
-
 /// A native C++ interface to tokenisation
 class SAX_DLLPUBLIC FastTokenHandlerBase :
         public cppu::WeakImplHelper< css::xml::sax::XFastTokenHandler >
@@ -200,7 +198,7 @@ private:
     // maAttributeValues[0] == 0
     std::vector< sal_Int32 > maAttributeValues;
     std::vector< sal_Int32 > maAttributeTokens;
-    UnknownAttributeList maUnknownAttributes;
+    std::vector< UnknownAttribute > maUnknownAttributes;
     FastTokenHandlerBase * mpTokenHandler;
 };
 
diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index add32fffcada..041588f6fc11 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -41,12 +41,10 @@ public:
     const OUString &        GetHumanName() const { return aHumanName; }
 };
 
-typedef ::std::vector< SvObjectServer > SvObjectServerList_impl;
-
 class SVT_DLLPUBLIC SvObjectServerList
 {
 private:
-    SvObjectServerList_impl aObjectServerList;
+    std::vector< SvObjectServer > aObjectServerList;
 
 public:
     const SvObjectServer *  Get( const OUString & rHumanName ) const;
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 89122f51c75d..3152fa3bed56 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -222,12 +222,10 @@ struct SystemFontData
 
 #endif // ENABLE_CAIRO_CANVAS
 
-typedef std::vector<SystemGlyphData> SystemGlyphDataVector;
-
 struct SystemTextLayoutData
 {
-    SystemGlyphDataVector rGlyphData;    // glyph data
-    int                   orientation;   // Text orientation
+    std::vector<SystemGlyphData> rGlyphData;    // glyph data
+    int orientation;   // Text orientation
 };
 
 #endif // INCLUDED_VCL_SYSDATA_HXX