diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-02 17:14:33 +0900 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-06 07:28:21 +0000 |
commit | 7640e244db0565b1cb3909a7e243a2accd86e5c9 (patch) | |
tree | 7333ac2033b6e6ad8df961472efec4f5d3672532 | |
parent | 52099a7ad3cafc206b71723fd41950203005e9eb (diff) |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, in basic.
Change-Id: I13c5644bd6b9e964e42a98bee9c3019d959efb36
Reviewed-on: https://gerrit.libreoffice.org/16719
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r-- | basic/source/basmgr/basmgr.cxx | 16 | ||||
-rw-r--r-- | basic/source/basmgr/vbahelper.cxx | 4 | ||||
-rw-r--r-- | basic/source/classes/errobject.cxx | 4 | ||||
-rw-r--r-- | basic/source/classes/eventatt.cxx | 4 | ||||
-rw-r--r-- | basic/source/classes/sb.cxx | 4 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 9 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 7 | ||||
-rw-r--r-- | basic/source/inc/namecont.hxx | 9 | ||||
-rw-r--r-- | basic/source/inc/propacc.hxx | 9 | ||||
-rw-r--r-- | basic/source/runtime/comenumwrapper.hxx | 4 |
10 files changed, 33 insertions, 37 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 05446253fc60..da8681aa76e0 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -66,18 +66,18 @@ #include <com/sun/star/script/vba/XVBAModuleInfo.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> using com::sun::star::uno::Reference; using namespace com::sun::star; using namespace com::sun::star::script; using namespace cppu; -typedef WeakImplHelper1< container::XNameContainer > NameContainerHelper; -typedef WeakImplHelper1< script::XStarBasicModuleInfo > ModuleInfoHelper; -typedef WeakImplHelper1< script::XStarBasicDialogInfo > DialogInfoHelper; -typedef WeakImplHelper1< script::XStarBasicLibraryInfo > LibraryInfoHelper; -typedef WeakImplHelper1< script::XStarBasicAccess > StarBasicAccessHelper; +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 // sal_uInt32 nEndPos @@ -139,7 +139,7 @@ BasicManagerImpl::~BasicManagerImpl() // BasMgrContainerListenerImpl -typedef ::cppu::WeakImplHelper1< container::XContainerListener > ContainerListenerHelper; +typedef ::cppu::WeakImplHelper< container::XContainerListener > ContainerListenerHelper; class BasMgrContainerListenerImpl: public ContainerListenerHelper { @@ -2242,7 +2242,7 @@ void LibraryContainer_Impl::removeByName( const OUString& Name ) -typedef WeakImplHelper1< script::XStarBasicAccess > StarBasicAccessHelper; +typedef WeakImplHelper< script::XStarBasicAccess > StarBasicAccessHelper; class StarBasicAccess_Impl : public StarBasicAccessHelper diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx index c61b0e9097ae..09e07def3a9c 100644 --- a/basic/source/basmgr/vbahelper.cxx +++ b/basic/source/basmgr/vbahelper.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/instance.hxx> namespace basic { @@ -52,7 +52,7 @@ uno::Reference< frame::XModuleManager2 > lclCreateModuleManager() /** Implementation of an enumeration of all open documents of the same type. */ -class DocumentsEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration > +class DocumentsEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { public: explicit DocumentsEnumeration( const uno::Reference< frame::XModel >& rxModel ); diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx index 163336be8fe8..b1b2bf1c502a 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -19,7 +19,7 @@ #include "errobject.hxx" -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/script/XDefaultProperty.hpp> #include "sbintern.hxx" #include "runtime.hxx" @@ -27,7 +27,7 @@ using namespace ::com::sun::star; using namespace ::ooo; -typedef ::cppu::WeakImplHelper2< vba::XErrObject, script::XDefaultProperty > ErrObjectImpl_BASE; +typedef ::cppu::WeakImplHelper< vba::XErrObject, script::XDefaultProperty > ErrObjectImpl_BASE; class ErrObject : public ErrObjectImpl_BASE { diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 0f79fdd84a90..bbf1b9b0053a 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -58,7 +58,7 @@ #include <sbintern.hxx> #include <eventatt.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; @@ -136,7 +136,7 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere } -class BasicScriptListener_Impl : public WeakImplHelper1< XScriptListener > +class BasicScriptListener_Impl : public WeakImplHelper< XScriptListener > { StarBASICRef maBasicRef; Reference< frame::XModel > m_xModel; diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 82b154b976e1..a22330e34b21 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -39,7 +39,7 @@ #include "sb.hrc" #include <basrid.hxx> #include <osl/mutex.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XCloseBroadcaster.hpp> #include <com/sun/star/util/XCloseListener.hpp> @@ -65,7 +65,7 @@ using com::sun::star::lang::XMultiServiceFactory; -class DocBasicItem : public ::cppu::WeakImplHelper1< util::XCloseListener > +class DocBasicItem : public ::cppu::WeakImplHelper< util::XCloseListener > { public: explicit DocBasicItem( StarBASIC& rDocBasic ); diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 7c2b2b3a72d2..3d3dfbee6c9c 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -22,8 +22,7 @@ #include <tools/errcode.hxx> #include <svl/hint.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -106,7 +105,7 @@ TYPEINIT1(SbUnoService,SbxObject) TYPEINIT1(SbUnoServiceCtor,SbxMethod) TYPEINIT1(SbUnoSingleton,SbxObject) -typedef WeakImplHelper1< XAllListener > BasicAllListenerHelper; +typedef WeakImplHelper< XAllListener > BasicAllListenerHelper; // Identifiers for creating the strings for dbg_Properties static char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces"; @@ -3996,7 +3995,7 @@ void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeExcep // class InvocationToAllListenerMapper // helper class to map XInvocation to XAllListener (also in project eventattacher!) -class InvocationToAllListenerMapper : public WeakImplHelper1< XInvocation > +class InvocationToAllListenerMapper : public WeakImplHelper< XInvocation > { public: InvocationToAllListenerMapper( const Reference< XIdlClass >& ListenerType, @@ -4325,7 +4324,7 @@ protected: }; } // namespace -typedef WeakImplHelper2< XInvocation, XComponent > ModuleInvocationProxyHelper; +typedef WeakImplHelper< XInvocation, XComponent > ModuleInvocationProxyHelper; class ModuleInvocationProxy : public OMutexBasis, public ModuleInvocationProxyHelper diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 77ad63df7e48..8c99af43a8c2 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -43,7 +43,7 @@ #include <osl/mutex.hxx> #include "sbobjmod.hxx" #include <basic/vbahelper.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <unotools/eventcfg.hxx> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -63,7 +63,6 @@ #include <comphelper/processfactory.hxx> #include <map> #include <com/sun/star/reflection/ProxyFactory.hpp> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/XAggregation.hpp> #include <com/sun/star/script/XInvocation.hpp> @@ -84,7 +83,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::script; using namespace com::sun::star::uno; -typedef ::cppu::WeakImplHelper1< XInvocation > DocObjectWrapper_BASE; +typedef ::cppu::WeakImplHelper< XInvocation > DocObjectWrapper_BASE; typedef ::std::map< sal_Int16, Any, ::std::less< sal_Int16 > > OutParamMap; class DocObjectWrapper : public DocObjectWrapper_BASE @@ -2235,7 +2234,7 @@ void SbObjModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } -typedef ::cppu::WeakImplHelper3< +typedef ::cppu::WeakImplHelper< awt::XTopWindowListener, awt::XWindowListener, document::XDocumentEventListener > FormObjEventListener_BASE; diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 5a18cf589aa5..af86eee61515 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -45,8 +45,8 @@ #include <osl/mutex.hxx> #include <unotools/eventlisteneradapter.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/compbase8.hxx> +#include <cppuhelper/implbase.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/component.hxx> @@ -55,13 +55,12 @@ #include <sot/storage.hxx> #include <comphelper/listenernotification.hxx> #include <xmlscript/xmllib_imexp.hxx> -#include <cppuhelper/compbase9.hxx> class BasicManager; namespace basic { -typedef ::cppu::WeakImplHelper3< +typedef ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XContainer, ::com::sun::star::util::XChangesNotifier > NameContainer_BASE; @@ -210,7 +209,7 @@ private: class SfxLibrary; -typedef ::cppu::WeakComponentImplHelper9< +typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::lang::XInitialization, ::com::sun::star::script::XStorageBasedLibraryContainer, ::com::sun::star::script::XLibraryContainerPassword, diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 61f246d1c64a..c5de2b1ec430 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -24,15 +24,14 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/beans/XPropertyContainer.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <boost/ptr_container/ptr_vector.hpp> typedef ::boost::ptr_vector< ::com::sun::star::beans::PropertyValue > SbPropertyValueArr_Impl; -typedef ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XPropertyAccess > SbPropertyValuesHelper; +typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySet, + ::com::sun::star::beans::XPropertyAccess > SbPropertyValuesHelper; @@ -88,7 +87,7 @@ public: -typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo > SbPropertySetInfoHelper; +typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySetInfo > SbPropertySetInfoHelper; // AB 20.3.2000 Help Class for XPropertySetInfo implementation class PropertySetInfoImpl diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx index cb604b901049..cda1c9910bce 100644 --- a/basic/source/runtime/comenumwrapper.hxx +++ b/basic/source/runtime/comenumwrapper.hxx @@ -23,9 +23,9 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/script/XInvocation.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -class ComEnumerationWrapper : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumeration > +class ComEnumerationWrapper : public ::cppu::WeakImplHelper< ::com::sun::star::container::XEnumeration > { ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > m_xInvocation; sal_Int32 m_nCurInd; |