inline some use-once typedefs

and remove some dead ones

Change-Id: I6946d717d3c15dc5207489ed3d56d985dd953d59
Reviewed-on: https://gerrit.libreoffice.org/41746
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 12 insertions, 19 deletions

diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx
index 93e5e0e65ec9..db65f542dcb2 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -143,10 +143,10 @@ public:
 // only requirement is the object needs to implement XName
 
 
-typedef ::cppu::WeakImplHelper< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE;
-
 template< typename OneIfc >
-class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
+class XNamedObjectCollectionHelper : public ::cppu::WeakImplHelper< css::container::XNameAccess,
+                                                                    css::container::XIndexAccess,
+                                                                    css::container::XEnumerationAccess >
 {
 public:
 typedef std::vector< css::uno::Reference< OneIfc > >  XNamedVec;
@@ -330,9 +330,7 @@ public:
 
 };
 
-typedef ::cppu::WeakImplHelper<ov::XCollection> XCollection_InterfacesBASE;
-
-typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase;
+typedef ScVbaCollectionBase< ::cppu::WeakImplHelper<ov::XCollection> > CollImplBase;
 // compatible with the old collections ( pre XHelperInterface base class ) ( some internal objects still use this )
 class VBAHELPER_DLLPUBLIC ScVbaCollectionBaseImpl : public CollImplBase
 {
diff --git a/include/vbahelper/vbapropvalue.hxx b/include/vbahelper/vbapropvalue.hxx
index 23d9d3e743aa..0ea4417595d7 100644
--- a/include/vbahelper/vbapropvalue.hxx
+++ b/include/vbahelper/vbapropvalue.hxx
@@ -30,8 +30,6 @@
 #include <vbahelper/vbadllapi.h>
 #include <vbahelper/vbahelper.hxx>
 
-typedef ::cppu::WeakImplHelper< ov::XPropValue > PropValueImpl_BASE;
-
 class VBAHELPER_DLLPUBLIC PropListener
 {
 public:
@@ -43,7 +41,7 @@ protected:
 };
 
 
-class VBAHELPER_DLLPUBLIC ScVbaPropValue : public PropValueImpl_BASE
+class VBAHELPER_DLLPUBLIC ScVbaPropValue : public ::cppu::WeakImplHelper< ov::XPropValue >
 {
     PropListener* m_pListener;
 public:
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 36b70f88a4f7..390c3d511349 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -88,10 +88,6 @@ class XMLErrors;
 class StyleMap;
 enum class SvXMLErrorFlags;
 
-typedef std::stack<SvXMLImportContextRef> SvXMLImportContexts_Impl;
-typedef std::stack<css::uno::Reference<css::xml::sax::XFastContextHandler>>
-            FastSvXMLImportContexts_Impl;
-
 namespace xmloff {
     class RDFaImportHelper;
 }
@@ -204,12 +200,13 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper<
 
     std::unique_ptr<SvXMLImport_Impl>  mpImpl;            // dummy
 
-    std::unique_ptr<SvXMLNamespaceMap> mpNamespaceMap;
-    std::unique_ptr<SvXMLUnitConverter> mpUnitConv;
-    SvXMLImportContexts_Impl    maContexts;
-    FastSvXMLImportContexts_Impl    maFastContexts;
-    std::unique_ptr<SvXMLNumFmtHelper> mpNumImport;
-    std::unique_ptr<ProgressBarHelper> mpProgressBarHelper;
+    std::unique_ptr<SvXMLNamespaceMap>    mpNamespaceMap;
+    std::unique_ptr<SvXMLUnitConverter>   mpUnitConv;
+    std::stack<SvXMLImportContextRef>     maContexts;
+    std::stack<css::uno::Reference<css::xml::sax::XFastContextHandler>>
+                                          maFastContexts;
+    std::unique_ptr<SvXMLNumFmtHelper>    mpNumImport;
+    std::unique_ptr<ProgressBarHelper>    mpProgressBarHelper;
     std::unique_ptr<XMLEventImportHelper> mpEventImportHelper;
     std::unique_ptr<XMLErrors>  mpXMLErrors;
     rtl::Reference<StyleMap>    mpStyleMap;