diff options
Diffstat (limited to 'sc')
38 files changed, 88 insertions, 88 deletions
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 34cd82b10b6b..b3399439417a 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -232,7 +232,7 @@ public: // virtual methods for the options dialog virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override; - virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override; + virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override; virtual SfxStyleFamilies* CreateStyleFamilies() override; void SetInSharedDocLoading( bool bNew ) { mbIsInSharedDocLoading = bNew; } diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index f13ea7092623..6e05952509f2 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2036,7 +2036,7 @@ void ScModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } } -VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) +VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) { VclPtr<SfxTabPage> pRet; ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -2058,7 +2058,7 @@ VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent break; } case SID_SC_TP_GRID: - pRet = SvxGridTabPage::Create(pParent, rSet); + pRet = SvxGridTabPage::Create(pParent.pParent, rSet); break; case SID_SC_TP_USERLISTS: { diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 16ac977d387b..b260542ab3af 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -70,9 +70,9 @@ void ScTabPageProtection::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> ScTabPageProtection::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> ScTabPageProtection::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<ScTabPageProtection>::Create( pParent, *rAttrSet ); + return VclPtr<ScTabPageProtection>::Create( pParent.pParent, *rAttrSet ); } void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs ) diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 296816f5e253..82621de88e70 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -143,10 +143,10 @@ void ScTabPageSortFields::Init() } } -VclPtr<SfxTabPage> ScTabPageSortFields::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTabPageSortFields::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr<ScTabPageSortFields>::Create( pParent, *rArgSet ); + return VclPtr<ScTabPageSortFields>::Create( pParent.pParent, *rArgSet ); } void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ ) @@ -626,10 +626,10 @@ void ScTabPageSortOptions::Init() m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM ); } -VclPtr<SfxTabPage> ScTabPageSortOptions::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTabPageSortOptions::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr<ScTabPageSortOptions>::Create( pParent, *rArgSet ); + return VclPtr<ScTabPageSortOptions>::Create( pParent.pParent, *rArgSet ); } void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ ) diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index c333c31306bd..b087c5dd058c 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -392,22 +392,22 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, SvTreeListBox*, pLb, void ) // Derived Group TabPages: -VclPtr<SfxTabPage> ScTpSubTotalGroup1::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTpSubTotalGroup1::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr<ScTpSubTotalGroup1>::Create( pParent, *rArgSet ); + return VclPtr<ScTpSubTotalGroup1>::Create( pParent.pParent, *rArgSet ); } -VclPtr<SfxTabPage> ScTpSubTotalGroup2::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTpSubTotalGroup2::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr<ScTpSubTotalGroup2>::Create( pParent, *rArgSet ); + return VclPtr<ScTpSubTotalGroup2>::Create( pParent.pParent, *rArgSet ); } -VclPtr<SfxTabPage> ScTpSubTotalGroup3::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTpSubTotalGroup3::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr<ScTpSubTotalGroup3>::Create( pParent, *rArgSet ); + return VclPtr<ScTpSubTotalGroup3>::Create( pParent.pParent, *rArgSet ); } ScTpSubTotalGroup1::ScTpSubTotalGroup1( vcl::Window* pParent, const SfxItemSet& rArgSet ) : @@ -497,10 +497,10 @@ void ScTpSubTotalOptions::Init() FillUserSortListBox(); } -VclPtr<SfxTabPage> ScTpSubTotalOptions::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTpSubTotalOptions::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr<ScTpSubTotalOptions>::Create( pParent, *rArgSet ); + return VclPtr<ScTpSubTotalOptions>::Create( pParent.pParent, *rArgSet ); } void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 15fee73d70b6..1161b2a90e48 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -410,9 +410,9 @@ void ScTPValidationValue::Init() CheckHdl( nullptr ); } -VclPtr<SfxTabPage> ScTPValidationValue::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) +VclPtr<SfxTabPage> ScTPValidationValue::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr<ScTPValidationValue>::Create( pParent, *rArgSet ); + return VclPtr<ScTPValidationValue>::Create( pParent.pParent, *rArgSet ); } void ScTPValidationValue::Reset( const SfxItemSet* rArgSet ) @@ -705,10 +705,10 @@ void ScTPValidationHelp::Init() pTsbHelp->EnableTriState( false ); } -VclPtr<SfxTabPage> ScTPValidationHelp::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTPValidationHelp::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr<ScTPValidationHelp>::Create( pParent, *rArgSet ); + return VclPtr<ScTPValidationHelp>::Create( pParent.pParent, *rArgSet ); } void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet ) @@ -787,10 +787,10 @@ void ScTPValidationError::Init() SelectActionHdl( *m_pLbAction.get() ); } -VclPtr<SfxTabPage> ScTPValidationError::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTPValidationError::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr<ScTPValidationError>::Create( pParent, *rArgSet ); + return VclPtr<ScTPValidationError>::Create( pParent.pParent, *rArgSet ); } void ScTPValidationError::Reset( const SfxItemSet* rArgSet ) diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index e81bad25910d..d4fcbfddb58e 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -26,9 +26,9 @@ // Dokumentinfo-Tabpage: -VclPtr<SfxTabPage> ScDocStatPage::Create( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> ScDocStatPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<ScDocStatPage>::Create( pParent, *rSet ); + return VclPtr<ScDocStatPage>::Create( pParent.pParent, *rSet ); } ScDocStatPage::ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet ) diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 69d1bfb31db4..766200cd7cee 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -46,7 +46,7 @@ public: ScRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ScRedlineOptionsTabPage() 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/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 82a4b348f719..179e6b1de882 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -105,7 +105,7 @@ public: virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override; virtual bool HasPrintOptionsPage() const override; - virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) override; + virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) override; void AddAccessibilityObject( SfxListener& rObject ); void RemoveAccessibilityObject( SfxListener& rObject ); diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 0ac59c31eed1..825bd22b57b6 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -106,7 +106,7 @@ class ScRightHeaderEditPage : public ScHFEditPage { friend class VclPtr<ScRightHeaderEditPage>; public: - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet ); private: ScRightHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -116,7 +116,7 @@ class ScLeftHeaderEditPage : public ScHFEditPage { friend class VclPtr<ScLeftHeaderEditPage>; public: - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet ); private: ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -126,7 +126,7 @@ class ScRightFooterEditPage : public ScHFEditPage { friend class VclPtr<ScRightFooterEditPage>; public: - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet ); private: ScRightFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -136,7 +136,7 @@ class ScLeftFooterEditPage : public ScHFEditPage { friend class VclPtr<ScLeftFooterEditPage>; public: - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet ); private: ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 5671f0d4761e..cb5373537438 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -28,7 +28,7 @@ class ScTabPageProtection : public SfxTabPage friend class VclPtr<ScTabPageProtection>; static const sal_uInt16 pProtectionRanges[]; public: - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges () { return pProtectionRanges; } virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override; diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 00f883ab4237..17bc4ecf1b76 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -318,7 +318,7 @@ public: SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override; virtual bool HasPrintOptionsPage() const override; - virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) override; + virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) override; void ConnectObject( const SdrOle2Obj* pObj ); void ActivateObject( SdrOle2Obj* pObj, long nVerb ); diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 3108604820a9..4e43b776fa62 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -32,7 +32,7 @@ class ScTpCalcOptions : public SfxTabPage { friend class VclPtr<ScTpCalcOptions>; public: - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; virtual void Reset ( const SfxItemSet* rCoreSet ) override; diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 1b84b0c17ea1..8430b637228e 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -20,7 +20,7 @@ class ScTpCompatOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static VclPtr<SfxTabPage> Create (vcl::Window* pParent, const SfxItemSet* rCoreAttrs); + static VclPtr<SfxTabPage> Create (TabPageParent pParent, const SfxItemSet* rCoreAttrs); virtual bool FillItemSet(SfxItemSet* rCoreAttrs) override; virtual void Reset(const SfxItemSet* rCoreAttrs) override; diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index b93fe336c136..7808f31a2556 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -20,7 +20,7 @@ class ScTpDefaultsOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static VclPtr<SfxTabPage> Create (vcl::Window* pParent, const SfxItemSet* rCoreSet); + static VclPtr<SfxTabPage> Create (TabPageParent pParent, const SfxItemSet* rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) override; virtual void Reset(const SfxItemSet* rCoreSet) override; diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 0848f791c60d..22445b7586ec 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -35,7 +35,7 @@ class ScTpFormulaOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static VclPtr<SfxTabPage> Create (vcl::Window* pParent, const SfxItemSet* rCoreSet); + static VclPtr<SfxTabPage> Create (TabPageParent pParent, const SfxItemSet* rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) override; virtual void Reset( const SfxItemSet* rCoreSet ) override; diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index eadfedd9a256..9fd7324a398d 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -62,7 +62,7 @@ class ScHeaderPage : public ScHFPage { friend class VclPtr<ScHeaderPage>; 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(); private: @@ -73,7 +73,7 @@ class ScFooterPage : public ScHFPage { friend class VclPtr<ScFooterPage>; 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(); private: diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 9de8060bdfda..fb201a5b852c 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -34,7 +34,7 @@ class ScTpPrintOptions : public SfxTabPage public: virtual ~ScTpPrintOptions() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet( SfxItemSet* rCoreSet ) override; virtual void Reset( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 1438693455ff..660d9eb3141f 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -50,7 +50,7 @@ public: const SfxItemSet& rArgSet ); virtual ~ScTabPageSortFields() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; @@ -110,7 +110,7 @@ public: #undef SfxTabPage #define SfxTabPage ::SfxTabPage - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 9afc120c3ec4..299b703fcf11 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -27,7 +27,7 @@ class ScDocStatPage: public SfxTabPage { friend class VclPtr<ScDocStatPage>; public: - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); virtual ~ScDocStatPage() override; virtual void dispose() override; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 0b01d8e4c52e..8b2bfee98e15 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -85,7 +85,7 @@ class ScTpSubTotalGroup1 final : public ScTpSubTotalGroup public: virtual ~ScTpSubTotalGroup1() override; - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; @@ -100,7 +100,7 @@ class ScTpSubTotalGroup2 final : public ScTpSubTotalGroup public: virtual ~ScTpSubTotalGroup2() override; - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; @@ -115,7 +115,7 @@ class ScTpSubTotalGroup3 final : public ScTpSubTotalGroup public: virtual ~ScTpSubTotalGroup3() override; - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; @@ -126,7 +126,7 @@ class ScTpSubTotalOptions final : public SfxTabPage public: virtual ~ScTpSubTotalOptions() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 3b01422a68ce..bd952480aafa 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -30,7 +30,7 @@ class ScTablePage : public SfxTabPage friend class VclPtr<ScTablePage>; static const sal_uInt16 pPageTableRanges[]; public: - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rCoreSet ); static const sal_uInt16* GetRanges () { return pPageTableRanges; } virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 8e5af6e49b47..6e84d2e442f8 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -34,7 +34,7 @@ class ScTpUserLists : public SfxTabPage { friend class VclPtr<ScTpUserLists>; public: - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override; virtual void Reset ( const SfxItemSet* rCoreAttrs ) override; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 6ac52a2d1cd6..5453fd6d6020 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -72,7 +72,7 @@ class ScTpContentOptions : public SfxTabPage virtual void dispose() override; public: - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; virtual void Reset ( const SfxItemSet* rCoreSet ) override; @@ -115,7 +115,7 @@ class ScTpLayoutOptions : public SfxTabPage public: virtual ~ScTpLayoutOptions() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; virtual void Reset ( const SfxItemSet* rCoreSet ) override; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 4d67bd6ed0c0..e05e3ec63b21 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -84,7 +84,7 @@ public: explicit ScTPValidationValue( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationValue() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rArgSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rArgSet ); static const sal_uInt16* GetRanges() { return pValueRanges; } virtual bool FillItemSet( SfxItemSet* rArgSet ) override; @@ -271,7 +271,7 @@ public: virtual ~ScTPValidationHelp() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; }; @@ -297,7 +297,7 @@ public: virtual ~ScTPValidationError() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); + static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; }; diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 4cee5bf1a1b6..b64670dce78e 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -65,9 +65,9 @@ void ScRedlineOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> ScRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> ScRedlineOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<ScRedlineOptionsTabPage>::Create( pParent, *rSet ); + return VclPtr<ScRedlineOptionsTabPage>::Create( pParent.pParent, *rSet ); } bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ ) diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index af66b3e3c5f2..1c3900b5ea31 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -108,9 +108,9 @@ void ScTpCalcOptions::Init() m_pBtnThread->SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) ); } -VclPtr<SfxTabPage> ScTpCalcOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> ScTpCalcOptions::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<ScTpCalcOptions>::Create( pParent, *rAttrSet ); + return VclPtr<ScTpCalcOptions>::Create( pParent.pParent, *rAttrSet ); } void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ ) diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 55e171a41265..593ac69610be 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -31,9 +31,9 @@ void ScTpCompatOptions::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> ScTpCompatOptions::Create(vcl::Window *pParent, const SfxItemSet *rCoreAttrs) +VclPtr<SfxTabPage> ScTpCompatOptions::Create(TabPageParent pParent, const SfxItemSet *rCoreAttrs) { - return VclPtr<ScTpCompatOptions>::Create(pParent, *rCoreAttrs); + return VclPtr<ScTpCompatOptions>::Create(pParent.pParent, *rCoreAttrs); } bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs) diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 5e6ef5338ac6..c252b96edf9d 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -39,9 +39,9 @@ void ScTpDefaultsOptions::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> ScTpDefaultsOptions::Create(vcl::Window *pParent, const SfxItemSet *rCoreAttrs) +VclPtr<SfxTabPage> ScTpDefaultsOptions::Create(TabPageParent pParent, const SfxItemSet *rCoreAttrs) { - return VclPtr<ScTpDefaultsOptions>::Create(pParent, *rCoreAttrs); + return VclPtr<ScTpDefaultsOptions>::Create(pParent.pParent, *rCoreAttrs); } bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet) diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 3d950155c6b9..75b3482fefde 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -228,9 +228,9 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Control&, rControl, void ) OnFocusSeparatorInput(static_cast<Edit*>(&rControl)); } -VclPtr<SfxTabPage> ScTpFormulaOptions::Create(vcl::Window* pParent, const SfxItemSet* rCoreSet) +VclPtr<SfxTabPage> ScTpFormulaOptions::Create(TabPageParent pParent, const SfxItemSet* rCoreSet) { - return VclPtr<ScTpFormulaOptions>::Create(pParent, *rCoreSet); + return VclPtr<ScTpFormulaOptions>::Create(pParent.pParent, *rCoreSet); } bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet) diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 1b6a7c300f97..9c8dcbc77300 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -51,9 +51,9 @@ void ScTpPrintOptions::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> ScTpPrintOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> ScTpPrintOptions::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<ScTpPrintOptions>::Create( pParent, *rAttrSet ); + return VclPtr<ScTpPrintOptions>::Create( pParent.pParent, *rAttrSet ); } DeactivateRC ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 7671b1e65a4d..85f7c0dea701 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -148,9 +148,9 @@ void ScTpUserLists::Init() } -VclPtr<SfxTabPage> ScTpUserLists::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> ScTpUserLists::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<ScTpUserLists>::Create( pParent, *rAttrSet ); + return VclPtr<ScTpUserLists>::Create( pParent.pParent, *rAttrSet ); } void ScTpUserLists::Reset( const SfxItemSet* rCoreAttrs ) diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index a7151bded5e7..cf7a953795ed 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -126,10 +126,10 @@ void ScTpContentOptions::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> ScTpContentOptions::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTpContentOptions::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr<ScTpContentOptions>::Create(pParent, *rCoreSet); + return VclPtr<ScTpContentOptions>::Create(pParent.pParent, *rCoreSet); } bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet ) @@ -409,10 +409,10 @@ void ScTpLayoutOptions::dispose() } -VclPtr<SfxTabPage> ScTpLayoutOptions::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTpLayoutOptions::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - VclPtrInstance<ScTpLayoutOptions> pNew( pParent, *rCoreSet ); + VclPtrInstance<ScTpLayoutOptions> pNew( pParent.pParent, *rCoreSet ); ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() ); if(pDocSh!=nullptr) diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 33ec160f79f2..3d1192b7f7fc 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -831,9 +831,9 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( vcl::Window* pParent, const SfxIte true ) {} -VclPtr<SfxTabPage> ScRightHeaderEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr<SfxTabPage> ScRightHeaderEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr<ScRightHeaderEditPage>::Create( pParent, *rCoreSet ); + return VclPtr<ScRightHeaderEditPage>::Create( pParent.pParent, *rCoreSet ); } // class ScLeftHeaderEditPage @@ -845,9 +845,9 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemS true ) {} -VclPtr<SfxTabPage> ScLeftHeaderEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr<SfxTabPage> ScLeftHeaderEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr<ScLeftHeaderEditPage>::Create( pParent, *rCoreSet ); + return VclPtr<ScLeftHeaderEditPage>::Create( pParent.pParent, *rCoreSet ); } // class ScRightFooterEditPage @@ -859,9 +859,9 @@ ScRightFooterEditPage::ScRightFooterEditPage( vcl::Window* pParent, const SfxIte false ) {} -VclPtr<SfxTabPage> ScRightFooterEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr<SfxTabPage> ScRightFooterEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr<ScRightFooterEditPage>::Create( pParent, *rCoreSet ); + return VclPtr<ScRightFooterEditPage>::Create( pParent.pParent, *rCoreSet ); } // class ScLeftFooterEditPage @@ -873,9 +873,9 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemS false ) {} -VclPtr<SfxTabPage> ScLeftFooterEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr<SfxTabPage> ScLeftFooterEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr<ScLeftFooterEditPage>::Create( pParent, *rCoreSet ); + return VclPtr<ScLeftFooterEditPage>::Create( pParent.pParent, *rCoreSet ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index ba90213b054a..3d5bcf672304 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -243,9 +243,9 @@ ScHeaderPage::ScHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ) { } -VclPtr<SfxTabPage> ScHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr<SfxTabPage> ScHeaderPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr<ScHeaderPage>::Create( pParent, *rCoreSet ); + return VclPtr<ScHeaderPage>::Create( pParent.pParent, *rCoreSet ); } const sal_uInt16* ScHeaderPage::GetRanges() @@ -260,9 +260,9 @@ ScFooterPage::ScFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ) { } -VclPtr<SfxTabPage> ScFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr<SfxTabPage> ScFooterPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr<ScFooterPage>::Create( pParent, *rCoreSet ); + return VclPtr<ScFooterPage>::Create( pParent.pParent, *rCoreSet ); } const sal_uInt16* ScFooterPage::GetRanges() diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 59f388d486c9..2a47713659f9 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -166,9 +166,9 @@ void ScTablePage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> ScTablePage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr<SfxTabPage> ScTablePage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr<ScTablePage>::Create( pParent, *rCoreSet ); + return VclPtr<ScTablePage>::Create( pParent.pParent, *rCoreSet ); } void ScTablePage::Reset( const SfxItemSet* rCoreSet ) diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index f5ddf74e8853..ac3f87758d0a 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -516,7 +516,7 @@ bool ScPreviewShell::HasPrintOptionsPage() const return true; } -VclPtr<SfxTabPage> ScPreviewShell::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) +VclPtr<SfxTabPage> ScPreviewShell::CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 3eae8487e3c9..f5d0815f1570 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1049,7 +1049,7 @@ bool ScTabViewShell::HasPrintOptionsPage() const return true; } -VclPtr<SfxTabPage> ScTabViewShell::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) +VclPtr<SfxTabPage> ScTabViewShell::CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); |