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>

40 files changed, 52 insertions, 148 deletions

diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx
index 81776435c852..3128361392c0 100644
--- a/basic/inc/sbxbase.hxx
+++ b/basic/inc/sbxbase.hxx
@@ -33,15 +33,14 @@ class SbxFactory;
 class SbxVariable;
 class SbxBasicFormater;
 
-typedef std::vector<std::unique_ptr<SbxFactory>> SbxFactories;
-
 // AppData structure for SBX:
 struct SbxAppData
     : private ::boost::noncopyable
 {
     SbxError            eSbxError;  // Error code
-    SbxFactories        m_Factories;
-    SbxBasicFormater    *pBasicFormater;    // Pointer to Format()-Command helper class
+    std::vector<std::unique_ptr<SbxFactory>>
+                        m_Factories;
+    SbxBasicFormater   *pBasicFormater;    // Pointer to Format()-Command helper class
 
     LanguageType        eBasicFormaterLangType;
     // It might be useful to store this class 'global' because some string reosurces are saved here
diff --git a/bin/find-unused-defines.awk b/bin/find-unused-defines.awk
index 193986ea2466..fb3997ab4f54 100644
--- a/bin/find-unused-defines.awk
+++ b/bin/find-unused-defines.awk
@@ -14,7 +14,6 @@ END {
 
 
 # | xargs -P 4 -Ixxx sh -c "git grep -w 'xxx' | awk '{ x++; y=\$0 } END { if (x==1) print y }' && echo \"xxx\" 1>&2"
-
 # 	sed -i '' '/pattern/d'
 # | awk  'arr[$0]++ END { for (i in arr) { if(arr[i]==1) print i } }' \
 # | awk -f find-unused-defines.awk
diff --git a/bin/find-unused-typedefs.py b/bin/find-unused-typedefs.py
index e261d13e546b..e292f097526a 100755
--- a/bin/find-unused-typedefs.py
+++ b/bin/find-unused-typedefs.py
@@ -2,12 +2,13 @@
 
 import subprocess
 
-a = subprocess.Popen("git grep -P '^typedef\s+.+\w+;' -- \"[!e][!x][!t]*\"", stdout=subprocess.PIPE, shell=True)
+a = subprocess.Popen("git grep -P '^typedef\s+.+\s+\w+;' -- \"[!e][!x][!t]*\"", stdout=subprocess.PIPE, shell=True)
 
 with a.stdout as txt:
     for line in txt:
-        idx1 = line.rfind(" ")
-        typedefName = line[idx1+1 : len(line)-2]
+        idx2 = line.rfind(";")
+        idx1 = line.rfind(" ", 0, idx2)
+        typedefName = line[idx1+1 : idx2]
         if typedefName.startswith("*"):
            typedefName = typedefName[1:]
         # ignore anything less than 5 characters, it's probably a parsing error
diff --git a/bin/find-unused-typedefs.sh b/bin/find-unused-typedefs.sh
index a8039f552178..7a6f54b2b1c8 100755
--- a/bin/find-unused-typedefs.sh
+++ b/bin/find-unused-typedefs.sh
@@ -18,9 +18,8 @@
 #   (8) if so, generate a sed command to remove the #define
 #
 bin/find-unused-typedefs.py \
-  | sort \
-  | uniq \
+  | sort -u \
   | xargs -Ixxx -n 1 -P 8 sh -c \
-    "( git grep -w 'xxx' | awk -f bin/find-unused-defines.awk -v p1=xxx ) && echo \"xxx\" 1>&2"
+    '( git grep -w xxx | awk -f bin/find-unused-defines.awk -v p1=xxx ) && echo xxx 1>&2'
 
 
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
index 297afba07bc9..18cce64efb15 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
@@ -36,7 +36,6 @@ namespace CPPU_CURRENT_NAMESPACE
 const DWORD MSVC_ExceptionCode = 0xe06d7363;
 const long MSVC_magic_number = 0x19930520L;
 
-typedef enum { REGPARAM_INT, REGPARAM_FLT } RegParamKind;
 
 type_info * mscx_getRTTI( OUString const & rUNOname );
 
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 6ad57688bd7c..83168060f8cd 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -39,7 +39,6 @@ struct PosVecf3
 };
 
 typedef std::vector <glm::vec3> Vertices3D;
-typedef std::vector <glm::vec2> UVs3D;
 typedef std::vector <glm::vec3> Normals3D;
 
 struct MaterialParameters
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 5c481423e229..f35d8fcef933 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -37,15 +37,14 @@ struct OrderedEntry
         m_nIndex( nIndex ), m_sId( rId ) {}
 };
 
-typedef std::vector< OrderedEntry* > VectorOfOrderedEntries;
 
 // struct Module ---------------------------------------------------------
 
 struct Module
 {
-    OUString           m_sName;
-    bool                    m_bActive;
-    VectorOfOrderedEntries  m_aNodeList;
+    OUString                      m_sName;
+    bool                          m_bActive;
+    std::vector< OrderedEntry* >  m_aNodeList;
 
     Module( const OUString& rName ) : m_sName( rName ), m_bActive( false ) {}
 };
@@ -76,7 +75,6 @@ struct OptionsLeaf
 };
 
 typedef ::std::vector< OptionsLeaf* > VectorOfLeaves;
-typedef ::std::vector< VectorOfLeaves > VectorOfGroupedLeaves;
 
 // struct OptionsNode ----------------------------------------------------
 
@@ -89,7 +87,8 @@ struct OptionsNode
     OUString                m_sGroupId;
     sal_Int32               m_nGroupIndex;
     VectorOfLeaves          m_aLeaves;
-    VectorOfGroupedLeaves   m_aGroupedLeaves;
+    ::std::vector< VectorOfLeaves >
+                            m_aGroupedLeaves;
 
     OptionsNode(    const OUString& rId,
                     const OUString& rLabel,
@@ -133,7 +132,6 @@ struct OptionsPageInfo;
 struct Module;
 class ExtensionsTabPage;
 class SvxColorTabPage;
-typedef std::vector< ExtensionsTabPage* > VectorOfPages;
 
 class OfaTreeOptionsDialog : public SfxModalDialog
 {
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index ac55f13a2337..3832cd0f7086 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -230,7 +230,7 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor
 
     AddItemConnection( new HorJustConnection( SID_ATTR_ALIGN_HOR_JUSTIFY, *m_pLbHorAlign, s_pHorJustMap, sfx::ITEMCONN_HIDE_UNKNOWN ) );
     AddItemConnection( new sfx::DummyItemConnection( SID_ATTR_ALIGN_INDENT, *m_pFtIndent, sfx::ITEMCONN_HIDE_UNKNOWN ) );
-    AddItemConnection( new sfx::UInt16MetricConnection( SID_ATTR_ALIGN_INDENT, *m_pEdIndent, FUNIT_TWIP, sfx::ITEMCONN_HIDE_UNKNOWN ) );
+    AddItemConnection( new sfx::MetricConnection<sfx::UInt16ItemWrapper>( SID_ATTR_ALIGN_INDENT, *m_pEdIndent, FUNIT_TWIP, sfx::ITEMCONN_HIDE_UNKNOWN ) );
     AddItemConnection( new sfx::DummyItemConnection( SID_ATTR_ALIGN_VER_JUSTIFY, *m_pFtVerAlign, sfx::ITEMCONN_HIDE_UNKNOWN ) );
     AddItemConnection( new VerJustConnection( SID_ATTR_ALIGN_VER_JUSTIFY, *m_pLbVerAlign, s_pVerJustMap, sfx::ITEMCONN_HIDE_UNKNOWN ) );
     AddItemConnection( new DialControlConnection( SID_ATTR_ALIGN_DEGREES, *m_pCtrlDial, sfx::ITEMCONN_HIDE_UNKNOWN ) );
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 7b4020fb4dea..a1e6b06ffb7c 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -91,8 +91,6 @@ void FrameSelectorWrapper::SetControlValue( const editeng::SvxBorderLine* pLine
 
 // 3rd: connection ------------------------------------------------------------
 
-typedef sfx::ItemControlConnection< LineItemWrapper, FrameSelectorWrapper > FrameLineConnection;
-
 /* ============================================================================
 SvxMarginItem connection
 ------------------------
@@ -119,10 +117,10 @@ public:
     virtual void        SetControlValue( SvxMarginItem aItem ) override;
 
 private:
-    sfx::Int16MetricFieldWrapper maLeftWrp;
-    sfx::Int16MetricFieldWrapper maRightWrp;
-    sfx::Int16MetricFieldWrapper maTopWrp;
-    sfx::Int16MetricFieldWrapper maBottomWrp;
+    sfx::MetricFieldWrapper<sal_Int16> maLeftWrp;
+    sfx::MetricFieldWrapper<sal_Int16> maRightWrp;
+    sfx::MetricFieldWrapper<sal_Int16> maTopWrp;
+    sfx::MetricFieldWrapper<sal_Int16> maBottomWrp;
 };
 
 MarginControlsWrapper::MarginControlsWrapper(
@@ -213,9 +211,9 @@ public:
     virtual void        SetControlValue( SvxShadowItem aItem ) override;
 
 private:
-    ShadowPosWrapper                maPosWrp;
-    sfx::UShortMetricFieldWrapper   maSizeWrp;
-    sfx::ColorListBoxWrapper        maColorWrp;
+    ShadowPosWrapper                    maPosWrp;
+    sfx::MetricFieldWrapper<sal_uInt16> maSizeWrp;
+    sfx::ColorListBoxWrapper            maColorWrp;
 };
 
 ShadowControlsWrapper::ShadowControlsWrapper(
@@ -271,7 +269,7 @@ ShadowConnection::ShadowConnection( const SfxItemSet& rItemSet,
 sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot,
         FrameSelector& rFrameSel, FrameBorderType eBorder, sfx::ItemConnFlags nFlags )
 {
-    return new FrameLineConnection( nSlot, new FrameSelectorWrapper( rFrameSel, eBorder ), nFlags );
+    return new sfx::ItemControlConnection< LineItemWrapper, FrameSelectorWrapper >( nSlot, new FrameSelectorWrapper( rFrameSel, eBorder ), nFlags );
 }
 
 sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet,
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 88d7aea17bdf..cb9807168bb2 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -85,8 +85,6 @@ namespace vista{
 static const ::sal_Int16 INVALID_CONTROL_ID     = -1;
 static const ::sal_Int16 INVALID_CONTROL_ACTION = -1;
 
-typedef ::std::vector< OUString > TStringList;
-
 // Guids used for IFileDialog::SetClientGuid
 static const GUID CLIENTID_FILEDIALOG_SIMPLE        = {0xB8628FD3, 0xA3F5, 0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83};
 static const GUID CLIENTID_FILEDIALOG_OPTIONS       = {0x93ED486F, 0x0D04, 0x4807, 0x8C, 0x44, 0xAC, 0x26, 0xCB, 0x6C, 0x5D, 0x36};
@@ -836,7 +834,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
         return;
 
     // convert and pack results
-    TStringList lFiles;
+    std::vector< OUString > lFiles;
     if (iItem.is())
     {
         const OUString sURL = lcl_getURLFromShellItem(iItem);
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 );
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index aba35e49c081..ea6b1a138fae 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -167,7 +167,7 @@ private:
     css::uno::Reference<XFastContextHandler> mxChartShapeContext;
     css::uno::Reference<css::document::XDocumentProperties> mxDocumentProperties;
 
-    core::XmlFilterRef mxFilterBase;
+    ::rtl::Reference< core::XmlFilterBase > mxFilterBase;
     drawingml::ThemePtr mpThemePtr;
     css::uno::Reference<css::drawing::XDrawPage> mxDrawPage;
     css::uno::Reference<css::io::XInputStream> mxInputStream;
diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx
index a51e82465cf9..97615fd139e7 100644
--- a/reportdesign/source/core/inc/RptObjectListener.hxx
+++ b/reportdesign/source/core/inc/RptObjectListener.hxx
@@ -28,13 +28,7 @@ namespace rptui
 {
 class OObjectBase;
 
-
-// OObjectListener
-
-
-typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener > TPropertyChangeListenerHelper;
-
-class OObjectListener: public TPropertyChangeListenerHelper
+class OObjectListener: public ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener >
 {
 private:
     OObjectBase*        m_pObject;
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 35596ac484c8..514c156d7ee5 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -67,8 +67,6 @@ class FastLocatorImpl;
 struct NamespaceDefine;
 struct Entity;
 
-typedef std::shared_ptr< NamespaceDefine > NamespaceDefineRef;
-
 typedef std::unordered_map< OUString, sal_Int32,
         OUStringHash, std::equal_to< OUString > > NamespaceMap;
 
@@ -181,7 +179,8 @@ struct Entity : public ParserData
     std::stack< SaxContext>               maContextStack;
     // Determines which elements of maNamespaceDefines are valid in current context
     std::stack< sal_uInt32 >              maNamespaceCount;
-    std::vector< NamespaceDefineRef >     maNamespaceDefines;
+    std::vector< std::shared_ptr< NamespaceDefine > >
+                                          maNamespaceDefines;
 
     explicit Entity( const ParserData& rData );
     Entity( const Entity& rEntity );
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index a009fbbe3736..1759f394d5c3 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -58,8 +58,6 @@ class ScDataPilotDescriptorBase;
 
 struct ScSortParam;
 
-typedef std::vector< css::uno::Reference< css::util::XRefreshListener > > XDBRefreshListenerArr_Impl;
-
 class ScDataUnoConversion
 {
 public:
@@ -478,7 +476,8 @@ private:
     ScDocShell*             pDocShell;
     OUString                aName;
     SfxItemPropertySet      aPropSet;
-    XDBRefreshListenerArr_Impl aRefreshListeners;
+    std::vector< css::uno::Reference< css::util::XRefreshListener > >
+                            aRefreshListeners;
     bool                    bIsUnnamed;
     SCTAB                   aTab;
 
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index 8d934f941a5c..f5a3c0d98784 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -32,8 +32,6 @@ namespace com { namespace sun { namespace star { namespace frame {
 
 class ScTabViewShell;
 
-typedef std::vector< css::uno::Reference< css::frame::XStatusListener > > XStatusListenerArr_Impl;
-
 class ScDispatchProviderInterceptor : public cppu::WeakImplHelper<
                                         css::frame::XDispatchProviderInterceptor,
                                         css::lang::XEventListener>,
@@ -91,7 +89,8 @@ class ScDispatch : public cppu::WeakImplHelper<
                                 public SfxListener
 {
     ScTabViewShell*         pViewShell;
-    XStatusListenerArr_Impl aDataSourceListeners;
+    std::vector< css::uno::Reference< css::frame::XStatusListener > >
+                            aDataSourceListeners;
     ScImportParam           aLastImport;
     bool                    bListeningToView;
 
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 254484de73e6..62f1735603ba 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -859,7 +859,6 @@ void XclExpTabInfo::CalcXclIndexes()
 }
 
 typedef ::std::pair< OUString, SCTAB > XclExpTabName;
-typedef ::std::vector< XclExpTabName >  XclExpTabNameVec;
 
 struct XclExpTabNameSort {
     bool operator ()( const XclExpTabName& rArg1, const XclExpTabName& rArg2 )
@@ -872,7 +871,7 @@ struct XclExpTabNameSort {
 void XclExpTabInfo::CalcSortedIndexes()
 {
     ScDocument& rDoc = GetDoc();
-    XclExpTabNameVec aVec( mnScCnt );
+    ::std::vector< XclExpTabName > aVec( mnScCnt );
     SCTAB nScTab;
 
     // fill with sheet names
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 179273cfcb23..cd9f8e16e559 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -218,9 +218,6 @@ struct XclNearest
     inline explicit     XclNearest() : mnPalIndex( 0 ), mnDist( 0 ) {}
 };
 
-typedef ::std::vector< XclRemap >   XclRemapVec;
-typedef ::std::vector< XclNearest > XclNearestVec;
-
 } // namespace
 
 class XclExpPaletteImpl
@@ -373,8 +370,8 @@ void XclExpPaletteImpl::Finalize()
 // --- use default palette and replace colors with nearest used colors ---
 
     nCount = mxColorList->size();
-    XclRemapVec aRemapVec( nCount );
-    XclNearestVec aNearestVec( nCount );
+    std::vector< XclRemap > aRemapVec( nCount );
+    std::vector< XclNearest > aNearestVec( nCount );
 
     // in each run: search the best fitting color and replace a default color with it
     for( sal_uInt32 nRun = 0; nRun < nCount; ++nRun )
diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx
index 3a5270027424..2df19fc7a9d0 100644
--- a/sc/source/filter/inc/xeextlst.hxx
+++ b/sc/source/filter/inc/xeextlst.hxx
@@ -122,7 +122,6 @@ private:
     const char* mpIconSetName;
 };
 
-typedef std::shared_ptr<XclExpExtDataBar> XclExpExtDataBarRef;
 
 class XclExpExtCfRule : public XclExpRecordBase, protected XclExpRoot
 {
@@ -138,7 +137,6 @@ private:
 };
 
 typedef std::shared_ptr<XclExpExt> XclExpExtRef;
-typedef std::shared_ptr<XclExpExtCfRule> XclExpExtCfRuleRef;
 
 class XclExpExtConditionalFormatting : public XclExpRecordBase, protected XclExpRoot
 {
diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index 692b6d0bbf43..41f37dd44968 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -220,9 +220,6 @@ XclExpValueRecord< Type >* XclExpValueRecord< Type >::SetAttribute( sal_Int32 nI
 /** A record containing an unsigned 16-bit value. */
 typedef XclExpValueRecord< sal_uInt16 >     XclExpUInt16Record;
 
-/** A record containing an unsigned 32-bit value. */
-typedef XclExpValueRecord< sal_uInt32 >     XclExpUInt32Record;
-
 /** A record containing a double value. */
 typedef XclExpValueRecord< double >         XclExpDoubleRecord;
 
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index f06f6f80bb92..2aa1ff817e23 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -743,7 +743,6 @@ private:
     XclImpChDataFormatRef mxDataFmt;        /// Formatting settings of the error bars.
 };
 
-typedef std::shared_ptr< XclImpChSerErrorBar > XclImpChSerErrorBarRef;
 
 /** Represents the CHSERIES record group describing a data series in a chart.
 
@@ -944,7 +943,6 @@ private:
     sal_uInt16          mnBarDist;          /// Distance between bars (CHDROPBAR record).
 };
 
-typedef std::shared_ptr< XclImpChDropBar > XclImpChDropBarRef;
 
 /** Represents the CHTYPEGROUP record group describing a group of series.
 
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index 040ad1ed7459..b15773099ac8 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -36,7 +36,6 @@ using namespace ::ooo::vba::excel::XlAxisGroup;
 // iteration over the set of Axis(s) in a XIndexAccess implementation
 
 typedef ::std::pair<sal_Int32, sal_Int32 > AxesCoordinate; // type and group combination
-typedef ::std::vector< AxesCoordinate > vecAxesIndices;
 
 namespace {
 
@@ -89,7 +88,7 @@ class AxisIndexWrapper : public ::cppu::WeakImplHelper< container::XIndexAccess
     // indices -> Axis, currently we create a new Axis object
     // on each getByIndex
     uno::Reference< uno::XComponentContext > mxContext;
-    vecAxesIndices mCoordinates;
+    std::vector< AxesCoordinate > mCoordinates;
     uno::Reference< excel::XChart > mxChart;
 public:
     AxisIndexWrapper( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XChart >& xChart ) : mxContext( xContext ), mxChart( xChart )
diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx
index 140a6d15c6a9..52d4a62b18c6 100644
--- a/sc/workben/result.hxx
+++ b/sc/workben/result.hxx
@@ -29,14 +29,13 @@
 
 #include <vector>
 
-typedef std::vector<css::uno::Reference<css::sheet::XResultListener>> XResultListenerArr_Impl;
-
 class ScAddInResult : public cppu::WeakImplHelper< css::sheet::XVolatileResult>
 {
 private:
     String                  aArg;
     long                    nTickCount;
-    XResultListenerArr_Impl m_Listeners;
+    std::vector<css::uno::Reference<css::sheet::XResultListener>>
+                            m_Listeners;
     Timer                   aTimer;
 
     DECL_LINK( TimeoutHdl, Timer* );
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
index 261828f98a5c..1c1ae684846e 100644
--- a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
+++ b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
@@ -726,16 +726,8 @@ typedef unsigned long long uint64_t;
 
 typedef int32_t int_least32_t;
 
-typedef uint8_t uint_least8_t;
-typedef uint16_t uint_least16_t;
-typedef uint32_t uint_least32_t;
-typedef uint64_t uint_least64_t;
 
 
-typedef uint8_t uint_fast8_t;
-typedef uint16_t uint_fast16_t;
-typedef uint32_t uint_fast32_t;
-typedef uint64_t uint_fast64_t;
 
     #if ( !defined( _WIN32 ) || TARGET_OS_WINDOWS_CE )
 typedef long int intptr_t;
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index 3691425a90e4..e808b6d1a39a 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -74,7 +74,6 @@ public:
 };
 
 typedef ::boost::shared_ptr< ViewRepaintHandler > ViewRepaintHandlerSharedPtr;
-typedef ::boost::weak_ptr< ViewRepaintHandler >   ViewRepaintHandlerWeakPtr;
 
 /** Interface for handling hyperlink clicks.
 
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 78d5875889ac..d9eb62718755 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1251,14 +1251,12 @@ public:
     }
 };
 
-// Plc for Chpx and Papx ( incl PN-Plc )
-typedef std::vector<std::unique_ptr<WW8_WrFkp>> WW8_WrFkpPtrs;
-
 class WW8_WrPlcPn                   // Plc for Page Numbers
 {
 private:
     WW8Export& rWrt;
-    WW8_WrFkpPtrs m_Fkps;
+    // Plc for Chpx and Papx ( incl PN-Plc )
+    std::vector<std::unique_ptr<WW8_WrFkp>> m_Fkps;
     sal_uInt16 nFkpStartPage;
     ePLCFT ePlc;
 
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 3861e6ccee56..daaeee6fd16f 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -88,8 +88,6 @@ public:
     {}
 };
 
-typedef std::vector<std::unique_ptr<WW8SelBoxInfo>> WW8MergeGroups;
-
 WW8TabBandDesc::WW8TabBandDesc()
 {
     memset(this, 0, sizeof(*this));
@@ -122,7 +120,7 @@ class WW8TabDesc: private boost::noncopyable
     SwTableBoxes* pTabBoxes;        // boxes array in current row
     SwTableBox* pTabBox;            // current cell
 
-    WW8MergeGroups m_MergeGroups;   // list of all cells to be merged
+    std::vector<std::unique_ptr<WW8SelBoxInfo>> m_MergeGroups;   // list of all cells to be merged
 
     WW8_TCell* pAktWWCell;
 
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index 37877a3f3460..6999b04b063d 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -25,8 +25,6 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef std::vector< uno::Reference< text::XDocumentIndex > > XTocVec;
-
 class TablesOfContentsEnumWrapper : public EnumerationHelper_BASE
 {
     uno::Reference< container::XIndexAccess > mxIndexAccess;
@@ -58,7 +56,7 @@ private:
     uno::Reference< XHelperInterface > mxParent;
     uno::Reference< uno::XComponentContext > mxContext;
     uno::Reference< text::XTextDocument > mxTextDocument;
-    XTocVec maToc;
+    std::vector< uno::Reference< text::XDocumentIndex > > maToc;
 
 public:
     TableOfContentsCollectionHelper( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDoc ) throw ( uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ), mxTextDocument( xDoc )
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index cf1636eb093b..b16a51260d2a 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -74,8 +74,6 @@ public:
                     {}
 };
 
-typedef tools::SvRef<UcbLockBytesHandler> UcbLockBytesHandlerRef;
-
 class UcbLockBytes : public virtual SvLockBytes
 {
     osl::Condition          m_aInitialized;
@@ -89,7 +87,7 @@ class UcbLockBytes : public virtual SvLockBytes
     css::uno::Reference < css::io::XInputStream >  m_xInputStream;
     css::uno::Reference < css::io::XOutputStream > m_xOutputStream;
     css::uno::Reference < css::io::XSeekable >     m_xSeekable;
-    UcbLockBytesHandlerRef  m_xHandler;
+    tools::SvRef<UcbLockBytesHandler>              m_xHandler;
 
     ErrCode                 m_nError;
 
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index dd0a420b79b0..470546b9bc0b 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -28,7 +28,6 @@ struct _XTrap; // on some older systems this is not declared within Xrender.h
 #include <vcl/salgtype.hxx>
 #include <osl/module.h>
 
-typedef Glyph XRenderGlyph;
 
 class XRenderPeer
 {
diff --git a/vcl/unx/glxtest.cxx b/vcl/unx/glxtest.cxx
index 8e187ac425ce..12811e8c8fa9 100644
--- a/vcl/unx/glxtest.cxx
+++ b/vcl/unx/glxtest.cxx
@@ -41,10 +41,6 @@ typedef XID GLXPixmap;
 typedef XID GLXDrawable;
 /* GLX 1.3 and later */
 typedef struct __GLXFBConfigRec *GLXFBConfig;
-typedef XID GLXFBConfigID;
-typedef XID GLXContextID;
-typedef XID GLXWindow;
-typedef XID GLXPbuffer;
 #define GLX_RGBA        4
 #define GLX_RED_SIZE    8
 #define GLX_GREEN_SIZE  9
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index a6fdf38bbf0d..db1edc7ce07a 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -59,8 +59,6 @@ struct SvXMLNumFmtEntry
         aName(rN), nKey(nK), bRemoveAfterUse(bR) {}
 };
 
-typedef std::map<sal_Int32, OUString> SvXMLEmbeddedElementArr;
-
 class SvXMLNumImpData
 {
     SvNumberFormatter*  pFormatter;
@@ -105,7 +103,7 @@ struct SvXMLNumberInfo
     bool        bDecReplace;
     bool        bExpSign;
     double      fDisplayFactor;
-    SvXMLEmbeddedElementArr m_EmbeddedElements;
+    std::map<sal_Int32, OUString> m_EmbeddedElements;
 
     SvXMLNumberInfo()
     {
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index 74b6a2f50dee..9ac33fc4a3d2 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -72,9 +72,6 @@ struct XMLSignatureVerifyResult
     }
 };
 
-typedef ::std::vector<XMLSignatureCreationResult> XMLSignatureCreationResults;
-typedef ::std::vector<XMLSignatureVerifyResult> XMLSignatureVerifyResults;
-
 
 
 /**********************************************************
@@ -100,8 +97,10 @@ private:
     ::com::sun::star::uno::Reference< com::sun::star::xml::crypto::XSEInitializer > mxSEInitializer;
     ::com::sun::star::uno::Reference< com::sun::star::xml::crypto::XXMLSecurityContext > mxSecurityContext;
 
-    XMLSignatureCreationResults maCreationResults;
-    XMLSignatureVerifyResults   maVerifyResults;
+    std::vector<XMLSignatureCreationResult>
+                                maCreationResults;
+    std::vector<XMLSignatureVerifyResult>
+                                maVerifyResults;
     XSecController*             mpXSecController;
     bool                        mbError;
     bool mbODFPre1_2;