filter,desktop,dbaccess: inline some use-once typedefs

Change-Id: I35f256a11b211c3cb977ae76b5b561efbfd13b9d

12 files changed, 24 insertions, 46 deletions

diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index ae89078aa20a..88770df793d1 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -52,9 +52,9 @@ namespace dbaccess
 {
 
 /// helper class for column property change events which holds the OComponentDefinition weak
-typedef ::cppu::WeakImplHelper< XPropertyChangeListener > TColumnPropertyListener_BASE;
 class OColumnPropertyListener:
-    public TColumnPropertyListener_BASE, private boost::noncopyable
+    public ::cppu::WeakImplHelper< XPropertyChangeListener >,
+    private boost::noncopyable
 {
     OComponentDefinition* m_pComponent;
 protected:
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 0412431ffb34..4f09edfa87f6 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -95,8 +95,6 @@ using namespace ::comphelper;
 namespace dbaccess
 {
 
-// FlushNotificationAdapter
-typedef ::cppu::WeakImplHelper< XFlushListener > FlushNotificationAdapter_Base;
 /** helper class which implements a XFlushListener, and forwards all
     notification events to another XFlushListener
 
@@ -107,7 +105,7 @@ typedef ::cppu::WeakImplHelper< XFlushListener > FlushNotificationAdapter_Base;
     their listeners with a hard reference, if you simply do not *want*
     to be held hard-ref-wise.
 */
-class FlushNotificationAdapter : public FlushNotificationAdapter_Base
+class FlushNotificationAdapter : public ::cppu::WeakImplHelper< XFlushListener >
 {
 private:
     WeakReference< XFlushable >     m_aBroadcaster;
@@ -260,7 +258,6 @@ void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentic
 /** The class OSharedConnectionManager implements a structure to share connections.
     It owns the master connections which will be disposed when the last connection proxy is gone.
 */
-typedef ::cppu::WeakImplHelper< XEventListener > OConnectionHelper_BASE;
 // need to hold the digest
 struct TDigestHolder
 {
@@ -272,7 +269,7 @@ struct TDigestHolder
 
 };
 
-class OSharedConnectionManager : public OConnectionHelper_BASE
+class OSharedConnectionManager : public ::cppu::WeakImplHelper< XEventListener >
 {
 
      // contains the currently used master connections
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 0c57d68de0a6..a22e8fd6ed2b 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -84,7 +84,6 @@ using namespace ::comphelper;
 #define LAST_USER_DEFINED_FEATURE   ( ::std::numeric_limits< sal_uInt16 >::max()        )
 
 typedef std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap;
-typedef ::std::list< DispatchInformation > DispatchInfoList;
 
 namespace dbaui
 {
@@ -1487,7 +1486,7 @@ namespace
 
 Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (RuntimeException, std::exception)
 {
-    DispatchInfoList    aInformationList;
+    ::std::list< DispatchInformation > aInformationList;
     DispatchInformation aDispatchInfo;
     for (   SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.begin();
             aIter != m_aSupportedFeatures.end();
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index 5c6c034fb7c1..11051e6fb532 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -37,9 +37,7 @@ namespace backend
 namespace sfwk
 {
 
-typedef ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > t_DocHandlerImpl;
-
-class ParcelDescDocHandler : public t_DocHandlerImpl
+class ParcelDescDocHandler : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
 {
 private:
     bool m_bIsParsed;
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 406376289ba7..e92d4556ad8c 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -454,7 +454,6 @@ std::wstring getShellLinkTarget(const std::wstring& aLnkFile)
 }
 
 typedef std::vector<std::wstring> FileList_t;
-typedef FileList_t::value_type FileList_ValueType_t;
 typedef Sequence<sal_Int8> ByteSequence_t;
 
 /* Calculate the size required for turning a string list into
@@ -470,7 +469,7 @@ size_t CalcSizeForStringListBuffer(const FileList_t& fileList)
     {
         size += iter->length() + 1; // length including terminating '\0'
     }
-    return (size * sizeof(FileList_ValueType_t::value_type));
+    return (size * sizeof(FileList_t::value_type::value_type));
 }
 
 ByteSequence_t FileListToByteSequence(const FileList_t& fileList)
diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx
index 5c05b6285d5b..b1c50240c401 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.hxx
@@ -97,9 +97,6 @@ public:
         mnBlueScreenColor( 0 ) {}
 };
 
-typedef ::std::vector<ShapeInfo*> ShapeInfoVector;
-
-
 
 struct ShapeAnimationInfo
 {
@@ -114,8 +111,8 @@ struct ShapeAnimationInfo
 
 struct PageInfo
 {
-    ::com::sun::star::presentation::FadeEffect      meFadeEffect;
-    ::com::sun::star::presentation::AnimationSpeed  meFadeSpeed;
+    css::presentation::FadeEffect      meFadeEffect;
+    css::presentation::AnimationSpeed  meFadeSpeed;
 
     sal_Int32       mnDuration;
     sal_Int32       mnChange;
@@ -124,10 +121,11 @@ struct PageInfo
     sal_uInt16      mnObjectsID;
     sal_uInt16      mnForegroundID;
 
-    bool mbBackgroundVisible;
-    bool mbBackgroundObjectsVisible;
+    bool            mbBackgroundVisible;
+    bool            mbBackgroundObjectsVisible;
 
-    ShapeInfoVector maShapesVector;
+    ::std::vector<ShapeInfo*>
+                    maShapesVector;
 
     PageInfo();
     ~PageInfo();
@@ -136,10 +134,6 @@ struct PageInfo
 
 
 
-typedef ::std::map<sal_uInt32, PageInfo> PageInfoMap;
-
-
-
 class FlashExporter
 {
 public:
@@ -176,7 +170,7 @@ private:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XGraphicExportFilter > mxGraphicExporter;
 
-    PageInfoMap maPagesMap;
+    ::std::map<sal_uInt32, PageInfo> maPagesMap;
 
     sal_uInt16 exportDrawPageBackground(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage);
     sal_uInt16 exportMasterPageObjects(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage);
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index aefdf5632f2b..f443cd6f0ee2 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -63,9 +63,7 @@ using ::com::sun::star::frame::XModel;
 
 namespace swf {
 
-typedef ::cppu::WeakImplHelper1<com::sun::star::io::XOutputStream> OslOutputStreamWrapper_Base;
-    // needed for some compilers
-class OslOutputStreamWrapper : public OslOutputStreamWrapper_Base
+class OslOutputStreamWrapper : public ::cppu::WeakImplHelper1<com::sun::star::io::XOutputStream>
 {
     osl::File   mrFile;
 
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx
index d04cb3670ed7..22c71a080073 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -162,15 +162,12 @@ public:
                         ~FontEntry();
 };
 
-
-
-typedef ::std::vector< FontEntry* > FontEntryList;
-
 class CGMFList
 {
     sal_uInt32      nFontNameCount;
     sal_uInt32      nCharSetCount;
-    FontEntryList   aFontEntryList;
+    ::std::vector< FontEntry* >
+                    aFontEntryList;
     void            ImplDeleteList();
 
 public:
diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx
index c7c52f34c002..6c66bd569506 100644
--- a/filter/source/graphicfilter/icgm/elements.hxx
+++ b/filter/source/graphicfilter/icgm/elements.hxx
@@ -27,7 +27,6 @@
 #define nBackGroundColor    aColorTable[ 0 ]
 
 typedef ::std::vector< Bundle* > BundleList;
-typedef ::std::map<sal_uInt32, HatchEntry> HatchMap;
 
 class CGMElements
 {
@@ -117,7 +116,8 @@ class CGMElements
         FillBundle          aFillBundle;
         BundleList          aFillList;
         FloatPoint          aFillRefPoint;
-        HatchMap            maHatchMap;
+        ::std::map<sal_uInt32, HatchEntry>
+                            maHatchMap;
 
         Transparency        eTransparency;
 
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 3dd97e2cd1b5..29a67f3130a3 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -572,7 +572,7 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf
         tools::PolyPolygon aPolyPoly;
         for ( j = 0; j < rE.nBoundaryPathCount; j++ )
         {
-            DXFPointArray aPtAry;
+            std::deque< Point > aPtAry;
             const DXFBoundaryPathData& rPathData = rE.pBoundaryPathData[ j ];
             if ( rPathData.bIsPolyLine )
             {
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx
index dd02daca1d93..eeeee6e0d64c 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx
@@ -25,8 +25,6 @@
 
 #include <deque>
 
-typedef std::deque< Point > DXFPointArray;
-
 enum DXFEntityType {
     DXF_LINE,
     DXF_POINT,
@@ -400,8 +398,6 @@ struct DXFEdgeTypeSpline : public DXFEdgeType
     virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
 };
 
-typedef std::deque< DXFEdgeType* > DXFEdgeTypeArray;
-
 struct DXFBoundaryPathData
 {
     sal_Int32           nFlags;                 // 92
@@ -412,11 +408,12 @@ struct DXFBoundaryPathData
     sal_Int32           nSourceBoundaryObjects; // 97
     sal_Int32           nEdgeCount;             // 93
 
-    bool            bIsPolyLine;
+    bool                bIsPolyLine;
     sal_Int32           nPointIndex;
 
     DXFVector*          pP;
-    DXFEdgeTypeArray    aEdges;
+    std::deque< DXFEdgeType* >
+                        aEdges;
 
     DXFBoundaryPathData();
     ~DXFBoundaryPathData();
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index e343902e2481..a450b4f4c1af 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -31,9 +31,8 @@
 
 namespace vcl { class Window; }
 
-typedef ::svt::OGenericUnoDialog             PDFDialog_DialogBase;
 typedef ::cppu::ImplInheritanceHelper2  <
-                                             PDFDialog_DialogBase,
+                                             ::svt::OGenericUnoDialog,
                                              XPropertyAccess,
                                              XExporter
                                         >    PDFDialog_Base;