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 /basic/source/basmgr | |
| 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>
Diffstat (limited to 'basic/source/basmgr')
| -rw-r--r-- | basic/source/basmgr/basmgr.cxx | 16 | ||||
| -rw-r--r-- | basic/source/basmgr/vbahelper.cxx | 4 |
2 files changed, 10 insertions, 10 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 ); |