diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-06 15:09:55 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-08 16:07:28 +0200 |
| commit | a1f97ed2aa4b8f2c91d4b87fb59c8937523c2ba4 (patch) | |
| tree | 75b702c9e2ab63acd62a185a681622978422824b /include | |
| parent | 215953f9814f43d51a610fde9d3ee966a2981063 (diff) | |
XSubToolbarController is only used by SvxColorToolBoxControl
Change-Id: I10c31aa9c773649c99b52c2d34cb648a37bf42ac
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/tbxctrl.hxx | 11 | ||||
| -rw-r--r-- | include/svx/tbcontrl.hxx | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index f6373c368443..96b45afe48e9 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -27,7 +27,6 @@ #include <vcl/fixed.hxx> #include <vcl/floatwin.hxx> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/sfxstatuslistener.hxx> #include <svtools/toolboxcontroller.hxx> @@ -135,9 +134,7 @@ public: */ struct SfxToolBoxControl_Impl; -class SFX2_DLLPUBLIC SfxToolBoxControl: - public cppu::ImplInheritanceHelper< - svt::ToolboxController, css::frame::XSubToolbarController> +class SFX2_DLLPUBLIC SfxToolBoxControl: public svt::ToolboxController { friend class SfxPopupWindow; friend struct SfxTbxCtrlFactory; @@ -184,12 +181,6 @@ public: virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent ) throw (css::uno::RuntimeException, std::exception) override; - // XSubToolbarController - virtual sal_Bool SAL_CALL opensSubToolbar( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSubToolbarName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateImage( ) throw (css::uno::RuntimeException, std::exception) override; - public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index bf808381c6ac..3d923e1cee25 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -206,7 +206,8 @@ friend class SfxStyleControllerItem_Impl; typedef std::function<void(const OUString&, const NamedColor&)> ColorSelectFunction; -class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl +class SVX_DLLPUBLIC SvxColorToolBoxControl : public cppu::ImplInheritanceHelper< SfxToolBoxControl, + css::frame::XSubToolbarController > { std::unique_ptr<svx::ToolboxButtonColorUpdater> m_xBtnUpdater; PaletteManager m_aPaletteManager; @@ -227,6 +228,8 @@ public: // XSubToolbarController virtual sal_Bool SAL_CALL opensSubToolbar() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSubToolbarName() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL functionSelected( const OUString& rCommand ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL updateImage() throw (css::uno::RuntimeException, std::exception) override; void setColorSelectFunction(const ColorSelectFunction& aColorSelectFunction); |