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>

3 files changed, 14 insertions, 18 deletions

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,