weld ConditionalFormattingDialog

Change-Id: I87c03555c5555b12a1be997e368a96d9b07d2b63
Reviewed-on: https://gerrit.libreoffice.org/80689
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 30 insertions, 6 deletions

diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 183a29d231ba..4656f3d37af7 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -110,6 +110,23 @@ public:
     void SetSelectedHdl( const Link<const NamedColor&, void>& rLink ) { maSelectedLink = rLink; }
 };
 
+class SVX_DLLPUBLIC MenuOrToolMenuButton
+{
+private:
+    // either
+    weld::MenuButton* m_pMenuButton;
+    // or
+    weld::Toolbar* m_pToolbar;
+    OString m_aIdent;
+public:
+    MenuOrToolMenuButton(weld::MenuButton* pMenuButton);
+    MenuOrToolMenuButton(weld::Toolbar* pToolbar, const OString& rIdent);
+
+    bool get_active() const;
+    void set_active(bool bActive) const;
+    weld::Widget* get_widget() const;
+};
+
 class SVX_DLLPUBLIC ColorWindow : public svtools::ToolbarPopupBase
 {
 private:
@@ -117,7 +134,7 @@ private:
 
     const sal_uInt16    theSlotId;
     weld::Window* const mpParentWindow;
-    weld::MenuButton* mpMenuButton;
+    MenuOrToolMenuButton maMenuButton;
     std::shared_ptr<PaletteManager> mxPaletteManager;
     ColorStatus&  mrColorStatus;
     ColorSelectFunction const maColorSelectFunction;
@@ -148,7 +165,7 @@ public:
                 ColorStatus& rColorStatus,
                 sal_uInt16 nSlotId,
                 const css::uno::Reference< css::frame::XFrame >& rFrame,
-                weld::Window* pParentWindow, weld::MenuButton* pMenuButton,
+                weld::Window* pParentWindow, const MenuOrToolMenuButton &rMenuButton,
                 bool bInterimBuilder,
                 ColorSelectFunction const& rColorSelectFunction);
     weld::Container* GetWidget() { return mxTopLevel.get(); }
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index d07d60edb62f..5332c98ed52e 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -20,12 +20,10 @@
 #define INCLUDED_SVX_FNTCTRL_HXX
 
 #include <memory>
-#include <vcl/customweld.hxx>
-#include <vcl/window.hxx>
 #include <editeng/svxfont.hxx>
-#include <svx/svxdllapi.h>
-
 #include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
+#include <vcl/customweld.hxx>
 
 class SfxItemSet;
 class FontPrevWin_Impl;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 33dadea0cc03..c85b86d7a8c7 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -266,6 +266,13 @@ public:
     virtual css::uno::Reference<css::awt::XWindow> CreateChildFrame() = 0;
 };
 
+class VCL_DLLPUBLIC Box : virtual public Container
+{
+public:
+    // Moves child to a new position in the list of children
+    virtual void reorder_child(weld::Widget* pWidget, int position) = 0;
+};
+
 class VCL_DLLPUBLIC ScrolledWindow : virtual public Container
 {
 protected:
@@ -1830,6 +1837,7 @@ public:
     virtual bool get_item_sensitive(const OString& rIdent) const = 0;
     virtual void set_item_active(const OString& rIdent, bool bActive) = 0;
     virtual bool get_item_active(const OString& rIdent) const = 0;
+    virtual void set_item_popover(const OString& rIdent, weld::Widget* pPopover) = 0;
 
     virtual void insert_separator(int pos, const OUString& rId) = 0;
     void append_separator(const OUString& rId) { insert_separator(-1, rId); }
@@ -1873,6 +1881,7 @@ public:
     virtual std::unique_ptr<Container> weld_container(const OString& id,
                                                       bool bTakeOwnership = false)
         = 0;
+    virtual std::unique_ptr<Box> weld_box(const OString& id, bool bTakeOwnership = false) = 0;
     virtual std::unique_ptr<Button> weld_button(const OString& id, bool bTakeOwnership = false) = 0;
     virtual std::unique_ptr<MenuButton> weld_menu_button(const OString& id,
                                                          bool bTakeOwnership = false)