diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-14 10:23:57 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-14 10:46:14 +0000 |
| commit | 431f2ce81893db21f23572926e8a5b045c67e9ae (patch) | |
| tree | 6ea4842720498966bbf22d135756a64ee9505280 /framework/source/inc | |
| parent | 48c4810edf302c1f0593328535f065ed338e0a18 (diff) | |
framework: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I6acff50f23bcbac58c689caf2a7f07dbd5404e57
Reviewed-on: https://gerrit.libreoffice.org/17734
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework/source/inc')
4 files changed, 6 insertions, 8 deletions
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index b963daaa47c0..b423f4bbcd01 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -46,8 +46,7 @@ #include <com/sun/star/form/XReset.hpp> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <salhelper/singletonref.hxx> // definition @@ -63,7 +62,7 @@ const char CFG_ENTRY_MODULES[] = "Modules"; implements a read/write access to the accelerator configuration. */ class XMLBasedAcceleratorConfiguration : public IStorageListener, - public ::cppu::WeakImplHelper2< + public ::cppu::WeakImplHelper< css::form::XReset, // TODO use XPresetHandler instead if available css::ui::XAcceleratorConfiguration > // => css::ui::XUIConfigurationPersistence // css::ui::XUIConfigurationStorage @@ -234,7 +233,7 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, }; -class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< +class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper< css::util::XChangesListener, css::lang::XComponent, css::form::XReset, // TODO use XPresetHandler instead if available diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index 17db900dee76..f5a477c92ba1 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XSynchronousDispatch.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> namespace framework{ @@ -35,7 +35,7 @@ namespace framework{ @author as96863 */ -class LoadDispatcher : public ::cppu::WeakImplHelper2< css::frame::XNotifyingDispatch, // => XDispatch => XInterface +class LoadDispatcher : public ::cppu::WeakImplHelper< css::frame::XNotifyingDispatch, // => XDispatch => XInterface css::frame::XSynchronousDispatch > { diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index dbcd165fd154..95c239d69374 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/weakref.hxx> #include <tools/link.hxx> namespace com { namespace sun { namespace star { namespace uno { diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 7a6f31759dbc..d2fa915f158e 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -35,7 +35,6 @@ #include <rtl/ref.hxx> #include <unotools/mediadescriptor.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <cppuhelper/implbase2.hxx> namespace framework { |