sc: inline some use-once typedefs

Change-Id: I332e160dda3f167e61f99da1eb0aa6bd72a48b06

11 files changed, 17 insertions, 33 deletions

diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 2738f10329c4..860c402536a6 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -52,11 +52,6 @@ public:
     bool            bIsAcceptable;
 };
 
-typedef long LExpNum;
-
-//@ Expand entrys are ambiguous and therefore removed
-//DECLARE_TABLE( ScChgTrackExps, LExpNum)
-
 class ScAcceptChgDlg : public SfxModelessDialog
 {
 private:
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 57dfd482024c..177cfc7d31f1 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -1361,8 +1361,7 @@ SdrObject* ScShapeObj::GetSdrObject() const throw()
 #define SC_EVENTACC_SCRIPT      "Script"
 #define SC_EVENTACC_EVENTTYPE   "EventType"
 
-typedef ::cppu::WeakImplHelper1< container::XNameReplace > ShapeUnoEventAcess_BASE;
-class ShapeUnoEventAccessImpl : public ShapeUnoEventAcess_BASE
+class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper1< container::XNameReplace >
 {
 private:
     ScShapeObj* mpShape;
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index cf855f1eda66..47020c181ddf 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -37,8 +37,6 @@ using namespace ::ooo::vba::excel::XlAxisGroup;
 typedef ::std::pair<sal_Int32, sal_Int32 > AxesCoordinate; // type and group combination
 typedef ::std::vector< AxesCoordinate > vecAxesIndices;
 
-typedef ::cppu::WeakImplHelper1< container::XIndexAccess > AxisIndexWrapper_BASE;
-
 namespace {
 
 class EnumWrapper : public EnumerationHelper_BASE
@@ -84,7 +82,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno:
 
 namespace {
 
-class AxisIndexWrapper : public AxisIndexWrapper_BASE
+class AxisIndexWrapper : public ::cppu::WeakImplHelper1< container::XIndexAccess >
 {
     // if necessary for better performance we could change this into a map and cache the
     // indices -> Axis, currently we create a new Axis object
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index 6fc4e472a97b..94fa0d5b67f5 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -107,10 +107,11 @@ uno::Reference< awt::XWindow > lclGetWindowForController( const uno::Reference<
 
 } // namespace
 
-typedef ::cppu::WeakImplHelper4< awt::XTopWindowListener, awt::XWindowListener, frame::XBorderResizeListener, util::XChangesListener > ScVbaEventListener_BASE;
-
 // This class is to process Workbook window related event
-class ScVbaEventListener : public ScVbaEventListener_BASE
+class ScVbaEventListener : public ::cppu::WeakImplHelper4< awt::XTopWindowListener,
+                                                           awt::XWindowListener,
+                                                           frame::XBorderResizeListener,
+                                                           util::XChangesListener >
 {
 public:
     ScVbaEventListener( ScVbaEventsHelper& rVbaEvents, const uno::Reference< frame::XModel >& rxModel, ScDocShell* pDocShell );
diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx
index d8dfef49250d..45d00018b0c2 100644
--- a/sc/source/ui/vba/vbaformatconditions.hxx
+++ b/sc/source/ui/vba/vbaformatconditions.hxx
@@ -28,8 +28,6 @@
 #include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
 #include <vbahelper/vbacollectionimpl.hxx>
 
-typedef CollTestImplHelper< ov::excel::XFormatConditions > ScVbaFormatConditions_BASE;
-
 // This class is used only as a target for casting, it seems,
 // and no objects of this type are created as such, I think.
 // So avoid MSVC warnings:
@@ -42,7 +40,7 @@ typedef CollTestImplHelper< ov::excel::XFormatConditions > ScVbaFormatConditions
 #pragma warning(disable: 4610)
 #endif
 
-class ScVbaFormatConditions: public ScVbaFormatConditions_BASE
+class ScVbaFormatConditions: public CollTestImplHelper< ov::excel::XFormatConditions >
 {
     css::table::CellAddress maCellAddress;
     css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries;
diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx
index 265f9a1d7e84..aa289f22c39c 100644
--- a/sc/source/ui/vba/vbamenubars.cxx
+++ b/sc/source/ui/vba/vbamenubars.cxx
@@ -13,9 +13,7 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuBarEnumeration_BASE;
-
-class MenuBarEnumeration : public MenuBarEnumeration_BASE
+class MenuBarEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
 {
     uno::Reference< XHelperInterface > m_xParent;
     uno::Reference< uno::XComponentContext > m_xContext;
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index 8e9744cb5854..dcab022f6c12 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -22,8 +22,7 @@
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 
-typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangePageBreaks_Base;
-class RangePageBreaks : public RangePageBreaks_Base
+class RangePageBreaks : public ::cppu::WeakImplHelper1<container::XIndexAccess >
 {
 private:
     uno::Reference< XHelperInterface > mxParent;
diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx
index dd94655cc7a8..8553966a646e 100644
--- a/sc/source/ui/vba/vbapane.hxx
+++ b/sc/source/ui/vba/vbapane.hxx
@@ -24,9 +24,7 @@
 #include <vbahelper/vbahelperinterface.hxx>
 #include "excelvbahelper.hxx"
 
-typedef cppu::WeakImplHelper1< ov::excel::XPane > ScVbaPane_BASE;
-
-class ScVbaPane : public ScVbaPane_BASE
+class ScVbaPane : public cppu::WeakImplHelper1< ov::excel::XPane >
 {
 public:
     ScVbaPane(
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 6ecc6f88c7ad..a65dbc8d9648 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -309,9 +309,9 @@ public:
 
 // very simple class to pass to ScVbaCollectionBaseImpl containing
 // just one item
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > SingleRange_BASE;
 
-class SingleRangeIndexAccess : public SingleRange_BASE
+class SingleRangeIndexAccess : public ::cppu::WeakImplHelper2< container::XIndexAccess,
+                                                               container::XEnumerationAccess >
 {
 private:
     uno::Reference< XHelperInterface > mxParent;
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 6ed0c840c697..7f2701732eae 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -54,14 +54,12 @@ SCTAB, OUStringHash,
 
 typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets;
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > Enumeration_BASE;
-
 typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess
     , com::sun::star::container::XIndexAccess
     , com::sun::star::container::XNameAccess
     > SelectedSheets_BASE;
 
-class SelectedSheetsEnum : public Enumeration_BASE
+class SelectedSheetsEnum : public ::cppu::WeakImplHelper1< container::XEnumeration >
 {
 public:
     uno::Reference< uno::XComponentContext > m_xContext;
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index c07fbd9b3d13..18b8515f8bed 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -52,8 +52,6 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > SheetEnumeration_BASE;
-typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > SheetCollectionHelper_BASE;
 // a map ( or hashmap ) wont do as we need also to preserve the order
 // (as added ) of the items
 typedef std::vector< uno::Reference< sheet::XSpreadsheet > >  SheetMap;
@@ -61,7 +59,7 @@ typedef std::vector< uno::Reference< sheet::XSpreadsheet > >  SheetMap;
 // #FIXME #TODO the implementation of the Sheets collections sucks,
 // e.g. there is no support for tracking sheets added/removed from the collection
 
-class WorkSheetsEnumeration : public SheetEnumeration_BASE
+class WorkSheetsEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
 {
     SheetMap mSheetMap;
     SheetMap::iterator mIt;
@@ -80,7 +78,9 @@ public:
     }
 };
 
-class SheetCollectionHelper : public SheetCollectionHelper_BASE
+class SheetCollectionHelper : public ::cppu::WeakImplHelper3< container::XNameAccess,
+                                                              container::XIndexAccess,
+                                                              container::XEnumerationAccess >
 {
     SheetMap mSheetMap;
     SheetMap::iterator cachePos;