Use FeatureStateEvent directly for status updates

... for SfxPopupWindow and SvxColorToolBoxControl (the
latter shares BorderColorStatus with SvxColorWindow_Impl,
so it was easier to convert it too).

Change-Id: Ifcb23fe5809e467322d1cf4d790420886ac79b47

3 files changed, 6 insertions, 13 deletions

diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 60536f5d0c26..6185ce7a9685 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -95,10 +95,7 @@ protected:
     void                    UnbindListener();
     void                    AddStatusListener( const OUString& rCommandURL );
 
-    // SfxStatusListenerInterface
-    using FloatingWindow::StateChanged;
-    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                          const SfxPoolItem* pState );
+    virtual void            statusChanged( const css::frame::FeatureStateEvent& rEvent );
 
 public:
                             SfxPopupWindow( sal_uInt16 nId,
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index e29fe6c785aa..99c4dbc01328 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -77,8 +77,6 @@ public:
 
 class SvxLineEndWindow : public SfxPopupWindow
 {
-    using FloatingWindow::StateChanged;
-
 private:
     XLineEndListRef pLineEndList;
     VclPtr<ValueSet> aLineEndSet;
@@ -116,8 +114,7 @@ public:
 
     void            StartSelection();
 
-    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState ) override;
+    virtual void    statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 };
 
 
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 174c16d839dd..21f07f2a9234 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -222,15 +222,13 @@ class BorderColorStatus
 public:
     BorderColorStatus();
     ~BorderColorStatus();
-    void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState);
+    bool statusChanged( const css::frame::FeatureStateEvent& rEvent );
     Color GetColor();
 };
 
 typedef std::function<void(const OUString&, const Color&)> ColorSelectFunction;
 class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
 {
-    using SfxToolBoxControl::StateChanged;
-
     std::unique_ptr<svx::ToolboxButtonColorUpdater> m_xBtnUpdater;
     PaletteManager m_aPaletteManager;
     BorderColorStatus m_aBorderColorStatus;
@@ -242,8 +240,9 @@ public:
     SvxColorToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox);
     virtual ~SvxColorToolBoxControl() override;
 
-    virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
-                              const SfxPoolItem* pState) override;
+    // XStatusListener
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
     virtual void Select(sal_uInt16 nSelectModifier) override;