diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-19 13:38:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-23 10:05:46 +0200 |
| commit | 376d5a6ad979ef2b3e90c186ca8ede0ef2824200 (patch) | |
| tree | e504f14486204108d19270e1bd419294a292ce10 /framework/source/inc/accelerators/acceleratorconfiguration.hxx | |
| parent | 2f4c796c4db95a52b9478049e9872b92a93474b9 (diff) | |
convert more services in framework module to WeakImplHelper
Change-Id: I417ae2ce644f39fce0e8eb9fbe6a3a3c783b6227
Diffstat (limited to 'framework/source/inc/accelerators/acceleratorconfiguration.hxx')
| -rw-r--r-- | framework/source/inc/accelerators/acceleratorconfiguration.hxx | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index ff30b448d57b..6f3e055ee6e3 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -47,7 +47,8 @@ #include <com/sun/star/form/XReset.hpp> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase4.hxx> #include <salhelper/singletonref.hxx> //__________________________________________ @@ -68,14 +69,13 @@ typedef PresetHandler AcceleratorPresets; /** implements a read/write access to the accelerator configuration. */ -class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... - , public IStorageListener - , public ::cppu::OWeakObject - , public css::lang::XTypeProvider - , public css::form::XReset // TODO use XPresetHandler instead if available - , public css::ui::XAcceleratorConfiguration // => css::ui::XUIConfigurationPersistence - // css::ui::XUIConfigurationStorage - // css::ui::XUIConfiguration +class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, // attention! Must be the first base class to guarentee right initialize lock ... + public IStorageListener, + public ::cppu::WeakImplHelper2< + css::form::XReset, // TODO use XPresetHandler instead if available + css::ui::XAcceleratorConfiguration > // => css::ui::XUIConfigurationPersistence + // css::ui::XUIConfigurationStorage + // css::ui::XUIConfiguration { //______________________________________ // member @@ -116,10 +116,6 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase public: - // XInterface, XTypeProvider - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER - // XAcceleratorConfiguration virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() throw(css::uno::RuntimeException); @@ -286,15 +282,14 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase }; -class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... - , public ::cppu::OWeakObject - , public css::lang::XTypeProvider - , public css::util::XChangesListener - , public css::lang::XComponent - , public css::form::XReset // TODO use XPresetHandler instead if available - , public css::ui::XAcceleratorConfiguration // => css::ui::XUIConfigurationPersistence - // css::ui::XUIConfigurationStorage - // css::ui::XUIConfiguration +class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase, // attention! Must be the first base class to guarentee right initialize lock ... + public ::cppu::WeakImplHelper4< + css::util::XChangesListener, + css::lang::XComponent, + css::form::XReset, // TODO use XPresetHandler instead if available + css::ui::XAcceleratorConfiguration > // => css::ui::XUIConfigurationPersistence + // css::ui::XUIConfigurationStorage + // css::ui::XUIConfiguration { //______________________________________ // member @@ -330,10 +325,6 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase public: - // XInterface, XTypeProvider - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER - // XAcceleratorConfiguration virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() throw(css::uno::RuntimeException); |