remove unused typedefs and inline use-once typedefs

and improve the script a little

Change-Id: I2792ea4dd5df3a50736fbe209225c3f16fb86b84
Reviewed-on: https://gerrit.libreoffice.org/20033
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

8 files changed, 4 insertions, 43 deletions

diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index c8818b5f658e..b01edf37b9dc 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -42,7 +42,6 @@ namespace comphelper
         inline void SetInit ( bool bInit) { mbInit = bInit; }
     };
 }
-typedef std::map < sal_uInt8, comphelper::SlaveData* > SlaveMap;
 
 /*
  * A MasterPropertySet implements all of the features of a ChainablePropertySet
@@ -64,7 +63,7 @@ namespace comphelper
         MasterPropertySetInfo *mpInfo;
         SolarMutex* mpMutex;
         sal_uInt8 mnLastId;
-        SlaveMap maSlaveMap;
+        std::map < sal_uInt8, comphelper::SlaveData* >       maSlaveMap;
         css::uno::Reference < css::beans::XPropertySetInfo > mxInfo;
 
         virtual void _preSetValues ()
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index f845aea87be6..a93a50802e0d 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -257,8 +257,6 @@ private:
     bool mbMSO2007;
 };
 
-typedef ::rtl::Reference< XmlFilterBase > XmlFilterRef;
-
 } // namespace core
 } // namespace oox
 
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index b9865f8a541d..a01b9d114a1f 100644
--- a/include/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
@@ -288,11 +288,7 @@ public:
 
 
 
-typedef NumericFieldWrapper< sal_uInt16 > UInt16NumericFieldWrapper;
-typedef NumericFieldWrapper< sal_uInt32 > UInt32NumericFieldWrapper;
 
-typedef NumericFieldWrapper< sal_uInt16 > UShortNumericFieldWrapper;
-typedef NumericFieldWrapper< sal_uIntPtr >  ULongNumericFieldWrapper;
 
 
 
@@ -321,14 +317,6 @@ private:
 
 
 
-typedef MetricFieldWrapper< sal_Int16 >  Int16MetricFieldWrapper;
-typedef MetricFieldWrapper< sal_uInt16 > UInt16MetricFieldWrapper;
-typedef MetricFieldWrapper< sal_uInt32 > UInt32MetricFieldWrapper;
-
-typedef MetricFieldWrapper< sal_uInt16 > UShortMetricFieldWrapper;
-typedef MetricFieldWrapper< sal_uIntPtr >  ULongMetricFieldWrapper;
-
-
 
 #define WRAPPER_LISTBOX_ENTRY_NOTFOUND  0xFFFF  /* XXX was value of LISTBOX_ENTRY_NOTFOUND */
 
@@ -364,11 +352,7 @@ public:
 
 
 
-typedef ListBoxWrapper< sal_uInt16 > UInt16ListBoxWrapper;
-typedef ListBoxWrapper< sal_uInt32 > UInt32ListBoxWrapper;
 
-typedef ListBoxWrapper< sal_uInt16 > UShortListBoxWrapper;
-typedef ListBoxWrapper< sal_uIntPtr >  ULongListBoxWrapper;
 
 
 
@@ -406,11 +390,7 @@ public:
 
 
 
-typedef ValueSetWrapper< sal_uInt16 > UInt16ValueSetWrapper;
-typedef ValueSetWrapper< sal_uInt32 > UInt32ValueSetWrapper;
 
-typedef ValueSetWrapper< sal_uInt16 > UShortValueSetWrapper;
-typedef ValueSetWrapper< sal_uIntPtr >  ULongValueSetWrapper;
 
 
 // Multi control wrappers
diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx
index 2f86bf1bda92..c0cf7a62b093 100644
--- a/include/sfx2/itemconnect.hxx
+++ b/include/sfx2/itemconnect.hxx
@@ -314,8 +314,6 @@ public:
 
 
 
-typedef NumericConnection< UInt16ItemWrapper > UInt16NumericConnection;
-typedef NumericConnection< UInt32ItemWrapper > UInt32NumericConnection;
 
 
 
@@ -343,11 +341,6 @@ public:
 
 
 
-typedef MetricConnection< UInt16ItemWrapper > UInt16MetricConnection;
-typedef MetricConnection< UInt32ItemWrapper > UInt32MetricConnection;
-
-
-
 /** Connection between an item and a VCL ListBox.
 
     Optionally a map can be passed that maps list box positions to item values.
@@ -374,8 +367,6 @@ public:
 
 
 
-typedef ListBoxConnection< UInt16ItemWrapper > UInt16ListBoxConnection;
-typedef ListBoxConnection< UInt32ItemWrapper > UInt32ListBoxConnection;
 
 
 
@@ -405,8 +396,6 @@ public:
 
 
 
-typedef ValueSetConnection< UInt16ItemWrapper > UInt16ValueSetConnection;
-typedef ValueSetConnection< UInt32ItemWrapper > UInt32ValueSetConnection;
 
 
 // Array of connections
diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx
index ed22fae42532..92ac1a05fb7f 100644
--- a/include/sfx2/itemwrapper.hxx
+++ b/include/sfx2/itemwrapper.hxx
@@ -75,7 +75,6 @@ public:
      |   +- BoolItemWrapper   [1]
      |   +- UInt16ItemWrapper   [1]
      |   +- Int32ItemWrapper   [1]
-     |   +- UInt32ItemWrapper   [1]
      |
      +- IdentItemWrapper< ItemT >   [1]
 
@@ -150,7 +149,6 @@ public:
 typedef ValueItemWrapper< SfxBoolItem,   sal_Bool >          BoolItemWrapper;
 typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 >        UInt16ItemWrapper;
 typedef ValueItemWrapper< SfxInt32Item,  sal_Int32 >         Int32ItemWrapper;
-typedef ValueItemWrapper< SfxUInt32Item, sal_uInt32 >        UInt32ItemWrapper;
 
 
 
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index d63146cdd13c..30aaffe6834e 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -178,7 +178,6 @@ to be set (before Show) with SetStyle().
 *************************************************************************/
 
 typedef std::vector<ValueSetItem*> ValueItemList;
-typedef std::unique_ptr<ValueSetItem> ValueSetItemPtr;
 
 // - ValueSet types -
 #define WB_RADIOSEL             ((WinBits)0x00008000)
@@ -201,7 +200,7 @@ private:
     ScopedVclPtr<VirtualDevice> maVirDev;
     Timer           maTimer;
     ValueItemList   mItemList;
-    ValueSetItemPtr mpNoneItem;
+    std::unique_ptr<ValueSetItem> mpNoneItem;
     VclPtr<ScrollBar> mxScrollBar;
     Rectangle       maNoneItemRect;
     Rectangle       maItemListRect;
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 4a1dfe7400ad..5416c90a3ecb 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -79,7 +79,6 @@ namespace rtl {
 }
 
 typedef rtl::OUString ChainLinkId;
-typedef std::map< ChainLinkId, ImpChainLinkProperties *> LinkPropertiesMap;
 
 enum class CursorChainingEvent
 {
@@ -143,7 +142,7 @@ public:
 
 protected:
     TextChain();
-    LinkPropertiesMap maLinkPropertiesMap;
+    std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap;
 
 private:
     friend class SdrModel;
diff --git a/include/xmloff/XMLFontAutoStylePool.hxx b/include/xmloff/XMLFontAutoStylePool.hxx
index b26c0d35ea84..c5de32ebc1db 100644
--- a/include/xmloff/XMLFontAutoStylePool.hxx
+++ b/include/xmloff/XMLFontAutoStylePool.hxx
@@ -28,7 +28,6 @@
 #include <set>
 
 class XMLFontAutoStylePool_Impl;
-typedef std::set<OUString> XMLFontAutoStylePoolNames_Impl;
 class SvXMLExport;
 
 class XMLOFF_DLLPUBLIC XMLFontAutoStylePool : public salhelper::SimpleReferenceObject
@@ -36,7 +35,7 @@ class XMLOFF_DLLPUBLIC XMLFontAutoStylePool : public salhelper::SimpleReferenceO
     SvXMLExport& rExport;
 
     XMLFontAutoStylePool_Impl *pPool;
-    XMLFontAutoStylePoolNames_Impl m_aNames;
+    std::set<OUString> m_aNames;
     bool tryToEmbedFonts;
 
     OUString embedFontFile( const OUString& fontUrl );