From 5edd744d1021b41f59528a6e3a8adebfe63e6b6e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 3 Aug 2015 13:30:17 +0200
Subject: sw: inline use-once typedefs

Change-Id: Id0e54c92769e6c82690fe6f1eab488fcabe6c655
---
 sw/source/ui/vba/vbabookmarks.cxx          | 4 ++--
 sw/source/ui/vba/vbacells.cxx              | 5 ++---
 sw/source/ui/vba/vbadocumentproperties.cxx | 3 +--
 sw/source/ui/vba/vbafield.cxx              | 8 +++-----
 sw/source/ui/vba/vbaframes.cxx             | 3 +--
 sw/source/ui/vba/vbaheadersfooters.cxx     | 3 +--
 sw/source/ui/vba/vbapanes.cxx              | 3 +--
 sw/source/ui/vba/vbaparagraph.cxx          | 5 ++---
 sw/source/ui/vba/vbarevisions.cxx          | 7 +++----
 sw/source/ui/vba/vbasections.cxx           | 7 +++----
 sw/source/ui/vba/vbastyles.cxx             | 6 +++---
 sw/source/ui/vba/vbatables.cxx             | 7 +++----
 sw/source/ui/vba/vbatablesofcontents.cxx   | 4 ++--
 sw/source/ui/vba/vbatabstops.cxx           | 5 ++---
 14 files changed, 29 insertions(+), 41 deletions(-)

(limited to 'sw/source/ui/vba')

diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 73c4acad139e..a8c16150e4b9 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -46,8 +46,8 @@ public:
 };
 
 // Bookmarks use case-insensitive name lookup in MS Word.
-typedef ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess > BookmarkCollectionHelper_BASE;
-class BookmarkCollectionHelper : public BookmarkCollectionHelper_BASE
+class BookmarkCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAccess,
+                                                                container::XIndexAccess >
 {
 private:
     uno::Reference< container::XNameAccess > mxNameAccess;
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index fb672767973a..9aedd85fb486 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -26,8 +26,6 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > CellCollectionHelper_Base;
-
 class CellsEnumWrapper : public EnumerationHelper_BASE
 {
     uno::Reference< container::XIndexAccess > mxIndexAccess;
@@ -52,7 +50,8 @@ public:
     }
 };
 
-class CellCollectionHelper : public CellCollectionHelper_Base
+class CellCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess,
+                                                            container::XEnumerationAccess >
 {
 private:
     uno::Reference< XHelperInterface > mxParent;
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index bb053e05dc2c..f30c724f6c96 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -638,8 +638,7 @@ typedef ::cppu::WeakImplHelper< com::sun::star::container::XIndexAccess
 
 typedef std::unordered_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps;
 
-typedef ::cppu::WeakImplHelper< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE;
-class DocPropEnumeration : public DocPropEnumeration_BASE
+class DocPropEnumeration : public ::cppu::WeakImplHelper< com::sun::star::container::XEnumeration >
 {
     DocProps mDocProps;
     DocProps::iterator mIt;
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 777e0b281b38..4e3e07805482 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -227,10 +227,7 @@ static uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xPare
     return uno::makeAny( xField );
 }
 
-typedef ::cppu::WeakImplHelper< css::container::XEnumeration > FieldEnumeration_BASE;
-typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > FieldCollectionHelper_BASE;
-
-class FieldEnumeration : public FieldEnumeration_BASE
+class FieldEnumeration : public ::cppu::WeakImplHelper< css::container::XEnumeration >
 {
     uno::Reference< XHelperInterface > mxParent;
     uno::Reference< uno::XComponentContext > mxContext;
@@ -252,7 +249,8 @@ public:
     }
 };
 
-class FieldCollectionHelper : public FieldCollectionHelper_BASE
+class FieldCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess,
+                                                             container::XEnumerationAccess >
 {
     uno::Reference< XHelperInterface > mxParent;
     uno::Reference< uno::XComponentContext > mxContext;
diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx
index 6a63ac359310..494e78782b53 100644
--- a/sw/source/ui/vba/vbaframes.cxx
+++ b/sw/source/ui/vba/vbaframes.cxx
@@ -27,8 +27,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper< container::XEnumeration > FramesEnumeration_Base;
-class FramesEnumeration : public FramesEnumeration_Base
+class FramesEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration >
 {
 private:
     uno::Reference< XHelperInterface > mxParent;
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index 3e0d153f5fcb..97d860b96b6f 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -25,8 +25,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 // I assume there is only one headersfooters in Writer
-typedef ::cppu::WeakImplHelper<container::XIndexAccess > HeadersFootersIndexAccess_Base;
-class HeadersFootersIndexAccess : public HeadersFootersIndexAccess_Base
+class HeadersFootersIndexAccess : public ::cppu::WeakImplHelper<container::XIndexAccess >
 {
 private:
     uno::Reference< XHelperInterface > mxParent;
diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx
index 22f1632afcc7..c79b09da247e 100644
--- a/sw/source/ui/vba/vbapanes.cxx
+++ b/sw/source/ui/vba/vbapanes.cxx
@@ -24,8 +24,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 // I assume there is only one pane in Writer
-typedef ::cppu::WeakImplHelper<container::XIndexAccess > PanesIndexAccess_Base;
-class PanesIndexAccess : public PanesIndexAccess_Base
+class PanesIndexAccess : public ::cppu::WeakImplHelper<container::XIndexAccess >
 {
 private:
     uno::Reference< XHelperInterface > mxParent;
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index 280120058071..eeef8b630e3a 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -73,9 +73,8 @@ SwVbaParagraph::getServiceNames()
     return aServiceNames;
 }
 
-typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > ParagraphCollectionHelper_BASE;
-
-class ParagraphCollectionHelper : public ParagraphCollectionHelper_BASE
+class ParagraphCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess,
+                                                                 container::XEnumerationAccess >
 {
 private:
     uno::Reference< text::XTextDocument > mxTextDocument;
diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx
index 04b46a419a49..9a4213809c48 100644
--- a/sw/source/ui/vba/vbarevisions.cxx
+++ b/sw/source/ui/vba/vbarevisions.cxx
@@ -25,11 +25,9 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper< container::XEnumeration > RevisionEnumeration_BASE;
-typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > RevisionCollectionHelper_BASE;
 typedef std::vector< uno::Reference< beans::XPropertySet > > RevisionMap;
 
-class RedlinesEnumeration : public RevisionEnumeration_BASE
+class RedlinesEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration >
 {
     RevisionMap mRevisionMap;
     RevisionMap::iterator mIt;
@@ -48,7 +46,8 @@ public:
     }
 };
 
-class RevisionCollectionHelper : public RevisionCollectionHelper_BASE
+class RevisionCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess,
+                                                                container::XEnumerationAccess >
 {
     RevisionMap mRevisionMap;
 public:
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index 4669a51c2f02..a23d56d63c81 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -28,11 +28,9 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper< container::XEnumeration > SectionEnumeration_BASE;
-typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > SectionCollectionHelper_Base;
 typedef std::vector< uno::Reference< beans::XPropertySet > > XSectionVec;
 
-class SectionEnumeration : public SectionEnumeration_BASE
+class SectionEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration >
 {
     XSectionVec mxSections;
     XSectionVec::iterator mIt;
@@ -53,7 +51,8 @@ public:
 };
 
 // here I regard pagestyle as section
-class SectionCollectionHelper : public SectionCollectionHelper_Base
+class SectionCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess,
+                                                               container::XEnumerationAccess >
 {
 private:
     uno::Reference< XHelperInterface > mxParent;
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index 4ff11568549b..21194a26d667 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -157,9 +157,9 @@ static const MSOStyleNameTable aMSOStyleNameTable[] =
     { 0, 0, 0 }
 };
 
-typedef ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > StyleCollectionHelper_BASE;
-
-class StyleCollectionHelper : public StyleCollectionHelper_BASE
+class StyleCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAccess,
+                                                             container::XIndexAccess,
+                                                             container::XEnumerationAccess >
 {
 private:
     uno::Reference< frame::XModel > mxModel;
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index 1ccfa74702b6..8bb0bc7bbdb6 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -59,11 +59,10 @@ static bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTab
     return false;
 }
 
-typedef ::cppu::WeakImplHelper< css::container::XEnumeration > EnumBase;
-typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XNameAccess > TableCollectionHelper_Base;
 typedef std::vector< uno::Reference< text::XTextTable > > XTextTableVec;
 
-class TableCollectionHelper : public TableCollectionHelper_Base
+class TableCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess,
+                                                             container::XNameAccess >
 {
     XTextTableVec mxTables;
     XTextTableVec::iterator cachePos;
@@ -132,7 +131,7 @@ public:
     }
 };
 
-class TableEnumerationImpl : public EnumBase
+class TableEnumerationImpl : public ::cppu::WeakImplHelper< css::container::XEnumeration >
 {
     uno::Reference< XHelperInterface > mxParent;
     uno::Reference< uno::XComponentContext > mxContext;
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index 5bf40d7cbb4e..cfb68febf6ab 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -25,7 +25,6 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > TableOfContentsCollectionHelper_Base;
 typedef std::vector< uno::Reference< text::XDocumentIndex > > XTocVec;
 
 class TablesOfContentsEnumWrapper : public EnumerationHelper_BASE
@@ -52,7 +51,8 @@ public:
     }
 };
 
-class TableOfContentsCollectionHelper : public TableOfContentsCollectionHelper_Base
+class TableOfContentsCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess,
+                                                                       container::XEnumerationAccess >
 {
 private:
     uno::Reference< XHelperInterface > mxParent;
diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx
index abc8543cd723..3c1f1737c837 100644
--- a/sw/source/ui/vba/vbatabstops.cxx
+++ b/sw/source/ui/vba/vbatabstops.cxx
@@ -38,8 +38,6 @@ static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaP
     xParaProps->setPropertyValue("ParaTabStops", uno::makeAny( aSeq ) );
 }
 
-typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > TabStopCollectionHelper_Base;
-
 class TabStopsEnumWrapper : public EnumerationHelper_BASE
 {
     uno::Reference< container::XIndexAccess > mxIndexAccess;
@@ -64,7 +62,8 @@ public:
     }
 };
 
-class TabStopCollectionHelper : public TabStopCollectionHelper_Base
+class TabStopCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAccess,
+                                                               container::XEnumerationAccess >
 {
 private:
     uno::Reference< XHelperInterface > mxParent;
-- 
cgit