weld SfxTemplatePanelControl

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

10 files changed, 20 insertions, 16 deletions

diff --git a/include/cui/cuicharmap.hxx b/include/cui/cuicharmap.hxx
index 7c5ca0d28a23..76dd6c637f62 100644
--- a/include/cui/cuicharmap.hxx
+++ b/include/cui/cuicharmap.hxx
@@ -29,6 +29,7 @@
 #include <svx/ucsubset.hxx>
 #include <sfx2/charwin.hxx>
 #include <cui/cuidllapi.h>
+#include <com/sun/star/frame/XFrame.hpp>
 
 using namespace ::com::sun::star;
 class SubsetMap;
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 5d7f6d7e9ab7..436c08b09422 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -237,17 +237,11 @@
 #define STR_ERROR_WRONG_CONFIRM                 NC_("STR_ERROR_WRONG_CONFIRM", "Faulty password confirmation")
 #define STR_PDF_EXPORT_SEND                     NC_("STR_PDF_EXPORT_SEND", "Send")
 #define STR_FONT_TABPAGE                        NC_("STR_FONT_TABPAGE", "Font")
-#define STR_PREVIEW_CHECKBOX                    NC_("STR_PREVIEW_CHECKBOX", "Show previews")
 
 #define STR_VIEWVERSIONCOMMENT                  NC_("STR_VIEWVERSIONCOMMENT", "View Version Comment")
 #define STR_NO_NAME_SET                         NC_("STR_NO_NAME_SET", "(no name set)")
 
-#define STR_STYLE_ELEMTLIST                     NC_("STR_STYLE_ELEMTLIST", "Style List")
 #define STR_STYLE_FILTER_HIERARCHICAL           NC_("STR_STYLE_FILTER_HIERARCHICAL", "Hierarchical")
-#define STR_STYLE_FILL_FORMAT_MODE              NC_("STR_STYLE_FILL_FORMAT_MODE", "Fill Format Mode")
-#define STR_STYLE_NEW_STYLE_FROM_SELECTION      NC_("STR_STYLE_NEW_STYLE_FROM_SELECTION", "New Style from Selection")
-#define STR_STYLE_NEW_STYLE_ACTION              NC_("STR_STYLE_NEW_STYLE_ACTION", "Styles actions")
-#define STR_STYLE_UPDATE_STYLE                  NC_("STR_STYLE_UPDATE_STYLE", "Update Style")
 
 #define STR_MACRO_LOSS                          NC_("STR_MACRO_LOSS", "Do you really want to cancel the recording? Any steps recorded up to this point will be lost.")
 #define STR_CANCEL_RECORDING                    NC_("STR_CANCEL_RECORDING", "Cancel Recording")
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index fea8d735796b..dc939342689f 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -22,7 +22,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <vcl/image.hxx>
 #include <svl/style.hxx>
 #include <vector>
 
@@ -43,16 +42,16 @@ class SFX2_DLLPUBLIC SfxStyleFamilyItem
 {
     SfxStyleFamily  nFamily;
     OUString        aText;
-    Image           aImage;
+    OUString        aImage;
     SfxStyleFilter  aFilterList;
 
 public:
-    SfxStyleFamilyItem(SfxStyleFamily nFamily, const OUString &rName, const Image& rImage, const std::pair<const char*, SfxStyleSearchBits>* pStringArray, const std::locale& rLocale);
+    SfxStyleFamilyItem(SfxStyleFamily nFamily, const OUString &rName, const OUString& rImage, const std::pair<const char*, SfxStyleSearchBits>* pStringArray, const std::locale& rLocale);
 
     const OUString& GetText() const { return aText; }
     SfxStyleFamily  GetFamily() const { return nFamily; }
     const SfxStyleFilter& GetFilterList() const { return aFilterList; }
-    const Image&    GetImage() const { return aImage; }
+    const OUString&    GetImage() const { return aImage; }
 };
 
 using SfxStyleFamilies = std::vector<SfxStyleFamilyItem>;
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 05230e58310b..0d770572f051 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -38,6 +38,8 @@ struct TabPageImpl;
 
 struct TabDlg_Impl;
 
+namespace com::sun::star::frame { class XFrame; }
+
 #define RET_USER        100
 #define RET_USER_CANCEL 101
 
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 3ed02ac9037a..8144340a0ee7 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -12,6 +12,7 @@
 
 #include <sfx2/thumbnailview.hxx>
 #include <sfx2/templateproperties.hxx>
+#include <vcl/menu.hxx>
 #include <functional>
 #include <memory>
 #include <set>
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 3c0f4e2e99d3..8ffc8ddfcdb0 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -23,19 +23,19 @@
 #include <memory>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <vcl/window.hxx>
+#include <sfx2/sidebar/PanelLayout.hxx>
 
 class SfxBindings;
 class SfxTemplateDialog_Impl;
 
-class UNLESS_MERGELIBS(SFX2_DLLPUBLIC) SfxTemplatePanelControl final : public vcl::Window
+class UNLESS_MERGELIBS(SFX2_DLLPUBLIC) SfxTemplatePanelControl final : public PanelLayout
 {
 public:
     SfxTemplatePanelControl(SfxBindings* pBindings, vcl::Window* pParentWindow);
     virtual ~SfxTemplatePanelControl() override;
     virtual void dispose() override;
 
-    virtual void Resize() override;
+    weld::Builder* get_builder() { return m_xBuilder.get(); }
 
 private:
     std::unique_ptr<SfxTemplateDialog_Impl> pImpl;
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 618fc8578705..5f55b6b416b2 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -27,6 +27,7 @@
 
 class Printer;
 class QueueInfo;
+class VclSimpleEvent;
 
 class SVT_DLLPUBLIC PrinterSetupDialog final : public weld::GenericDialogController
 {
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index c9b2ea3b86af..3aefe3d82072 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -24,6 +24,7 @@
 #include <svtools/svtdllapi.h>
 #include <tools/wintypes.hxx>
 #include <vcl/customweld.hxx>
+#include <vcl/image.hxx>
 #include <memory>
 #include <vector>
 
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index da1522787258..384fa31155ae 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -21,7 +21,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/vclenum.hxx>
 #include <vcl/font.hxx>
-#include <vcl/menu.hxx>
+#include <vcl/vclptr.hxx>
 #include <vcl/uitest/factory.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
@@ -62,9 +62,10 @@ typedef css::uno::Reference<css::accessibility::XAccessible> a11yref;
 typedef css::uno::Reference<css::accessibility::XAccessibleRelationSet> a11yrelationset;
 
 enum class PointerStyle;
-class SvNumberFormatter;
+class CommandEvent;
 class KeyEvent;
 class MouseEvent;
+class SvNumberFormatter;
 class TransferDataContainer;
 class OutputDevice;
 class VirtualDevice;
@@ -73,6 +74,7 @@ struct SystemEnvData;
 namespace vcl
 {
 class ILibreOfficeKitNotifier;
+typedef OutputDevice RenderContext;
 }
 
 namespace weld
@@ -1138,7 +1140,7 @@ public:
     void connect_custom_get_size(const Link<get_size_args, Size>& rLink) { m_aGetSizeHdl = rLink; }
     void connect_custom_render(const Link<render_args, void>& rLink) { m_aRenderHdl = rLink; }
     // call set_column_custom_renderer after setting custom callbacks
-    virtual void set_column_custom_renderer(int nColumn) = 0;
+    virtual void set_column_custom_renderer(int nColumn, bool bEnable) = 0;
 
     // for dnd
     virtual bool get_dest_row_at_pos(const Point& rPos, weld::TreeIter* pResult) = 0;
diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx
index cb04f2d74915..90a8a20a4467 100644
--- a/include/vcl/weldutils.hxx
+++ b/include/vcl/weldutils.hxx
@@ -158,6 +158,9 @@ VCL_DLLPUBLIC size_t GetAbsPos(const weld::TreeView& rTreeView, const weld::Tree
 
 // an entry is visible if all parents are expanded
 VCL_DLLPUBLIC bool IsEntryVisible(const weld::TreeView& rTreeView, const weld::TreeIter& rIter);
+
+// A Parent's Children are turned into Children of the Parent which comes next in hierarchy
+VCL_DLLPUBLIC void RemoveParentKeepChildren(weld::TreeView& rTreeView, weld::TreeIter& rParent);
 }
 
 #endif