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, 48 insertions, 45 deletions

diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index a747e91b2cc3..2a336f5a8289 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -112,7 +112,7 @@ public:
     // virtual methods for the option dialog
     virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override;
     virtual void         ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
-    virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override;
+    virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ) override;
     virtual std::unique_ptr<SfxStyleFamilies> CreateStyleFamilies() override;
 
     SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache;
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 971ef20cbe66..1a09eb06f44b 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -730,7 +730,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
         pViewShell->GetViewFrame()->GetBindings().InvalidateAll( true );
 }
 
-std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet )
+std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet )
 {
     std::unique_ptr<SfxTabPage> xRet;
     SfxAllItemSet aSet(*(rSet.GetPool()));
@@ -743,7 +743,7 @@ std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPagePare
         {
             ::CreateTabPage fnCreatePage = pFact->GetSdOptionsContentsTabPageCreatorFunc();
             if( fnCreatePage )
-                xRet = (*fnCreatePage)( pParent, &rSet );
+                xRet = (*fnCreatePage)( pPage, pController, &rSet );
         }
         break;
         case SID_SD_TP_SNAP:
@@ -751,7 +751,7 @@ std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPagePare
         {
             ::CreateTabPage fnCreatePage = pFact->GetSdOptionsSnapTabPageCreatorFunc();
             if( fnCreatePage )
-                xRet = (*fnCreatePage)( pParent, &rSet );
+                xRet = (*fnCreatePage)( pPage, pController, &rSet );
         }
         break;
         case SID_SD_TP_PRINT:
@@ -760,7 +760,7 @@ std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPagePare
             ::CreateTabPage fnCreatePage = pFact->GetSdPrintOptionsTabPageCreatorFunc();
             if( fnCreatePage )
             {
-                xRet = (*fnCreatePage)( pParent, &rSet );
+                xRet = (*fnCreatePage)( pPage, pController, &rSet );
                 if(SID_SD_TP_PRINT == nId)
                     aSet.Put (SfxUInt32Item(SID_SDMODE_FLAG,SD_DRAW_MODE));
                 xRet->PageCreated(aSet);
@@ -773,7 +773,7 @@ std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPagePare
             ::CreateTabPage fnCreatePage = pFact->GetSdOptionsMiscTabPageCreatorFunc();
             if( fnCreatePage )
             {
-                xRet = (*fnCreatePage)( pParent, &rSet );
+                xRet = (*fnCreatePage)( pPage, pController, &rSet );
                 if(SID_SD_TP_MISC == nId)
                     aSet.Put (SfxUInt32Item(SID_SDMODE_FLAG,SD_DRAW_MODE));
                 else
@@ -787,7 +787,7 @@ std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPagePare
             SfxAbstractDialogFactory* pSfxFact = SfxAbstractDialogFactory::Create();
             ::CreateTabPage fnCreatePage = pSfxFact->GetTabPageCreatorFunc( nId );
             if ( fnCreatePage )
-                xRet = (*fnCreatePage)( pParent, &rSet );
+                xRet = (*fnCreatePage)( pPage, pController, &rSet );
         }
         break;
     }
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 7b35e7a52e08..5fea036b484f 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -34,8 +34,8 @@
 class SdParagraphNumTabPage : public SfxTabPage
 {
 public:
-    SdParagraphNumTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SdParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
 
     static const sal_uInt16*  GetRanges();
 
@@ -51,8 +51,8 @@ private:
     DECL_LINK( ImplNewStartHdl, weld::Button&, void );
 };
 
-SdParagraphNumTabPage::SdParagraphNumTabPage(TabPageParent pParent, const SfxItemSet& rAttr)
-    : SfxTabPage(pParent, "modules/sdraw/ui/paranumberingtab.ui", "DrawParaNumbering", &rAttr)
+SdParagraphNumTabPage::SdParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+    : SfxTabPage(pPage, pController, "modules/sdraw/ui/paranumberingtab.ui", "DrawParaNumbering", &rAttr)
     , mbModified(false)
     , m_xNewStartCB(m_xBuilder->weld_check_button("checkbuttonCB_NEW_START"))
     , m_xNewStartNumberCB(m_xBuilder->weld_check_button("checkbuttonCB_NUMBER_NEW_START"))
@@ -62,9 +62,9 @@ SdParagraphNumTabPage::SdParagraphNumTabPage(TabPageParent pParent, const SfxIte
     m_xNewStartNumberCB->connect_clicked(LINK(this, SdParagraphNumTabPage, ImplNewStartHdl));
 }
 
-std::unique_ptr<SfxTabPage> SdParagraphNumTabPage::Create(TabPageParent pParent, const SfxItemSet * rAttrSet)
+std::unique_ptr<SfxTabPage> SdParagraphNumTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet * rAttrSet)
 {
-    return std::make_unique<SdParagraphNumTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SdParagraphNumTabPage>(pPage, pController, *rAttrSet);
 }
 
 const sal_uInt16* SdParagraphNumTabPage::GetRanges()
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 637954da1f4d..e15262806609 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -26,8 +26,8 @@
 /**
  *  dialog to adjust print options
  */
-SdPrintOptions::SdPrintOptions(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "modules/simpress/ui/prntopts.ui", "prntopts", &rInAttrs)
+SdPrintOptions::SdPrintOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "modules/simpress/ui/prntopts.ui", "prntopts", &rInAttrs)
     , m_xFrmContent(m_xBuilder->weld_frame("contentframe"))
     , m_xCbxDraw(m_xBuilder->weld_check_button("drawingcb"))
     , m_xCbxNotes(m_xBuilder->weld_check_button("notecb"))
@@ -175,10 +175,10 @@ void SdPrintOptions::Reset( const SfxItemSet* rAttrs )
     updateControls();
 }
 
-std::unique_ptr<SfxTabPage> SdPrintOptions::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SdPrintOptions::Create( weld::Container* pPage, weld::DialogController* pController,
                                            const SfxItemSet* rOutAttrs )
 {
-    return std::make_unique<SdPrintOptions>( pParent, *rOutAttrs );
+    return std::make_unique<SdPrintOptions>( pPage, pController, *rOutAttrs );
 }
 
 IMPL_LINK(SdPrintOptions, ClickCheckboxHdl, weld::ToggleButton&, rCbx, void)
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 467e928e1ec3..550857e5e1de 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -73,8 +73,7 @@ SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::V
                                    "InteractionDialog")
     , rOutAttrs(*pAttr)
 {
-    TabPageParent aParent(get_content_area(), this);
-    std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(aParent, rOutAttrs);
+    std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(get_content_area(), this, rOutAttrs);
 
     // formerly in PageCreated
     static_cast<SdTPAction*>( xNewPage.get() )->SetView( pView );
@@ -86,8 +85,8 @@ SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::V
 /**
  *  Action-TabPage
  */
-SdTPAction::SdTPAction(TabPageParent pWindow, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pWindow, "modules/simpress/ui/interactionpage.ui", "InteractionPage", &rInAttrs)
+SdTPAction::SdTPAction(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "modules/simpress/ui/interactionpage.ui", "InteractionPage", &rInAttrs)
     , mpView(nullptr)
     , mpDoc(nullptr)
     , bTreeUpdated(false)
@@ -343,9 +342,9 @@ DeactivateRC SdTPAction::DeactivatePage( SfxItemSet* pPageSet )
     return DeactivateRC::LeavePage;
 }
 
-std::unique_ptr<SfxTabPage> SdTPAction::Create(TabPageParent pParent, const SfxItemSet& rAttrs)
+std::unique_ptr<SfxTabPage> SdTPAction::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrs)
 {
-    return std::make_unique<SdTPAction>( pParent, rAttrs );
+    return std::make_unique<SdTPAction>( pPage, pController, rAttrs );
 }
 
 void SdTPAction::UpdateTree()
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index d78a81912d47..e6a910f11f47 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -41,8 +41,8 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-SdTpOptionsSnap::SdTpOptionsSnap(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SvxGridTabPage(pParent, rInAttrs)
+SdTpOptionsSnap::SdTpOptionsSnap(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SvxGridTabPage(pPage, pController, rInAttrs)
 {
     m_xSnapFrames->show();
 }
@@ -95,10 +95,10 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
     ClickRotateHdl_Impl(*m_xCbxRotate);
 }
 
-std::unique_ptr<SfxTabPage> SdTpOptionsSnap::Create( TabPageParent pWindow,
+std::unique_ptr<SfxTabPage> SdTpOptionsSnap::Create( weld::Container* pPage, weld::DialogController* pController,
                                             const SfxItemSet* rAttrs )
 {
-    return std::make_unique<SdTpOptionsSnap>(pWindow, *rAttrs);
+    return std::make_unique<SdTpOptionsSnap>(pPage, pController, *rAttrs);
 }
 
 /*************************************************************************
@@ -106,8 +106,8 @@ std::unique_ptr<SfxTabPage> SdTpOptionsSnap::Create( TabPageParent pWindow,
 |*  TabPage to adjust the content options
 |*
 \************************************************************************/
-SdTpOptionsContents::SdTpOptionsContents(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "modules/simpress/ui/sdviewpage.ui", "SdViewPage", &rInAttrs)
+SdTpOptionsContents::SdTpOptionsContents(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "modules/simpress/ui/sdviewpage.ui", "SdViewPage", &rInAttrs)
     , m_xCbxRuler(m_xBuilder->weld_check_button("ruler"))
     , m_xCbxDragStripes(m_xBuilder->weld_check_button("dragstripes"))
     , m_xCbxHandlesBezier(m_xBuilder->weld_check_button("handlesbezier"))
@@ -157,10 +157,10 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs )
     m_xCbxHandlesBezier->save_state();
 }
 
-std::unique_ptr<SfxTabPage> SdTpOptionsContents::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SdTpOptionsContents::Create( weld::Container* pPage, weld::DialogController* pController,
                                                 const SfxItemSet* rAttrs )
 {
-    return std::make_unique<SdTpOptionsContents>(pParent, *rAttrs);
+    return std::make_unique<SdTpOptionsContents>(pPage, pController, *rAttrs);
 }
 
 /*************************************************************************
@@ -171,8 +171,8 @@ std::unique_ptr<SfxTabPage> SdTpOptionsContents::Create( TabPageParent pParent,
 #define TABLE_COUNT 12
 #define TOKEN ':'
 
-SdTpOptionsMisc::SdTpOptionsMisc(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "modules/simpress/ui/optimpressgeneralpage.ui", "OptSavePage", &rInAttrs)
+SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "modules/simpress/ui/optimpressgeneralpage.ui", "OptSavePage", &rInAttrs)
     , nWidth(0)
     , nHeight(0)
     , m_xCbxQuickEdit(m_xBuilder->weld_check_button("qickedit"))
@@ -473,10 +473,10 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
     UpdateCompatibilityControls ();
 }
 
-std::unique_ptr<SfxTabPage> SdTpOptionsMisc::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SdTpOptionsMisc::Create( weld::Container* pPage, weld::DialogController* pController,
                                             const SfxItemSet* rAttrs )
 {
-    return std::make_unique<SdTpOptionsMisc>( pParent, *rAttrs );
+    return std::make_unique<SdTpOptionsMisc>( pPage, pController, *rAttrs );
 }
 
 IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl, weld::ComboBox&, void)
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 2ed29ac79a07..554182b8203d 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -53,10 +53,10 @@ private:
     void updateControls();
 
 public:
-    SdPrintOptions(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SdPrintOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SdPrintOptions() override;
 
-    static  std::unique_ptr<SfxTabPage> Create( TabPageParent, 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;
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index fec2110a8008..0a1e4bf7829a 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -87,10 +87,10 @@ private:
     static const char*      GetClickActionSdResId(css::presentation::ClickAction eCA);
 
 public:
-    SdTPAction(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SdTPAction(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SdTPAction() override;
 
-    static  std::unique_ptr<SfxTabPage> Create( TabPageParent, 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;
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index fd1a300afdb3..1cc5a88f2ffa 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -29,8 +29,8 @@
 class SdTpOptionsSnap : public SvxGridTabPage
 {
 public:
-    SdTpOptionsSnap(TabPageParent pParent, const SfxItemSet& rInAttrs);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    SdTpOptionsSnap(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual ~SdTpOptionsSnap() override;
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -49,8 +49,8 @@ private:
     std::unique_ptr<weld::CheckButton> m_xCbxMoveOutline;
 
 public:
-    SdTpOptionsContents(TabPageParent pParent, const SfxItemSet& rInAttrs);
-    static  std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    SdTpOptionsContents(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
+    static  std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual ~SdTpOptionsContents() override;
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -122,8 +122,8 @@ protected:
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    SdTpOptionsMisc(TabPageParent pParent, const SfxItemSet& rInAttrs);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    SdTpOptionsMisc(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual ~SdTpOptionsMisc() override;
 
     virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index fa86b58ec904..e1e2ce680747 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -24,6 +24,7 @@
 #include <ViewShellBase.hxx>
 #include <ViewShellManager.hxx>
 #include <Window.hxx>
+#include <vcl/vclevent.hxx>
 #include <svx/fmshell.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index e7f2426b56a1..b6cb9ce04ab4 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -28,8 +28,10 @@
 #include <sfx2/viewfrm.hxx>
 #include <svx/svxids.hrc>
 #include <svx/fmshell.hxx>
+#include <vcl/vclevent.hxx>
 
 #include <iterator>
+#include <list>
 #include <unordered_map>
 
 namespace sd {
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 46eb48bbbc15..839c697bb010 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/vclevent.hxx>
 
 #include <app.hrc>