diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-12 12:02:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-12 12:03:29 +0100 |
| commit | 307684b2c735947e81aa061b8e16fa197fc15857 (patch) | |
| tree | a8dd1888959ff3ee9739c6bdc73d4c4547b17ddd /include/svtools/toolboxcontroller.hxx | |
| parent | Remove pointless "shizhoubo" comments (diff) | |
| download | core-307684b2c735947e81aa061b8e16fa197fc15857.tar.gz core-307684b2c735947e81aa061b8e16fa197fc15857.zip | |
Clean-up svt::ToolboxController inheritance
...and fix its XTypeProvider::getTypes
Change-Id: Ic36b17b14da21a29ca5530dd5e2ad03ee3da0782
Diffstat (limited to 'include/svtools/toolboxcontroller.hxx')
| -rw-r--r-- | include/svtools/toolboxcontroller.hxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 021fe41c2967..17178217c236 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -30,7 +30,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase5.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/broadcasthelper.hxx> #include <comphelper/proparrhlp.hxx> @@ -46,15 +46,17 @@ class ToolBox; namespace svt { -class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusListener, - public ::com::sun::star::frame::XToolbarController, - public ::com::sun::star::lang::XInitialization, - public ::com::sun::star::util::XUpdatable, - public ::com::sun::star::lang::XComponent, +typedef cppu::WeakImplHelper5< + css::frame::XStatusListener, css::frame::XToolbarController, + css::lang::XInitialization, css::util::XUpdatable, + css::lang::XComponent > + ToolboxController_Base; + +class SVT_DLLPUBLIC ToolboxController : + public ToolboxController_Base, public ::comphelper::OMutexAndBroadcastHelper, public ::comphelper::OPropertyContainer, - public ::comphelper::OPropertyArrayUsageHelper< ToolboxController >, - public ::cppu::OWeakObject + public ::comphelper::OPropertyArrayUsageHelper< ToolboxController > { private: sal_Bool m_bSupportVisible; @@ -76,6 +78,8 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() + throw (css::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); |