rework custom widget welding to enable inheritence

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

1 files changed, 9 insertions, 6 deletions

diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index 4eb1fa8d48c3..f5c30c23060f 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -25,6 +25,7 @@
 #include <sfx2/objsh.hxx>
 
 #include <vcl/idle.hxx>
+#include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/doctempl.hxx>
 #include <o3tl/typed_flags_set.hxx>
@@ -57,6 +58,13 @@ namespace o3tl
 class SFX2_DLLPUBLIC SfxNewFileDialog : public weld::GenericDialogController
 {
 private:
+    Idle m_aPrevIdle;
+    SfxNewFileDialogMode m_nFlags;
+    SfxDocumentTemplates m_aTemplates;
+    SfxObjectShellLock m_xDocShell;
+
+    std::unique_ptr<SfxPreviewWin_Impl> m_xPreviewController;
+
     std::unique_ptr<weld::TreeView> m_xRegionLb;
     std::unique_ptr<weld::TreeView> m_xTemplateLb;
     std::unique_ptr<weld::CheckButton> m_xTextStyleCB;
@@ -66,13 +74,8 @@ private:
     std::unique_ptr<weld::CheckButton> m_xMergeStyleCB;
     std::unique_ptr<weld::Button> m_xLoadFilePB;
     std::unique_ptr<weld::Expander> m_xMoreBt;
-    std::unique_ptr<SfxPreviewWin_Impl> m_xPreviewWin;
+    std::unique_ptr<weld::CustomWeld> m_xPreviewWin;
     std::unique_ptr<weld::Label> m_xAltTitleFt;
-    Idle m_aPrevIdle;
-
-    SfxNewFileDialogMode m_nFlags;
-    SfxDocumentTemplates m_aTemplates;
-    SfxObjectShellLock m_xDocShell;
 
     DECL_LINK( Update, Timer *, void );