weld AreaPropertyPanel

Change-Id: I5f4c4b43067b99cd57f8ea941002481ef5977e09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86144
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 315fd9e1c57e..226160e422c0 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -150,7 +150,7 @@ class PaletteManager;
 
 namespace svx
 {
-    class ToolboxButtonColorUpdater;
+    class ToolboxButtonColorUpdaterBase;
 }
 
 class SVX_DLLPUBLIC SvxStyleToolBoxControl final : public SfxToolBoxControl
@@ -204,13 +204,15 @@ typedef std::function<void(const OUString&, const NamedColor&)> ColorSelectFunct
 class SVX_DLLPUBLIC SvxColorToolBoxControl final : public cppu::ImplInheritanceHelper< svt::PopupWindowController,
                                                                                  css::frame::XSubToolbarController >
 {
-    std::unique_ptr<svx::ToolboxButtonColorUpdater> m_xBtnUpdater;
+    std::unique_ptr<svx::ToolboxButtonColorUpdaterBase> m_xBtnUpdater;
     std::shared_ptr<PaletteManager> m_xPaletteManager;
     ColorStatus m_aColorStatus;
     bool m_bSplitButton;
     sal_uInt16 m_nSlotId;
     ColorSelectFunction m_aColorSelectFunction;
     DECL_LINK(SelectedHdl, const NamedColor&, void);
+    DECL_LINK(ToolbarHdl_Impl, const OString&, void);
+
 public:
     explicit SvxColorToolBoxControl( const css::uno::Reference<css::uno::XComponentContext>& rContext );
     virtual ~SvxColorToolBoxControl() override;
@@ -265,8 +267,6 @@ private:
     LanguageType m_eLanguage;
     sal_uInt32   m_nFormatKey;
 
-    weld::Toolbar* m_pToolbar;
-    std::unique_ptr<svtools::ToolbarPopupBase> m_xPopover;
 public:
     static void GetCurrencySymbols( std::vector<OUString>& rList, bool bFlag,
                                     std::vector<sal_uInt16>& rCurrencyList );
@@ -277,14 +277,9 @@ public:
     // XToolbarController
     virtual void SAL_CALL execute( sal_Int16 nSelectModifier ) override;
 
-    // XComponent
-    virtual void SAL_CALL dispose() override;
-
     using svt::ToolboxController::createPopupWindow;
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
-    void EndPopupMode();
-
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;