From deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 24 Sep 2019 14:10:48 +0100 Subject: now drop TabPageParent intermediate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I47328f76342ac023628d9042bdfa8213a1c93d0c Reviewed-on: https://gerrit.libreoffice.org/79469 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/inc/swmodule.hxx | 2 +- sw/inc/view.hxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 01767974d139..a102410d7118 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -229,7 +229,7 @@ public: // Virtual methods for options dialog. virtual std::unique_ptr CreateItemSet( sal_uInt16 nId ) override; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override; - virtual std::unique_ptr CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override; + virtual std::unique_ptr CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ) override; virtual std::unique_ptr CreateStyleFamilies() override; // Pool is created here and set at SfxShell. diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 83412953a18d..e6142006d50c 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -630,7 +630,7 @@ public: // methods for printing SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override; - SAL_DLLPRIVATE virtual std::unique_ptr CreatePrintOptionsPage(TabPageParent pParent, + SAL_DLLPRIVATE virtual std::unique_ptr CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) override; static SvxSearchItem* GetSearchItem() { return s_pSrchItem; } /// See SfxViewShell::getPart(). @@ -690,7 +690,7 @@ inline const SwDocShell *SwView::GetDocShell() const return const_cast(this)->GetDocShell(); } -std::unique_ptr CreatePrintOptionsPage(TabPageParent pParent, +std::unique_ptr CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions, bool bPreview); -- cgit