diff options
Diffstat (limited to 'sw/source/uibase')
24 files changed, 72 insertions, 77 deletions
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 32804af2102e..b5e037b0091f 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -412,7 +412,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) ApplyUsrPref( aViewOpt, pAppView, bTextDialog? SvViewOpt::DestText : SvViewOpt::DestWeb); } -VclPtr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) +VclPtr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) { VclPtr<SfxTabPage> pRet; SfxAllItemSet aSet(*(rSet.GetPool())); @@ -428,7 +428,7 @@ VclPtr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent } case RID_SW_TP_HTML_OPTGRID_PAGE: case RID_SVXPAGE_GRID: - pRet = SvxGridTabPage::Create(pParent, rSet); + pRet = SvxGridTabPage::Create(pParent.pParent, rSet); break; case RID_SW_TP_STD_FONT: diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 1e89dedeef25..15e86bc789a1 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -79,7 +79,7 @@ public: virtual ~SwCharURLPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 4dcb4c86bfa1..0fc5e983e5b1 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -175,7 +175,7 @@ public: virtual ~SwColumnPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index 4004aeab1ef0..ab36ec6125ed 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -33,7 +33,7 @@ public: virtual ~SwDocStatPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); private: virtual bool FillItemSet( SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index c5e698b926f3..1f51535e22c1 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -84,7 +84,7 @@ public: virtual ~SwDropCapsPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 2e0c43dec906..3a21cbdfa23b 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -106,7 +106,7 @@ public: virtual ~SwEnvPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 50ed7200295d..1b191e0e2279 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -187,7 +187,7 @@ public: virtual ~SwFramePage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; @@ -240,7 +240,7 @@ class SwGrfExtPage: public SfxTabPage public: SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet); - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; @@ -269,7 +269,7 @@ public: virtual ~SwFrameURLPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; @@ -320,7 +320,7 @@ public: virtual ~SwFrameAddPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aAddPgRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 616c4f409987..85466b507282 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -60,7 +60,7 @@ public: virtual ~SwMailConfigPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 14eb447076a6..d93bd4eefb0a 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -116,7 +116,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 5c4785f33b61..8f3fc77f1815 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -69,7 +69,7 @@ public: virtual ~SwParagraphNumTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return aPageRg; } diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 85c8b15dfa2b..fe6c3eca0ee1 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -65,7 +65,7 @@ public: virtual ~SwCompatibilityOptPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 6502a9b6407d..5b98e6508463 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -74,7 +74,7 @@ public: virtual ~SwLoadOptPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -190,7 +190,7 @@ public: virtual ~SwCaptionOptPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 7efa595467c4..05b0efb4d671 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -21,14 +21,11 @@ #include <sfx2/tabdlg.hxx> #include <vcl/group.hxx> - #include <vcl/button.hxx> - #include <vcl/lstbox.hxx> - #include <vcl/field.hxx> - #include <vcl/fixed.hxx> +#include <vcl/weld.hxx> #include <svtools/ctrlbox.hxx> #include <svx/colorbox.hxx> #include <svx/fntctrl.hxx> @@ -70,7 +67,7 @@ public: virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -79,44 +76,42 @@ public: // TabPage printer settings additions class SwAddPrinterTabPage : public SfxTabPage { - VclPtr<CheckBox> m_pGrfCB; - VclPtr<CheckBox> m_pCtrlFieldCB; - VclPtr<CheckBox> m_pBackgroundCB; - VclPtr<CheckBox> m_pBlackFontCB; - VclPtr<CheckBox> m_pPrintHiddenTextCB; - VclPtr<CheckBox> m_pPrintTextPlaceholderCB; - - VclPtr<VclFrame> m_pPagesFrame; - VclPtr<CheckBox> m_pLeftPageCB; - VclPtr<CheckBox> m_pRightPageCB; - VclPtr<CheckBox> m_pProspectCB; - VclPtr<CheckBox> m_pProspectCB_RTL; - - VclPtr<VclFrame> m_pCommentsFrame; - VclPtr<RadioButton> m_pNoRB; - VclPtr<RadioButton> m_pOnlyRB; - VclPtr<RadioButton> m_pEndRB; - VclPtr<RadioButton> m_pEndPageRB; - VclPtr<RadioButton> m_pInMarginsRB; - - VclPtr<CheckBox> m_pPrintEmptyPagesCB; - VclPtr<CheckBox> m_pPaperFromSetupCB; - VclPtr<ListBox> m_pFaxLB; - OUString sNone; - bool bAttrModified; bool bPreview; - DECL_LINK(AutoClickHdl, Button*, void); - DECL_LINK(SelectHdl, ListBox&, void); + std::unique_ptr<weld::CheckButton> m_xGrfCB; + std::unique_ptr<weld::CheckButton> m_xCtrlFieldCB; + std::unique_ptr<weld::CheckButton> m_xBackgroundCB; + std::unique_ptr<weld::CheckButton> m_xBlackFontCB; + std::unique_ptr<weld::CheckButton> m_xPrintHiddenTextCB; + std::unique_ptr<weld::CheckButton> m_xPrintTextPlaceholderCB; + + std::unique_ptr<weld::Widget> m_xPagesFrame; + std::unique_ptr<weld::CheckButton> m_xLeftPageCB; + std::unique_ptr<weld::CheckButton> m_xRightPageCB; + std::unique_ptr<weld::CheckButton> m_xProspectCB; + std::unique_ptr<weld::CheckButton> m_xProspectCB_RTL; + + std::unique_ptr<weld::Widget> m_xCommentsFrame; + std::unique_ptr<weld::RadioButton> m_xNoRB; + std::unique_ptr<weld::RadioButton> m_xOnlyRB; + std::unique_ptr<weld::RadioButton> m_xEndRB; + std::unique_ptr<weld::RadioButton> m_xEndPageRB; + std::unique_ptr<weld::RadioButton> m_xInMarginsRB; + + std::unique_ptr<weld::CheckButton> m_xPrintEmptyPagesCB; + std::unique_ptr<weld::CheckButton> m_xPaperFromSetupCB; + std::unique_ptr<weld::ComboBoxText> m_xFaxLB; + + DECL_LINK(AutoClickHdl, weld::ToggleButton&, void); + DECL_LINK(SelectHdl, weld::ComboBoxText&, void); public: - SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rSet); + SwAddPrinterTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwAddPrinterTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -185,7 +180,7 @@ class SwStdFontTabPage : public SfxTabPage virtual void dispose() override; public: - static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -224,7 +219,7 @@ public: virtual ~SwTableOptionsTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -268,7 +263,7 @@ public: virtual ~SwShdwCursorOptionsTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -343,7 +338,7 @@ public: virtual ~SwRedlineOptionsTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -360,7 +355,7 @@ public: virtual ~SwTestTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -403,7 +398,7 @@ public: virtual ~SwCompareOptionsTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 5824d55945af..14583da1fd3d 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -130,7 +130,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SetNumRule(SwNumRule *pRule) { diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 81a69ab2bc90..79b8c6c45115 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -36,7 +36,7 @@ class SwFootNotePage: public SfxTabPage static const sal_uInt16 aPageRg[]; SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet); public: - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index a5852b74f280..379538525ece 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -91,7 +91,7 @@ public: virtual ~SwTextGridPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index d9a619df7645..5d046f60933e 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -201,7 +201,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override; - SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions ) override; + SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill ); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 7d24a2b54452..83480447d891 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -185,7 +185,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); }; @@ -228,7 +228,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); }; @@ -247,7 +247,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell const & rSh); diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 2fd75bb89c36..e355c321cd5f 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -70,7 +70,7 @@ class SwCondCollPage : public SfxTabPage public: SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet); - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return m_aPageRg; } virtual bool FillItemSet( SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index f26bb92a6a21..8d377ae64ed6 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -227,7 +227,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc @@ -436,7 +436,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); @@ -484,7 +484,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index a2807b1e7bed..1ab9564207dd 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -92,7 +92,7 @@ class SwWrapTabPage: public SfxTabPage public: SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet); - static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 8ee2fba972f6..4e7319d405ae 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -85,7 +85,7 @@ public: virtual ~SwFormatTablePage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; @@ -136,7 +136,7 @@ public: virtual ~SwTableColumnPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; @@ -186,7 +186,7 @@ public: SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTextFlowPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index dbcef1d013f0..cd2248684316 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1706,10 +1706,10 @@ bool SwPagePreview::HasPrintOptionsPage() const return true; } -VclPtr<SfxTabPage> SwPagePreview::CreatePrintOptionsPage( vcl::Window *pParent, +VclPtr<SfxTabPage> SwPagePreview::CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) { - return ::CreatePrintOptionsPage( pParent, rOptions, !m_bNormalPrint ); + return ::CreatePrintOptionsPage( TabPageParent(pParent.pParent), rOptions, !m_bNormalPrint ); } void SwPagePreviewWin::SetViewShell( SwViewShell* pShell ) diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index cb52705363cb..f840dc3a4160 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -170,7 +170,7 @@ namespace // TabPage for application-specific print options -VclPtr<SfxTabPage> SwView::CreatePrintOptionsPage(vcl::Window* pParent, +VclPtr<SfxTabPage> SwView::CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet& rSet) { return ::CreatePrintOptionsPage( pParent, rSet, false ); @@ -303,7 +303,7 @@ void SwView::NotifyCursor(SfxViewShell* pViewShell) const // Create page printer/additions for SwView and SwPagePreview -VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, +VclPtr<SfxTabPage> CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions, bool bPreview ) { |