diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-06 22:35:15 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-06 22:49:09 +0300 |
| commit | 064481201341d92af2ec1387bb53a9c4b480217f (patch) | |
| tree | 55d0b8b03a011dd4c606b3b848377151ca0797ca /include | |
| parent | e93b4d20d88ab70489e4daad5e8640b34d06b28f (diff) | |
tdf#83541 Redraw the last used color after theme change
That's not what XSubToolbarController was originally designed for,
probably, but it has more in common than otherwise. A split button
offers a dropdown with some functions, and the main part of that
button updates with the last selection, to easily re-apply it.
This is based on the change made in commit
dd69bde36a4ee4636933a80c0291486593a37670, so that updateImage
method is called once an icon refreshing is requested.
Change-Id: I6bd15638665f917ed7060886cd7835cdcd1a34f9
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/tbcontrl.hxx | 4 | ||||
| -rw-r--r-- | include/svx/tbxcolorupdate.hxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 1759f568a290..9e589ac44f59 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -243,6 +243,10 @@ public: const SfxPoolItem* pState) SAL_OVERRIDE; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE; + + // XSubToolbarController + virtual sal_Bool SAL_CALL opensSubToolbar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateImage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index 1a649e4153fa..d356f889bb30 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -49,7 +49,7 @@ namespace svx ToolBox* ptrTbx); ~ToolboxButtonColorUpdater(); - void Update( const Color& rColor ); + void Update( const Color& rColor, bool bForceUpdate = false ); private: sal_uInt16 mnBtnId; |