now drop TabPageParent intermediate

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

12 files changed, 37 insertions, 55 deletions

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index caa618f0466f..248350e02d4b 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -204,8 +204,8 @@ protected:
     virtual void        Reset( const SfxItemSet* ) override;
 
 public:
-    SfxDocumentPage(TabPageParent pParent, const SfxItemSet&);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
+    SfxDocumentPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual ~SfxDocumentPage() override;
 
     void                EnableUseUserData();
@@ -227,9 +227,9 @@ protected:
     virtual void            Reset( const SfxItemSet* ) override;
 
 public:
-    SfxDocumentDescPage(TabPageParent pParent, const SfxItemSet&);
+    SfxDocumentDescPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
     virtual ~SfxDocumentDescPage() override;
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
 };
 
 // class SfxDocumentInfoDialog -------------------------------------------
@@ -454,8 +454,8 @@ protected:
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    SfxCustomPropertiesPage(TabPageParent pParent, const SfxItemSet&);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
+    SfxCustomPropertiesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual ~SfxCustomPropertiesPage() override;
 };
 
@@ -570,9 +570,9 @@ protected:
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    SfxCmisPropertiesPage(TabPageParent pParent, const SfxItemSet&);
+    SfxCmisPropertiesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
     virtual ~SfxCmisPropertiesPage() override;
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet*);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet*);
 };
 
 #endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 1f40b35bb958..26a1a32ca69c 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -75,7 +75,7 @@ class SfxManageStyleSheetPage final : public SfxTabPage
     void    SetDescriptionText_Impl();
 
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
 
     virtual bool        FillItemSet(SfxItemSet *) override;
     virtual void        Reset(const SfxItemSet *) override;
@@ -85,7 +85,7 @@ class SfxManageStyleSheetPage final : public SfxTabPage
     virtual DeactivateRC DeactivatePage(SfxItemSet *) override;
 
 public:
-    SfxManageStyleSheetPage(TabPageParent pParent, const SfxItemSet &rAttrSet);
+    SfxManageStyleSheetPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet);
     virtual ~SfxManageStyleSheetPage() override;
 };
 
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 78d159d75236..6278b7f0a8bf 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -44,6 +44,10 @@ namespace com { namespace sun { namespace star { namespace frame {
     class XFrame;
 } } } }
 
+namespace weld {
+    class Container;
+    class DialogController;
+}
 
 class SFX2_DLLPUBLIC SfxModule : public SfxShell
 {
@@ -74,7 +78,7 @@ public:
     void                        RegisterStatusBarControl(const SfxStbCtrlFactory&);
 
     virtual std::unique_ptr<SfxTabPage>  CreateTabPage( sal_uInt16 nId,
-                                               TabPageParent pParent,
+                                               weld::Container* pPage, weld::DialogController* pController,
                                                const SfxItemSet& rSet );
     virtual void                Invalidate(sal_uInt16 nId = 0) override;
 
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index c6b47b88a1ea..9b072a9e597e 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -76,12 +76,12 @@ protected:
 
 public:
 
-                        SfxCommonPrintOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SfxCommonPrintOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual             ~SfxCommonPrintOptionsTabPage() override;
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet*);
 };
 
 #endif // INCLUDED_SFX2_PRINTOPT_HXX
diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index 14478eaf063c..ed9686176fb4 100644
--- a/include/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.hxx
@@ -33,8 +33,8 @@ protected:
     virtual void            Reset( const SfxItemSet* ) override;
 
 public:
-    SfxSecurityPage(TabPageParent pParent, const SfxItemSet&);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet*);
+    SfxSecurityPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet*);
     weld::Builder& GetBuilder() const { return *m_xBuilder; }
 };
 
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 1ff48d364bfe..3d0176fe3964 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -32,7 +32,7 @@
 
 class SfxTabPage;
 
-typedef std::unique_ptr<SfxTabPage> (*CreateTabPage)(TabPageParent pParent, const SfxItemSet *rAttrSet);
+typedef std::unique_ptr<SfxTabPage> (*CreateTabPage)(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rAttrSet);
 typedef const sal_uInt16*     (*GetTabPageRanges)(); // provides international Which-value
 struct TabPageImpl;
 
@@ -175,7 +175,7 @@ private:
     std::unique_ptr< TabPageImpl >        pImpl;
 
 protected:
-    SfxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet);
+    SfxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet);
 
     sal_uInt16          GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const
                             { return pSet->GetPool()->GetWhich( nSlot, bDeep ); }
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 0463c3a1eaa5..8e781d2d1611 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -41,7 +41,11 @@ class SfxBaseController;
 class Size;
 class Point;
 class Fraction;
-namespace weld { class Window; }
+namespace weld {
+    class Container;
+    class DialogController;
+    class Window;
+}
 class KeyEvent;
 class SvBorder;
 class SdrView;
@@ -237,7 +241,7 @@ public:
     virtual SfxPrinter*         GetPrinter( bool bCreate = false );
     virtual sal_uInt16          SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL );
     virtual bool                HasPrintOptionsPage() const;
-    virtual std::unique_ptr<SfxTabPage>  CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions);
+    virtual std::unique_ptr<SfxTabPage>  CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions);
     Printer*                    GetActivePrinter() const;
 
     // Working set
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index f2053d4b9c09..08e2f0eeb64b 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -45,8 +45,8 @@ class SAL_WARN_UNUSED SvxTabPage : public SfxTabPage
 {
 
 public:
-    SvxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet &rAttrSet)
-        : SfxTabPage(pParent, rUIXMLDescription, rID, &rAttrSet)
+    SvxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet &rAttrSet)
+        : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet)
     {
     }
     virtual void PointChanged(weld::DrawingArea* pArea, RectPoint eRP) = 0;
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 177323136b34..5f343dcf3766 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -55,7 +55,7 @@ protected:
     virtual void    ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC   DeactivatePage( SfxItemSet* pSet ) override;
 
-    SvxHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 nSetId);
+    SvxHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId);
 
     sal_uInt16 const       nId;
     std::unique_ptr<SfxItemSet> pBBSet;
@@ -95,18 +95,18 @@ private:
 class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
 {
 public:
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
     // returns the Which values to the range
     static const sal_uInt16*  GetRanges() { return pRanges; }
-    SVX_DLLPRIVATE SvxHeaderPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SVX_DLLPRIVATE SvxHeaderPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
 };
 
 class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
 {
 public:
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
     static const sal_uInt16*  GetRanges() { return pRanges; }
-    SVX_DLLPRIVATE SvxFooterPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SVX_DLLPRIVATE SvxFooterPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
 };
 
 class SVX_DLLPUBLIC DeleteHeaderDialog : public weld::MessageDialogController
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 5339bfd55ef3..ba3c21c63ce3 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -89,10 +89,10 @@ public:
 class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage
 {
 public:
-    SvxGridTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxGridTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxGridTabPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet& rAttrSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index 29af647d6cd7..9af5c1062954 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -22,35 +22,9 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/builder.hxx>
-#include <vcl/weld.hxx>
 #include <vcl/window.hxx>
 #include <vcl/IContext.hxx>
 
-struct TabPageParent
-{
-    TabPageParent(vcl::Window* _pParent)
-        : pParent(_pParent)
-        , pPage(nullptr)
-        , pController(nullptr)
-    {
-    }
-    TabPageParent(weld::Container* _pPage, weld::DialogController* _pController)
-        : pParent(nullptr)
-        , pPage(_pPage)
-        , pController(_pController)
-    {
-    }
-    weld::Window* GetFrameWeld() const
-    {
-        if (pController)
-            return pController->getDialog();
-        return pParent->GetFrameWeld();
-    }
-    VclPtr<vcl::Window> pParent;
-    weld::Container* const pPage;
-    weld::DialogController* pController;
-};
-
 class VCL_DLLPUBLIC TabPage
     : public vcl::Window
     , public VclBuilderContainer
diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index 88788fdc549c..6fb6adf3390f 100644
--- a/include/vcl/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -81,7 +81,7 @@ namespace vcl
     class VCL_DLLPUBLIC OWizardPage : public BuilderPage, public IWizardPageController
     {
     public:
-        OWizardPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID);
+        OWizardPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID);
         virtual ~OWizardPage() override;
 
         // IWizardPageController overridables