diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-04-20 11:06:07 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-22 21:29:36 +0200 |
commit | 60f3e4b843da89678e022eed837ee66e726b1920 (patch) | |
tree | 4cffea5d364e3ed9bd3e68c7b471f313c237a98e /filter | |
parent | 4a7ebfea57094b914c4b1c3e46936dbf67dec499 (diff) |
place an intermediate class as parent for SfxTabPages
so a SfxTabPage can be parented by a vcl::Window or a welded native notebook tabpage.
That ways the same SfxTabPage can be used at the same time in both a native dialog
or a vcl dialog. The impl can be changed to the weld api, and when hosted in a native
dialog the vcl impl of that will be instantiated, while native otherwise. e.g.
print options appearing in print options dialog and general options.
This allows incremental changeover.
Change-Id: I6f1fed1e8d0898b01853bb878757bad41cbf9bba
Reviewed-on: https://gerrit.libreoffice.org/53193
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 24 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.hxx | 12 |
2 files changed, 18 insertions, 18 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 90a79968ada6..e3db5f18bc7e 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -739,10 +739,10 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) } -VclPtr<SfxTabPage> ImpPDFTabGeneralPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ImpPDFTabGeneralPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<ImpPDFTabGeneralPage>::Create( pParent, *rAttrSet ); + return VclPtr<ImpPDFTabGeneralPage>::Create( pParent.pParent, *rAttrSet ); } @@ -935,10 +935,10 @@ void ImpPDFTabOpnFtrPage::dispose() } -VclPtr<SfxTabPage> ImpPDFTabOpnFtrPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ImpPDFTabOpnFtrPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<ImpPDFTabOpnFtrPage>::Create( pParent, *rAttrSet ); + return VclPtr<ImpPDFTabOpnFtrPage>::Create( pParent.pParent, *rAttrSet ); } @@ -1120,10 +1120,10 @@ IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, RadioButton&, void ) } -VclPtr<SfxTabPage> ImpPDFTabViewerPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ImpPDFTabViewerPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<ImpPDFTabViewerPage>::Create( pParent, *rAttrSet ); + return VclPtr<ImpPDFTabViewerPage>::Create( pParent.pParent, *rAttrSet ); } @@ -1240,10 +1240,10 @@ void ImpPDFTabSecurityPage::dispose() } -VclPtr<SfxTabPage> ImpPDFTabSecurityPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ImpPDFTabSecurityPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<ImpPDFTabSecurityPage>::Create( pParent, *rAttrSet ); + return VclPtr<ImpPDFTabSecurityPage>::Create( pParent.pParent, *rAttrSet ); } @@ -1471,10 +1471,10 @@ void ImpPDFTabLinksPage::dispose() } -VclPtr<SfxTabPage> ImpPDFTabLinksPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ImpPDFTabLinksPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<ImpPDFTabLinksPage>::Create( pParent, *rAttrSet ); + return VclPtr<ImpPDFTabLinksPage>::Create( pParent.pParent, *rAttrSet ); } @@ -1735,10 +1735,10 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear, Button*, void ) } -VclPtr<SfxTabPage> ImpPDFTabSigningPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ImpPDFTabSigningPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr<ImpPDFTabSigningPage>::Create( pParent, *rAttrSet ); + return VclPtr<ImpPDFTabSigningPage>::Create( pParent.pParent, *rAttrSet ); } diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index f65ffafc05e4..bb9e1582e6dd 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -247,7 +247,7 @@ public: virtual ~ImpPDFTabGeneralPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void GetFilterConfigItem(ImpPDFTabDialog* paParent); void SetFilterConfigItem(ImpPDFTabDialog* paParent); @@ -287,7 +287,7 @@ public: virtual ~ImpPDFTabOpnFtrPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -320,7 +320,7 @@ public: virtual ~ImpPDFTabViewerPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -374,7 +374,7 @@ public: virtual ~ImpPDFTabSecurityPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -405,7 +405,7 @@ public: virtual ~ImpPDFTabLinksPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -434,7 +434,7 @@ public: virtual ~ImpPDFTabSigningPage() override; virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); |