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

Change-Id: I35f256a11b211c3cb977ae76b5b561efbfd13b9d

3 files changed, 5 insertions, 9 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();