diff options
Diffstat (limited to 'cui')
99 files changed, 255 insertions, 254 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 762570f5a3d3..fb1195c73b39 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -175,29 +175,29 @@ SvxConfigPage::CanConfig( const OUString& aModuleId ) return !(aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography"); } -VclPtr<SfxTabPage> CreateSvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxMenuConfigPage>::Create( pParent, *rSet ); + return VclPtr<SvxMenuConfigPage>::Create( pParent.pParent, *rSet ); } -VclPtr<SfxTabPage> CreateSvxContextMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxContextMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxMenuConfigPage>::Create( pParent, *rSet, false ); + return VclPtr<SvxMenuConfigPage>::Create( pParent.pParent, *rSet, false ); } -VclPtr<SfxTabPage> CreateKeyboardConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateKeyboardConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SfxAcceleratorConfigPage>::Create( pParent, *rSet ); + return VclPtr<SfxAcceleratorConfigPage>::Create( pParent.pParent, *rSet ); } -VclPtr<SfxTabPage> CreateSvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxToolbarConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxToolbarConfigPage>::Create( pParent, *rSet ); + return VclPtr<SvxToolbarConfigPage>::Create( pParent.pParent, *rSet ); } -VclPtr<SfxTabPage> CreateSvxEventConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxEventConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxEventConfigPage>::Create( pParent, *rSet, SvxEventConfigPage::EarlyInit() ); + return VclPtr<SvxEventConfigPage>::Create( pParent.pParent, *rSet, SvxEventConfigPage::EarlyInit() ); } /****************************************************************************** diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 9ed4eca36c27..972dbc0f5399 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -701,9 +701,9 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ ) return true; } -VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<TPGalleryThemeGeneral>::Create( pParent, *rSet ); + return VclPtr<TPGalleryThemeGeneral>::Create( pParent.pParent, *rSet ); } @@ -796,9 +796,9 @@ void TPGalleryThemeProperties::dispose() } -VclPtr<SfxTabPage> TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> TPGalleryThemeProperties::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<TPGalleryThemeProperties>::Create( pParent, *rSet ); + return VclPtr<TPGalleryThemeProperties>::Create( pParent.pParent, *rSet ); } diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 1a90d4a21542..6edfd8b8ba44 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -60,7 +60,7 @@ public: virtual ~AlignmentTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges() { return s_pRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 14915f691c2f..ecef0e81a0be 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -112,7 +112,7 @@ public: virtual ~OfaAutocorrOptionsPage() 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; @@ -172,7 +172,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage virtual void dispose() override; public: - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -278,7 +278,7 @@ public: virtual ~OfaAutocorrReplacePage() 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; @@ -337,7 +337,7 @@ public: virtual ~OfaAutocorrExceptPage() 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; @@ -402,7 +402,7 @@ public: virtual ~OfaQuoteTabPage() 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; @@ -455,7 +455,7 @@ private: public: virtual ~OfaAutoCompleteTabPage() 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; @@ -521,7 +521,7 @@ public: virtual ~OfaSmartTagOptionsTabPage() 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/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index e25b2043cbc5..8f5a9c96ff2a 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -49,7 +49,7 @@ class SvxBackgroundTabPage : public SvxTabPage friend class VclPtr<SvxBackgroundTabPage>; static const sal_uInt16 pPageRanges[]; public: - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); // returns the area of the which-values static const sal_uInt16* GetRanges() { return pPageRanges; } @@ -152,7 +152,7 @@ public: virtual ~SvxBkgTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PageCreated( const SfxAllItemSet& aSet ) override; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index b8fb44b4021e..e59638036e7d 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -49,7 +49,7 @@ class SvxBorderTabPage : public SfxTabPage public: virtual ~SvxBorderTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 383431046ec4..144b13e94513 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -150,7 +150,7 @@ public: virtual ~SvxCharNamePage() 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 pNameRanges; } virtual void Reset( const SfxItemSet* rSet ) override; @@ -238,7 +238,7 @@ public: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; 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 pEffectsRanges; } virtual void Reset( const SfxItemSet* rSet ) override; @@ -315,7 +315,7 @@ public: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; 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 pPositionRanges; } virtual void Reset( const SfxItemSet* rSet ) override; @@ -360,7 +360,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) 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 pTwoLinesRanges; } virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 7bacaac3ad16..5c034d2104af 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -67,7 +67,7 @@ public: virtual ~SvxConnectionPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 1aeaa2e6be6d..e9c96b561b0a 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -231,7 +231,7 @@ public: void SetXChgData( ExchangeData* pData ); - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); }; class TPGalleryThemeProperties : public SfxTabPage @@ -296,7 +296,7 @@ public: void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult ); - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); }; #endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index b612ccf687ff..7e2c753d3b59 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -72,7 +72,7 @@ public: virtual ~SvxGeneralTabPage() 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/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 6d6997e0df13..ce7fea8d96e8 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -195,7 +195,7 @@ public: virtual ~SvxTransparenceTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window*, const SfxItemSet*); + static VclPtr<SfxTabPage> Create(TabPageParent, const SfxItemSet*); static const sal_uInt16* GetRanges() { return pTransparenceRanges; } virtual bool FillItemSet(SfxItemSet*) override; @@ -263,7 +263,7 @@ public: virtual ~SvxAreaTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pAreaRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -324,7 +324,7 @@ public: virtual ~SvxShadowTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pShadowRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -402,7 +402,7 @@ public: void Construct(); - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -473,7 +473,7 @@ public: void Construct(); - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -557,7 +557,7 @@ public: void Construct(); - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -615,7 +615,7 @@ public: void Construct(); - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -734,7 +734,7 @@ public: void Construct(); - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index aaefe353bfb9..eadb4e038f69 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -202,7 +202,7 @@ public: void Construct(); - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pLineRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -300,7 +300,7 @@ public: void Construct(); - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -365,7 +365,7 @@ public: void Construct(); - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 3d3b2591a6cd..8204dec674ae 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -86,7 +86,7 @@ namespace svx virtual ~DbRegistrationOptionsPage() 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; diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 87096615db68..887a93789eb6 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -109,7 +109,7 @@ class SvxGrfCropPage : public SfxTabPage Size GetGrfOrigSize( const Graphic& ) const; public: - 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/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 3fa0179d91d7..631b662b7206 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -83,7 +83,7 @@ public: virtual ~SvxCaptionTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pCaptionRanges; } virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index dd34296043d5..1ed414b37182 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -76,7 +76,7 @@ public: bool IsReadOnly() const override; // --------- inherit from the base ------------- - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); }; class SfxMacroAssignDlg : public SfxSingleTabDialog diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index bebb57ee1857..721f7d4f8244 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -72,7 +72,7 @@ public: virtual ~SvxMeasurePage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 8e8d85784d63..56e0fb8b8c92 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -69,7 +69,7 @@ public: virtual ~SvxNumberFormatTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); // Returns area information. static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 8732edb2b8d4..d5e92dc13be8 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -106,7 +106,7 @@ public: virtual ~SvxSingleNumPickTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -139,7 +139,7 @@ public: virtual ~SvxBulletPickTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -181,7 +181,7 @@ public: virtual ~SvxNumPickTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -226,7 +226,7 @@ public: virtual ~SvxBitmapPickTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -335,7 +335,7 @@ public: virtual ~SvxNumOptionsTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -434,7 +434,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 SetMetric(FieldUnit eSet); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index bdf05750b371..d46fdd1862e9 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -58,7 +58,7 @@ public: virtual ~SvxAsianLayoutPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index d53844661ee5..04ca33441cde 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -149,7 +149,7 @@ private: public: virtual ~SvxLinguTabPage() 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; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index d37571e64a97..a9d72a5176af 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -74,7 +74,7 @@ public: virtual ~SvxPathTabPage() 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; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 72838e5d481f..7f24edc49514 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -181,7 +181,7 @@ protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; public: - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); // returns the range of the Which values static const sal_uInt16* GetRanges() { return pRanges; } diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index bc79add8c31c..e46168ddf192 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -105,7 +105,7 @@ public: DECL_LINK(ELRLoseFocusHdl, Control&, void); - 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 pStdRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -169,7 +169,7 @@ public: virtual ~SvxParaAlignTabPage() 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 pAlignRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -204,7 +204,7 @@ public: virtual ~SvxExtParagraphTabPage() 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 pExtRanges; } @@ -287,7 +287,7 @@ public: virtual ~SvxAsianTabPage() 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(); diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 0f8924a9d7fd..b10e2ca7617f 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -124,7 +124,7 @@ public: virtual ~SvxSwPosSizeTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index e5e1f7d17ef9..289de2b346cc 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -52,7 +52,7 @@ class SvxTabulatorTabPage : public SfxTabPage public: virtual ~SvxTabulatorTabPage() 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 pRanges; } virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 37ff6561b9e3..0d568d7dd1f6 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -84,7 +84,7 @@ public: virtual ~SvxTextAnimationPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 88b77845d134..5c96c71ab329 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -84,7 +84,7 @@ public: virtual ~SvxTextAttrPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pRanges; } virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 7222f09f92b4..8a24987a8842 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -140,7 +140,7 @@ public: virtual ~SvxPositionSizeTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pPosSizeRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -198,7 +198,7 @@ public: virtual ~SvxAngleTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pAngleRanges; } virtual bool FillItemSet( SfxItemSet* ) override; @@ -251,7 +251,7 @@ public: virtual ~SvxSlantTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* ); + static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* ); static const sal_uInt16* GetRanges() { return pSlantRanges; } virtual bool FillItemSet( SfxItemSet* ) override; diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 3a542707997c..89a052ef95c4 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -331,9 +331,9 @@ namespace offapp SfxTabPage::dispose(); } - VclPtr<SfxTabPage> ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet) + VclPtr<SfxTabPage> ConnectionPoolOptionsPage::Create(TabPageParent _pParent, const SfxItemSet* _rAttrSet) { - return VclPtr<ConnectionPoolOptionsPage>::Create(_pParent, *_rAttrSet); + return VclPtr<ConnectionPoolOptionsPage>::Create(_pParent.pParent, *_rAttrSet); } void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet) diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 36f06b7eaf39..cfbd148a364c 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -50,7 +50,7 @@ namespace offapp ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet); virtual ~ConnectionPoolOptionsPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet); + static VclPtr<SfxTabPage> Create(TabPageParent _pParent, const SfxItemSet* _rAttrSet); private: virtual bool EventNotify( NotifyEvent& _rNEvt ) override; diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 672617a4ee64..200436cf5e10 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -177,10 +177,10 @@ void DbRegistrationOptionsPage::dispose() } -VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<DbRegistrationOptionsPage>::Create( pParent, *rAttrSet ); + return VclPtr<DbRegistrationOptionsPage>::Create( pParent.pParent, *rAttrSet ); } diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index d62712633d26..b500f0107632 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -154,10 +154,10 @@ void SvxFontSubstTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxFontSubstTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxFontSubstTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<SvxFontSubstTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxFontSubstTabPage>::Create(pParent.pParent, *rAttrSet); } bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index e016bf880188..3c7e30ca338e 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -97,7 +97,7 @@ class SvxFontSubstTabPage : public SfxTabPage public: SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - 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/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 65d142343a33..5d4bd2e4522f 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -59,9 +59,9 @@ void SvxAccessibilityOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxAccessibilityOptionsTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxAccessibilityOptionsTabPage>::Create(pParent.pParent, *rAttrSet); } bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index f5e161bcf2f1..d451d1969875 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -37,7 +37,7 @@ public: virtual ~SvxAccessibilityOptionsTabPage() 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/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index caccaaf1e200..c2a5030b54d0 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -163,9 +163,9 @@ void SvxAsianLayoutPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxAsianLayoutPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxAsianLayoutPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxAsianLayoutPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxAsianLayoutPage>::Create(pParent.pParent, *rAttrSet); } bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 9795c1d9dd4f..688b4e7e4f83 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -137,9 +137,9 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) pUseExtendedTypesChk->SaveValue(); } -VclPtr<SfxTabPage> SvxBasicIDEOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxBasicIDEOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxBasicIDEOptionsPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxBasicIDEOptionsPage>::Create( pParent.pParent, *rAttrSet ); } void SvxBasicIDEOptionsPage::FillUserData() diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index fe63db80201d..9e2774643da0 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -41,7 +41,7 @@ public: virtual ~SvxBasicIDEOptionsPage() 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; virtual void FillUserData() override; diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 2a212bdce0a9..feba29eb1a7e 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -190,9 +190,9 @@ void SvxDefaultColorOptPage::Construct() } -VclPtr<SfxTabPage> SvxDefaultColorOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs ) +VclPtr<SfxTabPage> SvxDefaultColorOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs ) { - return VclPtr<SvxDefaultColorOptPage>::Create( pParent, *rAttrs ); + return VclPtr<SvxDefaultColorOptPage>::Create( pParent.pParent, *rAttrs ); } bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs ) diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 79af3c1dd8b8..97ae4b2ed509 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -70,7 +70,7 @@ public: void Construct(); - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; virtual void Reset( const SfxItemSet* rInAttrs ) override; }; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index a273888772c6..a6538fd26d46 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1031,9 +1031,9 @@ void SvxColorOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxColorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxColorOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxColorOptionsTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxColorOptionsTabPage>::Create( pParent.pParent, *rAttrSet ); } bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index f91a2312be5b..36e1063f35b5 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -51,7 +51,7 @@ public: virtual ~SvxColorOptionsTabPage( ) 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/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index ffdffcd1cff6..a6bf4d835a2e 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -70,9 +70,9 @@ void SvxCTLOptionsPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxCTLOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxCTLOptionsPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxCTLOptionsPage>::Create( pParent.pParent, *rAttrSet ); } bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index b377fda219be..05106a3c2350 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -45,7 +45,7 @@ public: SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxCTLOptionsPage() 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/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 39073bcd1033..86d4cc437151 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -82,10 +82,10 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void) aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() ); } -VclPtr<SfxTabPage> OfaMSFilterTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> OfaMSFilterTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<OfaMSFilterTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<OfaMSFilterTabPage>::Create( pParent.pParent, *rAttrSet ); } bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* ) @@ -188,10 +188,10 @@ void OfaMSFilterTabPage2::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaMSFilterTabPage2::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> OfaMSFilterTabPage2::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<OfaMSFilterTabPage2>::Create( pParent, *rAttrSet ); + return VclPtr<OfaMSFilterTabPage2>::Create( pParent.pParent, *rAttrSet ); } bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 4ef6cf3a63c0..0547ca30b510 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -44,7 +44,7 @@ public: virtual ~OfaMSFilterTabPage() 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; @@ -97,7 +97,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage public: OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ); - 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/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 4dcb91416e8c..eca23fb512c9 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -327,9 +327,9 @@ void OfaMiscTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> OfaMiscTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<OfaMiscTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<OfaMiscTabPage>::Create( pParent.pParent, *rAttrSet ); } bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) @@ -736,9 +736,9 @@ IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, CheckBox&, void ) } #endif -VclPtr<SfxTabPage> OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> OfaViewTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<OfaViewTabPage>::Create(pParent, *rAttrSet); + return VclPtr<OfaViewTabPage>::Create(pParent.pParent, *rAttrSet); } bool OfaViewTabPage::FillItemSet( SfxItemSet* ) @@ -1298,9 +1298,9 @@ void OfaLanguagesTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> OfaLanguagesTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<OfaLanguagesTabPage>::Create(pParent, *rAttrSet); + return VclPtr<OfaLanguagesTabPage>::Create(pParent.pParent, *rAttrSet); } static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount) diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index ceba711ede24..852b8472476e 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -70,7 +70,7 @@ public: virtual ~OfaMiscTabPage() 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; @@ -128,7 +128,7 @@ public: virtual ~OfaViewTabPage() 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; @@ -174,7 +174,7 @@ public: virtual ~OfaLanguagesTabPage() 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/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index f5c216775075..988bdc28031a 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -349,9 +349,9 @@ void SvxGeneralTabPage::SetLinks () } -VclPtr<SfxTabPage> SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxGeneralTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxGeneralTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxGeneralTabPage>::Create( pParent.pParent, *rAttrSet ); } bool SvxGeneralTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 824c4a1f4ecb..23a628c3231c 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -88,10 +88,10 @@ void OfaHtmlTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaHtmlTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> OfaHtmlTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<OfaHtmlTabPage>::Create(pParent, *rAttrSet); + return VclPtr<OfaHtmlTabPage>::Create(pParent.pParent, *rAttrSet); } bool OfaHtmlTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 55b7281cab60..a54590b135ea 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -54,7 +54,7 @@ public: virtual void dispose() override; OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - 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/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index e2e3ef807b8c..779f0a107c6f 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -253,9 +253,9 @@ void SvxProxyTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxProxyTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxProxyTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxProxyTabPage>::Create(pParent.pParent, *rAttrSet); } void SvxProxyTabPage::ReadConfigData_Impl() @@ -870,9 +870,9 @@ void SvxSecurityTabPage::InitControls() } } -VclPtr<SfxTabPage> SvxSecurityTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxSecurityTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxSecurityTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxSecurityTabPage>::Create(pParent.pParent, *rAttrSet); } void SvxSecurityTabPage::ActivatePage( const SfxItemSet& ) @@ -985,9 +985,9 @@ void SvxEMailTabPage::dispose() /* -------------------------------------------------------------------------*/ -VclPtr<SfxTabPage> SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxEMailTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxEMailTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxEMailTabPage>::Create(pParent.pParent, *rAttrSet); } /* -------------------------------------------------------------------------*/ diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index b0d8f7884dc8..d504f514fc4a 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -93,7 +93,7 @@ public: SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxProxyTabPage() 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; }; @@ -153,7 +153,7 @@ protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) 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; }; @@ -180,7 +180,7 @@ public: virtual ~SvxEMailTabPage() 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/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 2534247494aa..0ffe56682abe 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -570,9 +570,9 @@ void SvxJavaOptionsPage::RequestRestart( svtools::RestartReason eReason ) } -VclPtr<SfxTabPage> SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxJavaOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxJavaOptionsPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxJavaOptionsPage>::Create( pParent.pParent, *rAttrSet ); } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index c533369f6a47..6caaeeb4cfc3 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -112,7 +112,7 @@ public: virtual ~SvxJavaOptionsPage() 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; diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 95d8183abbcc..b4f224177c82 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -81,12 +81,11 @@ void SvxJSearchOptionsPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxJSearchOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxJSearchOptionsPage>::Create( pParent, *rSet ); + return VclPtr<SvxJSearchOptionsPage>::Create( pParent.pParent, *rSet ); } - void SvxJSearchOptionsPage::SetTransliterationFlags( TransliterationFlags nSettings ) { bool bVal(nSettings & TransliterationFlags::IGNORE_CASE); diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index b6d768044da7..686f3914cefd 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -63,7 +63,7 @@ public: SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxJSearchOptionsPage() 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 Reset( const SfxItemSet* rSet ) override; virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 239546732acf..1155d2792992 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1045,10 +1045,10 @@ void SvxLinguTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxLinguTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxLinguTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxLinguTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxLinguTabPage>::Create( pParent.pParent, *rAttrSet ); } bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet ) diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index e757231a0c33..cefd3b2cd71c 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -75,9 +75,9 @@ void SvxOpenCLTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxOpenCLTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxOpenCLTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxOpenCLTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxOpenCLTabPage>::Create(pParent.pParent, *rAttrSet); } bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index 4609b1b07d67..cb7878f80646 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -42,7 +42,7 @@ public: virtual ~SvxOpenCLTabPage() 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; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index cfd41c1b40c4..90388aa1522b 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -257,10 +257,10 @@ void SvxPathTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxPathTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxPathTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxPathTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxPathTabPage>::Create( pParent.pParent, *rAttrSet ); } bool SvxPathTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 528262cacfc6..ae321e6a8fd2 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -211,10 +211,10 @@ void SvxSaveTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxSaveTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxSaveTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxSaveTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxSaveTabPage>::Create( pParent.pParent, *rAttrSet ); } void SvxSaveTabPage::DetectHiddenControls() diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index f6957eede0c9..49281718c1b2 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -80,7 +80,7 @@ public: virtual ~SvxSaveTabPage() 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/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 577b0e7988b4..889c743b31b7 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -198,9 +198,9 @@ void SvxOnlineUpdateTabPage::UpdateUserAgent() } VclPtr<SfxTabPage> -SvxOnlineUpdateTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +SvxOnlineUpdateTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxOnlineUpdateTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxOnlineUpdateTabPage>::Create( pParent.pParent, *rAttrSet ); } bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* ) diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 788ae988f92e..5e09143ca61a 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -61,7 +61,7 @@ public: virtual ~SvxOnlineUpdateTabPage() 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; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 6e14757e2858..3ff422289f37 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -317,9 +317,9 @@ void SvxPersonalizationTabPage::dispose() } -VclPtr<SfxTabPage> SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) +VclPtr<SfxTabPage> SvxPersonalizationTabPage::Create( TabPageParent pParent, const SfxItemSet *rSet ) { - return VclPtr<SvxPersonalizationTabPage>::Create( pParent, *rSet ); + return VclPtr<SvxPersonalizationTabPage>::Create( pParent.pParent, *rSet ); } bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * ) diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index 9d5e057c8c34..1f1e1f1e77ca 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -46,7 +46,7 @@ public: virtual ~SvxPersonalizationTabPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window *pParent, const SfxItemSet *rSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet *rSet ); /// Apply the settings ([OK] button). virtual bool FillItemSet( SfxItemSet *rSet ) override; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 3c44cd6089af..7a177f2733ad 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1033,7 +1033,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() pPageInfo->m_pPage.disposeAndReset( ::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet ) ); if(!pPageInfo->m_pPage && pGroupInfo->m_pModule) - pPageInfo->m_pPage.disposeAndReset( pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet) ); + pPageInfo->m_pPage.disposeAndReset( pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, TabPageParent(pTabBox), *pGroupInfo->m_pInItemSet) ); DBG_ASSERT( pPageInfo->m_pPage, "tabpage could not created"); if ( pPageInfo->m_pPage ) diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 7d82dd94aae5..85671f3bf31f 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -275,9 +275,9 @@ void AlignmentTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> AlignmentTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<AlignmentTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<AlignmentTabPage>::Create( pParent.pParent, *rAttrSet ); } bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 299a2c3789d6..4c50310887cc 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -214,10 +214,10 @@ void OfaAutocorrOptionsPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaAutocorrOptionsPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> OfaAutocorrOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<OfaAutocorrOptionsPage>::Create(pParent, *rSet); + return VclPtr<OfaAutocorrOptionsPage>::Create(pParent.pParent, *rSet); } bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* ) @@ -502,10 +502,10 @@ void OfaSwAutoFmtOptionsPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<OfaSwAutoFmtOptionsPage>::Create(pParent, *rAttrSet); + return VclPtr<OfaSwAutoFmtOptionsPage>::Create(pParent.pParent, *rAttrSet); } bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* ) @@ -927,9 +927,9 @@ void OfaAutocorrReplacePage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaAutocorrReplacePage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> OfaAutocorrReplacePage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<OfaAutocorrReplacePage>::Create(pParent, *rSet); + return VclPtr<OfaAutocorrReplacePage>::Create(pParent.pParent, *rSet); } void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) @@ -1438,10 +1438,10 @@ void OfaAutocorrExceptPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaAutocorrExceptPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> OfaAutocorrExceptPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<OfaAutocorrExceptPage>::Create(pParent, *rSet); + return VclPtr<OfaAutocorrExceptPage>::Create(pParent.pParent, *rSet); } void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) @@ -1893,10 +1893,10 @@ void OfaQuoteTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaQuoteTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> OfaQuoteTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<OfaQuoteTabPage>::Create(pParent, *rAttrSet); + return VclPtr<OfaQuoteTabPage>::Create(pParent.pParent, *rAttrSet); } bool OfaQuoteTabPage::FillItemSet( SfxItemSet* ) @@ -2229,10 +2229,10 @@ void OfaAutoCompleteTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaAutoCompleteTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> OfaAutoCompleteTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<OfaAutoCompleteTabPage>::Create( pParent, *rSet ); + return VclPtr<OfaAutoCompleteTabPage>::Create( pParent.pParent, *rSet ); } bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* ) @@ -2481,9 +2481,9 @@ void OfaSmartTagOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> OfaSmartTagOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<OfaSmartTagOptionsTabPage>::Create( pParent, *rSet ); + return VclPtr<OfaSmartTagOptionsTabPage>::Create( pParent.pParent, *rSet ); } /** This struct is used to associate list box entries with smart tag data diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 78cbbf63ca70..722b4a84624b 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -427,9 +427,9 @@ void SvxBackgroundTabPage::dispose() SvxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxBackgroundTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SvxBackgroundTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxBackgroundTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxBackgroundTabPage>::Create( pParent.pParent, *rAttrSet ); } void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet ) @@ -1549,10 +1549,10 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet ) return true; } -VclPtr<SfxTabPage> SvxBkgTabPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxBkgTabPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr<SvxBkgTabPage>::Create( pWindow, *rAttrs ); + return VclPtr<SvxBkgTabPage>::Create( pWindow.pParent, *rAttrs ); } void SvxBkgTabPage::PageCreated(const SfxAllItemSet& aSet) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 96ffc5c5658c..6107c30a4ebc 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -411,10 +411,10 @@ void SvxBorderTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxBorderTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxBorderTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxBorderTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxBorderTabPage>::Create( pParent.pParent, *rAttrSet ); } void SvxBorderTabPage::ResetFrameLine_Impl( svx::FrameBorderType eBorder, const SvxBorderLine* pCoreLine, bool bValid ) diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 1d06dae5cb04..edb3d8496126 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1173,9 +1173,9 @@ DeactivateRC SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) } -VclPtr<SfxTabPage> SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxCharNamePage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxCharNamePage>::Create( pParent, *rSet ); + return VclPtr<SvxCharNamePage>::Create( pParent.pParent, *rSet ); } @@ -1686,9 +1686,9 @@ DeactivateRC SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) } -VclPtr<SfxTabPage> SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxCharEffectsPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxCharEffectsPage>::Create( pParent, *rSet ); + return VclPtr<SvxCharEffectsPage>::Create( pParent.pParent, *rSet ); } @@ -2742,9 +2742,9 @@ DeactivateRC SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) } -VclPtr<SfxTabPage> SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxCharPositionPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxCharPositionPage>::Create( pParent, *rSet ); + return VclPtr<SvxCharPositionPage>::Create( pParent.pParent, *rSet ); } @@ -3272,9 +3272,9 @@ DeactivateRC SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) } -VclPtr<SfxTabPage> SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxCharTwoLinesPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxCharTwoLinesPage>::Create( pParent, *rSet ); + return VclPtr<SvxCharTwoLinesPage>::Create( pParent.pParent, *rSet ); } void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet ) diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index ebfe9a008e2e..2820e383434c 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -389,10 +389,10 @@ void SvxConnectionPage::Construct() |* \************************************************************************/ -VclPtr<SfxTabPage> SvxConnectionPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxConnectionPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr<SvxConnectionPage>::Create( pWindow, *rAttrs ); + return VclPtr<SvxConnectionPage>::Create( pWindow.pParent, *rAttrs ); } IMPL_LINK( SvxConnectionPage, ChangeAttrListBoxHdl_Impl, ListBox&, r, void ) diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 1546ed77e5f9..51a393db83a4 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -152,9 +152,9 @@ void SvxGrfCropPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxGrfCropPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr<SfxTabPage> SvxGrfCropPage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr<SvxGrfCropPage>::Create( pParent, *rSet ); + return VclPtr<SvxGrfCropPage>::Create( pParent.pParent, *rSet ); } void SvxGrfCropPage::Reset( const SfxItemSet *rSet ) diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 0671a1691cb3..796b2976df8f 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -353,10 +353,10 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) } -VclPtr<SfxTabPage> SvxCaptionTabPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxCaptionTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr<SvxCaptionTabPage>::Create( pWindow, *rOutAttrs ); + return VclPtr<SvxCaptionTabPage>::Create( pWindow.pParent, *rOutAttrs ); } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index e86d51d8b9be..a3e37471bd9b 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -448,9 +448,9 @@ namespace } } -VclPtr<SfxTabPage> SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr<SfxTabPage> SfxMacroTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return CreateSfxMacroTabPage(pParent, *rAttrSet); + return CreateSfxMacroTabPage(pParent.pParent, *rAttrSet); } SfxMacroAssignDlg::SfxMacroAssignDlg(vcl::Window* pParent, diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 58ae066ae39b..c9e5c2aad024 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -609,10 +609,10 @@ void SvxMeasurePage::Construct() m_pCtlPreview->Invalidate(); } -VclPtr<SfxTabPage> SvxMeasurePage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxMeasurePage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr<SvxMeasurePage>::Create( pWindow, *rAttrs ); + return VclPtr<SvxMeasurePage>::Create( pWindow.pParent, *rAttrs ); } void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RectPoint /*eRP*/ ) diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 7735ee8ac036..ecfa8ff6f7ab 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -372,10 +372,10 @@ void SvxNumberFormatTabPage::Init_Impl() m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM ); } -VclPtr<SfxTabPage> SvxNumberFormatTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxNumberFormatTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr<SvxNumberFormatTabPage>::Create( pParent, *rAttrSet ); + return VclPtr<SvxNumberFormatTabPage>::Create( pParent.pParent, *rAttrSet ); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index eb9fea50f28f..652dbdbddf78 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -230,10 +230,10 @@ void SvxSingleNumPickTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxSingleNumPickTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxSingleNumPickTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<SvxSingleNumPickTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxSingleNumPickTabPage>::Create(pParent.pParent, *rAttrSet); } bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -396,10 +396,10 @@ void SvxBulletPickTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxBulletPickTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxBulletPickTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<SvxBulletPickTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxBulletPickTabPage>::Create(pParent.pParent, *rAttrSet); } bool SvxBulletPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -595,10 +595,10 @@ void SvxNumPickTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxNumPickTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxNumPickTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<SvxNumPickTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxNumPickTabPage>::Create(pParent.pParent, *rAttrSet); } bool SvxNumPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -847,10 +847,10 @@ void SvxBitmapPickTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxBitmapPickTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxBitmapPickTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<SvxBitmapPickTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxBitmapPickTabPage>::Create(pParent.pParent, *rAttrSet); } void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) @@ -1242,10 +1242,10 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) m_pHeightMF->SetUnit( eMetric ); } -VclPtr<SfxTabPage> SvxNumOptionsTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxNumOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<SvxNumOptionsTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxNumOptionsTabPage>::Create(pParent.pParent, *rAttrSet); }; void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) @@ -3114,10 +3114,10 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive ); } -VclPtr<SfxTabPage> SvxNumPositionTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxNumPositionTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<SvxNumPositionTabPage>::Create(pParent, *rAttrSet); + return VclPtr<SvxNumPositionTabPage>::Create(pParent.pParent, *rAttrSet); } void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 7dbbf1761645..fea2604e4ed2 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -138,9 +138,9 @@ bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) // class SvxPageDescPage -------------------------------------------------- -VclPtr<SfxTabPage> SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxPageDescPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxPageDescPage>::Create( pParent, *rSet ); + return VclPtr<SvxPageDescPage>::Create( pParent.pParent, *rSet ); } SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index ad36ba0a686e..f17c35b3129b 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -196,9 +196,9 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl, Control&, void) m_pRightIndent->SetEmptyFieldValue(); } -VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<SvxStdParagraphTabPage>::Create( pParent, *rSet ); + return VclPtr<SvxStdParagraphTabPage>::Create( pParent.pParent, *rSet ); } bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -1112,9 +1112,9 @@ DeactivateRC SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return DeactivateRC::LeavePage; } -VclPtr<SfxTabPage> SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxParaAlignTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxParaAlignTabPage>::Create(pParent, *rSet); + return VclPtr<SvxParaAlignTabPage>::Create(pParent.pParent, *rSet); } bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -1390,10 +1390,10 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet) EnableJustifyExt(); } -VclPtr<SfxTabPage> SvxExtParagraphTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxExtParagraphTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxExtParagraphTabPage>::Create( pParent, *rSet ); + return VclPtr<SvxExtParagraphTabPage>::Create( pParent.pParent, *rSet ); } bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -2267,9 +2267,9 @@ void SvxAsianTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxAsianTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxAsianTabPage>::Create(pParent, *rSet); + return VclPtr<SvxAsianTabPage>::Create(pParent.pParent, *rSet); } const sal_uInt16* SvxAsianTabPage::GetRanges() diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 72d926060c97..d870f8ea77f1 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -730,9 +730,9 @@ void SvxSwPosSizeTabPage::setOptimalRelWidth() m_pHoriLB->Clear(); } -VclPtr<SfxTabPage> SvxSwPosSizeTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SvxSwPosSizeTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<SvxSwPosSizeTabPage>::Create(pParent, *rSet); + return VclPtr<SvxSwPosSizeTabPage>::Create(pParent.pParent, *rSet); } const sal_uInt16* SvxSwPosSizeTabPage::GetRanges() diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 18bb28610461..cc34aaad4d4f 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -259,9 +259,9 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet) return bModified; } -VclPtr<SfxTabPage> SvxTabulatorTabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SvxTabulatorTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<SvxTabulatorTabPage>::Create(pParent, *rSet); + return VclPtr<SvxTabulatorTabPage>::Create(pParent.pParent, *rSet); } void SvxTabulatorTabPage::Reset(const SfxItemSet* rSet) diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index c74c71aabbc0..cb8f10c9afb0 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -470,10 +470,10 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs) |* \************************************************************************/ -VclPtr<SfxTabPage> SvxTextAnimationPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxTextAnimationPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr<SvxTextAnimationPage>::Create( pWindow, *rAttrs ); + return VclPtr<SvxTextAnimationPage>::Create( pWindow.pParent, *rAttrs ); } IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 3c3121bf7e87..1fe363be96ca 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -528,10 +528,10 @@ void SvxTextAttrPage::Construct() m_pTsbWordWrapText->Show( bWordWrapTextEnabled ); } -VclPtr<SfxTabPage> SvxTextAttrPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxTextAttrPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr<SvxTextAttrPage>::Create( pWindow, *rAttrs ); + return VclPtr<SvxTextAttrPage>::Create( pWindow.pParent, *rAttrs ); } /** Check whether we have to uncheck the "Full width" check box. diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 62e5ccd58594..57492037a1e6 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -131,16 +131,18 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs SetExchangeSupport(); + TabPageParent aFillTab(m_pFillTab); + // Calculate optimal size of all pages.. - m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(m_pFillTab, &m_rXFSet)); + m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(aFillTab, &m_rXFSet)); Size aSize = m_pFillTabPage->GetOptimalSize(); - m_pFillTabPage.disposeAndReset(SvxGradientTabPage::Create(m_pFillTab, &m_rXFSet)); + m_pFillTabPage.disposeAndReset(SvxGradientTabPage::Create(aFillTab, &m_rXFSet)); lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize()); - m_pFillTabPage.disposeAndReset(SvxBitmapTabPage::Create(m_pFillTab, &m_rXFSet)); + m_pFillTabPage.disposeAndReset(SvxBitmapTabPage::Create(aFillTab, &m_rXFSet)); lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize()); - m_pFillTabPage.disposeAndReset(SvxHatchTabPage::Create(m_pFillTab, &m_rXFSet)); + m_pFillTabPage.disposeAndReset(SvxHatchTabPage::Create(aFillTab, &m_rXFSet)); lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize()); - m_pFillTabPage.disposeAndReset(SvxPatternTabPage::Create(m_pFillTab, &m_rXFSet)); + m_pFillTabPage.disposeAndReset(SvxPatternTabPage::Create(aFillTab, &m_rXFSet)); lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize()); m_pFillTabPage.disposeAndClear(); @@ -333,10 +335,10 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) } } -VclPtr<SfxTabPage> SvxAreaTabPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxAreaTabPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr<SvxAreaTabPage>::Create( pWindow, *rAttrs ); + return VclPtr<SvxAreaTabPage>::Create( pWindow.pParent, *rAttrs ); } namespace { diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 69df65a60225..b6b2d007294f 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -439,10 +439,10 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) } -VclPtr<SfxTabPage> SvxBitmapTabPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxBitmapTabPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr<SvxBitmapTabPage>::Create( pWindow, *rAttrs ); + return VclPtr<SvxBitmapTabPage>::Create( pWindow.pParent, *rAttrs ); } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 0c015d40e92b..0e709f09e0f4 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -308,10 +308,10 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) } -VclPtr<SfxTabPage> SvxColorTabPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxColorTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr<SvxColorTabPage>::Create( pWindow, *rOutAttrs ); + return VclPtr<SvxColorTabPage>::Create( pWindow.pParent, *rOutAttrs ); } // is called when the content of the MtrFields is changed for color values diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 3b36e963d6a0..6b5bd18b9202 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -272,10 +272,10 @@ void SvxGradientTabPage::Reset( const SfxItemSet* ) } -VclPtr<SfxTabPage> SvxGradientTabPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxGradientTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr<SvxGradientTabPage>::Create( pWindow, *rOutAttrs ); + return VclPtr<SvxGradientTabPage>::Create( pWindow.pParent, *rOutAttrs ); } IMPL_LINK( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 7621583f12cd..304a7868ea1b 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -297,10 +297,10 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) } -VclPtr<SfxTabPage> SvxHatchTabPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxHatchTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet ) { - return VclPtr<SvxHatchTabPage>::Create( pWindow, *rSet ); + return VclPtr<SvxHatchTabPage>::Create( pWindow.pParent, *rSet ); } IMPL_LINK( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 145a30466576..b19981a03ee1 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1476,10 +1476,10 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) } -VclPtr<SfxTabPage> SvxLineTabPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxLineTabPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr<SvxLineTabPage>::Create( pWindow, *rAttrs ); + return VclPtr<SvxLineTabPage>::Create( pWindow.pParent, *rAttrs ); } IMPL_LINK( SvxLineTabPage, ChangePreviewListBoxHdl_Impl, SvxColorListBox&, rListBox, void ) diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index ab7b9ac74998..4a84e8d52976 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -337,9 +337,9 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) } -VclPtr<SfxTabPage> SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxLineDefTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr<SvxLineDefTabPage>::Create( pWindow, *rOutAttrs ); + return VclPtr<SvxLineDefTabPage>::Create( pWindow.pParent, *rOutAttrs ); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 1f1629fbe20f..63bca6e153c7 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -270,9 +270,9 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) } -VclPtr<SfxTabPage> SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxLineEndDefTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet ) { - return VclPtr<SvxLineEndDefTabPage>::Create( pWindow, *rSet ); + return VclPtr<SvxLineEndDefTabPage>::Create( pWindow.pParent, *rSet ); } diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 1e338d04cf11..b312b33c3a1a 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -252,10 +252,10 @@ void SvxPatternTabPage::Reset( const SfxItemSet* ) } -VclPtr<SfxTabPage> SvxPatternTabPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxPatternTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet ) { - return VclPtr<SvxPatternTabPage>::Create( pWindow, *rSet ); + return VclPtr<SvxPatternTabPage>::Create( pWindow.pParent, *rSet ); } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index ba15f1c4add1..e603ce9f4c1a 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -428,10 +428,10 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) } -VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow, +VclPtr<SfxTabPage> SvxShadowTabPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr<SvxShadowTabPage>::Create( pWindow, *rAttrs ); + return VclPtr<SvxShadowTabPage>::Create( pWindow.pParent, *rAttrs ); } diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index a9fc292cd581..c8d99d39c35c 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -289,9 +289,9 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt SetExchangeSupport(); } -VclPtr<SfxTabPage> SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs) +VclPtr<SfxTabPage> SvxTransparenceTabPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs) { - return VclPtr<SvxTransparenceTabPage>::Create(pWindow, *rAttrs); + return VclPtr<SvxTransparenceTabPage>::Create(pWindow.pParent, *rAttrs); } bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index b930cba2804e..b455872dd343 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -321,9 +321,9 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) } -VclPtr<SfxTabPage> SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SvxAngleTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet) { - return VclPtr<SvxAngleTabPage>::Create(pWindow, *rSet); + return VclPtr<SvxAngleTabPage>::Create(pWindow.pParent, *rSet); } @@ -747,9 +747,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) } } -VclPtr<SfxTabPage> SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxSlantTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr<SvxSlantTabPage>::Create( pWindow, *rOutAttrs ); + return VclPtr<SvxSlantTabPage>::Create( pWindow.pParent, *rOutAttrs ); } void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) @@ -1209,9 +1209,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) } -VclPtr<SfxTabPage> SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr<SfxTabPage> SvxPositionSizeTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr<SvxPositionSizeTabPage>::Create( pWindow, *rOutAttrs ); + return VclPtr<SvxPositionSizeTabPage>::Create( pWindow.pParent, *rOutAttrs ); } |