basic,basctl: inline some use-once typedefs

Change-Id: I60619a5bfe9507fb5ed24123f62f6b5c2f2c8712

9 files changed, 19 insertions, 38 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 8aef5c745475..80a9e2763f04 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -159,9 +159,9 @@ private:
     <p>The instance holds its XAccessibleContext with a hard reference, while
     the context holds this instance weak.</p>
 */
-typedef ::cppu::WeakImplHelper< css::accessibility::XAccessible > AccessibleGridControlAccess_Base;
 
-class AccessibleGridControlAccess :public AccessibleGridControlAccess_Base
+class AccessibleGridControlAccess :
+     public ::cppu::WeakImplHelper< css::accessibility::XAccessible >
     ,public ::svt::table::IAccessibleTableControl
 {
 private:
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 79e352e81cb9..834979a8cba4 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -62,9 +62,7 @@ namespace basctl
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper< container::XContainerListener > ContainerListenerBASE;
-
-class ContainerListenerImpl : public ContainerListenerBASE
+class ContainerListenerImpl : public ::cppu::WeakImplHelper< container::XContainerListener >
 {
     Shell* mpShell;
 public:
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index af0e8d3a0c55..ae4d83dd9531 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -66,12 +66,10 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::ui::dialogs;
 
-typedef ::cppu::WeakImplHelper< task::XInteractionHandler > HandlerImpl_BASE;
-
 namespace
 {
 
-class DummyInteractionHandler  : public HandlerImpl_BASE
+class DummyInteractionHandler  : public ::cppu::WeakImplHelper< task::XInteractionHandler >
 {
     Reference< task::XInteractionHandler2 > m_xHandler;
 public:
@@ -1167,9 +1165,8 @@ void LibPage::implExportLib( const OUString& aLibName, const OUString& aTargetUR
 }
 
 // Implementation XCommandEnvironment
-typedef cppu::WeakImplHelper< XCommandEnvironment > LibCommandEnvironmentHelper;
 
-class OLibCommandEnvironment : public LibCommandEnvironmentHelper
+class OLibCommandEnvironment : public cppu::WeakImplHelper< XCommandEnvironment >
 {
     Reference< task::XInteractionHandler > mxInteraction;
 
diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx
index 2178423d946f..5a42822150ec 100644
--- a/basctl/source/inc/dlgedclip.hxx
+++ b/basctl/source/inc/dlgedclip.hxx
@@ -27,12 +27,8 @@ namespace basctl
 {
 
 
-// DlgEdTransferableImpl
-
-
-typedef ::cppu::WeakImplHelper< css::datatransfer::XTransferable, css::datatransfer::clipboard::XClipboardOwner > DlgEdTransferableHelper;
-
-class DlgEdTransferableImpl : public DlgEdTransferableHelper
+class DlgEdTransferableImpl : public ::cppu::WeakImplHelper< css::datatransfer::XTransferable,
+                                                             css::datatransfer::clipboard::XClipboardOwner >
 {
 private:
     css::uno::Sequence< css::datatransfer::DataFlavor > m_SeqFlavors;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index d9e8a5cad1c0..8aa4ae4689c0 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -75,8 +75,6 @@ using namespace cppu;
 
 typedef WeakImplHelper< container::XNameContainer > NameContainerHelper;
 typedef WeakImplHelper< script::XStarBasicModuleInfo > ModuleInfoHelper;
-typedef WeakImplHelper< script::XStarBasicDialogInfo > DialogInfoHelper;
-typedef WeakImplHelper< script::XStarBasicLibraryInfo > LibraryInfoHelper;
 typedef WeakImplHelper< script::XStarBasicAccess > StarBasicAccessHelper;
 
 // Version 1
@@ -1721,7 +1719,7 @@ public:
 
 
 
-class DialogInfo_Impl : public DialogInfoHelper
+class DialogInfo_Impl : public WeakImplHelper< script::XStarBasicDialogInfo >
 {
     OUString maName;
     uno::Sequence< sal_Int8 > mData;
@@ -1740,7 +1738,7 @@ public:
 
 
 
-class LibraryInfo_Impl : public LibraryInfoHelper
+class LibraryInfo_Impl : public WeakImplHelper< script::XStarBasicLibraryInfo >
 {
     OUString maName;
     uno::Reference< container::XNameContainer > mxModuleContainer;
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index b1b2bf1c502a..7abf2567fd12 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -27,9 +27,8 @@
 using namespace ::com::sun::star;
 using namespace ::ooo;
 
-typedef ::cppu::WeakImplHelper< vba::XErrObject, script::XDefaultProperty > ErrObjectImpl_BASE;
-
-class ErrObject : public ErrObjectImpl_BASE
+class ErrObject : public ::cppu::WeakImplHelper< vba::XErrObject,
+                                                 script::XDefaultProperty >
 {
     OUString m_sHelpFile;
     OUString m_sSource;
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 92d59521042f..f87eeac5d328 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -105,8 +105,6 @@ TYPEINIT1(SbUnoService,SbxObject)
 TYPEINIT1(SbUnoServiceCtor,SbxMethod)
 TYPEINIT1(SbUnoSingleton,SbxObject)
 
-typedef WeakImplHelper< XAllListener > BasicAllListenerHelper;
-
 // Identifiers for creating the strings for dbg_Properties
 static char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces";
 static char const ID_DBG_PROPERTIES[] = "Dbg_Properties";
@@ -3882,7 +3880,7 @@ void SbUnoSingleton::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 
 // Implementation of an EventAttacher-drawn AllListener, which
 // solely transmits several events to an general AllListener
-class BasicAllListener_Impl : public BasicAllListenerHelper
+class BasicAllListener_Impl : public WeakImplHelper< XAllListener >
 {
     void firing_impl(const AllEventObject& Event, Any* pRet);
 
@@ -4322,10 +4320,8 @@ protected:
 };
 } // namespace
 
-typedef WeakImplHelper< XInvocation, XComponent > ModuleInvocationProxyHelper;
-
 class ModuleInvocationProxy : public OMutexBasis,
-                              public ModuleInvocationProxyHelper
+                              public WeakImplHelper< XInvocation, XComponent >
 {
     OUString            m_aPrefix;
     SbxObjectRef        m_xScopeObj;
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index a74d2b226c0a..d10cf79014c4 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -86,8 +86,6 @@ public:
 
 
 
-typedef ::cppu::WeakImplHelper< css::beans::XPropertySetInfo > SbPropertySetInfoHelper;
-
 // AB 20.3.2000 Help Class for XPropertySetInfo implementation
 class PropertySetInfoImpl
 {
@@ -109,7 +107,7 @@ public:
         throw ( css::uno::RuntimeException );
 };
 
-class SbPropertySetInfo:    public SbPropertySetInfoHelper
+class SbPropertySetInfo: public ::cppu::WeakImplHelper< css::beans::XPropertySetInfo >
 {
     PropertySetInfoImpl aImpl;
 
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index bb8d1b7a8a91..2682eee31d19 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -49,17 +49,16 @@ public:
 };
 
 
-typedef boost::ptr_vector<SbiSymDef> SbiSymbols;
-
 class SbiSymPool {
     friend class SbiSymDef;
     friend class SbiProcDef;
 protected:
     SbiStringPool& rStrings;
-    SbiSymbols  aData;
-    SbiSymPool* pParent;
-    SbiParser*  pParser;
-    SbiSymScope eScope;
+    boost::ptr_vector<SbiSymDef>
+                   aData;
+    SbiSymPool*    pParent;
+    SbiParser*     pParser;
+    SbiSymScope    eScope;
     sal_uInt16     nProcId;             // for STATIC-variable
     sal_uInt16     nCur;                // iterator
 public: