inline some use-once typedefs

Change-Id: I02cbbba56a2ad83e0ac3d806265a7e0d6a29594d
Reviewed-on: https://gerrit.libreoffice.org/17495
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

6 files changed, 8 insertions, 17 deletions

diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 017c594aac1f..84f9852542bd 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -767,8 +767,7 @@ void ScVbaControl::setLocked( bool bLocked ) throw (uno::RuntimeException)
     m_xProps->setPropertyValue( "ReadOnly" , uno::makeAny( bLocked ) );
 }
 
-typedef cppu::WeakImplHelper1< XControlProvider > ControlProvider_BASE;
-class ControlProviderImpl : public ControlProvider_BASE
+class ControlProviderImpl : public cppu::WeakImplHelper1< XControlProvider >
 {
     uno::Reference< uno::XComponentContext > m_xCtx;
 public:
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index ce70d059fb81..5c75aa431583 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -38,13 +38,11 @@ using namespace com::sun::star;
 using namespace ooo::vba;
 
 
-typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl;
-
 typedef  std::unordered_map< OUString, sal_Int32, OUStringHash,
                              std::equal_to< OUString >  > ControlIndexMap;
 typedef  std::vector< uno::Reference< awt::XControl > > ControlVec;
 
-class ControlArrayWrapper : public ArrayWrapImpl
+class ControlArrayWrapper : public ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess >
 {
     uno::Reference< awt::XControlContainer > mxDialog;
     uno::Sequence< OUString > msNames;
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 342203281ab2..057464fb8bbd 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -26,8 +26,7 @@ using namespace ooo::vba;
 
 const OUString SVALUE( "MultiPageValue" );
 
-typedef cppu::WeakImplHelper1< container::XIndexAccess > PagesImpl_Base;
-class PagesImpl : public PagesImpl_Base
+class PagesImpl : public cppu::WeakImplHelper1< container::XIndexAccess >
 {
     sal_Int32 mnPages;
 public:
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index a47b33c3d09e..331c9891d1df 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -22,8 +22,7 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarControlEnumeration_BASE;
-class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
+class CommandBarControlEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
 {
     //uno::Reference< uno::XComponentContext > m_xContext;
     CommandBarControls_BASE* m_pCommandBarControls;
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index 9993979d888e..ad32100830b3 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -32,9 +32,7 @@ using namespace com::sun::star;
 using namespace ooo::vba;
 
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarEnumeration_BASE;
-
-class CommandBarEnumeration : public CommandBarEnumeration_BASE
+class CommandBarEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
 {
     uno::Reference< XHelperInterface > m_xParent;
     uno::Reference< uno::XComponentContext > m_xContext;
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 9540e701f047..7f830d674dae 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -59,17 +59,15 @@ static const char aSpreadsheetDocument[] = "com.sun.star.sheet.SpreadsheetDocume
 static const char aTextDocument[] = "com.sun.star.text.TextDocument";
 
 typedef  std::unordered_map< OUString,
-sal_Int32, OUStringHash,
-::std::equal_to< OUString > > NameIndexHash;
+                             sal_Int32, OUStringHash,
+                             ::std::equal_to< OUString > > NameIndexHash;
 
 typedef std::vector < uno::Reference< frame::XModel > > Documents;
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > DocumentsEnumImpl_BASE;
-
 // #FIXME clearly this is a candidate for some sort of helper base class as
 // this is a copy of SelectedSheetsEnum ( vbawindow.cxx )
 
-class DocumentsEnumImpl : public DocumentsEnumImpl_BASE
+class DocumentsEnumImpl : public ::cppu::WeakImplHelper1< container::XEnumeration >
 {
     uno::Reference< uno::XComponentContext > m_xContext;
     Documents m_documents;