diff options
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/inc/dialog.hxx | 4 | ||||
-rw-r--r-- | starmath/inc/smmod.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/view.hxx | 2 | ||||
-rw-r--r-- | starmath/source/dialog.cxx | 8 | ||||
-rw-r--r-- | starmath/source/smmod.cxx | 4 | ||||
-rw-r--r-- | starmath/source/view.cxx | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 0c6c6a91f271..615053baff78 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -57,9 +57,9 @@ class SmPrintOptionsTabPage : public SfxTabPage virtual void Reset(const SfxItemSet* rSet) override; public: - static std::unique_ptr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet &rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); - SmPrintOptionsTabPage(TabPageParent pPage, const SfxItemSet &rOptions); + SmPrintOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions); virtual ~SmPrintOptionsTabPage() override; }; diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index 8e3759e575ea..3dcbbcfe50b2 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -97,7 +97,7 @@ public: //virtual methods for options dialog virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override; - virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override; + virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ) override; }; #define SM_MOD() ( static_cast<SmModule*>(SfxApplication::GetModule(SfxToolsModule::Math)) ) diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 62068e586824..687fd1850bf0 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -249,7 +249,7 @@ protected: void InsertFrom(SfxMedium &rMedium); virtual bool HasPrintOptionsPage() const override; - virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, + virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions) override; virtual void Deactivate(bool IsMDIActivate) override; virtual void Activate(bool IsMDIActivate) override; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 6be0c38d0c59..c8ef9c49cb5c 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -160,8 +160,8 @@ IMPL_LINK_NOARG(SmPrintOptionsTabPage, SizeButtonClickHdl, weld::ToggleButton&, m_xZoom->set_sensitive(m_xSizeZoomed->get_active()); } -SmPrintOptionsTabPage::SmPrintOptionsTabPage(TabPageParent pPage, const SfxItemSet& rOptions) - : SfxTabPage(pPage, "modules/smath/ui/smathsettings.ui", "SmathSettings", &rOptions) +SmPrintOptionsTabPage::SmPrintOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rOptions) + : SfxTabPage(pPage, pController, "modules/smath/ui/smathsettings.ui", "SmathSettings", &rOptions) , m_xTitle(m_xBuilder->weld_check_button("title")) , m_xText(m_xBuilder->weld_check_button("text")) , m_xFrame(m_xBuilder->weld_check_button("frame")) @@ -224,9 +224,9 @@ void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet) m_xAutoCloseBrackets->set_active(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_AUTO_CLOSE_BRACKETS))).GetValue()); } -std::unique_ptr<SfxTabPage> SmPrintOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet& rSet) +std::unique_ptr<SfxTabPage> SmPrintOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) { - return std::make_unique<SmPrintOptionsTabPage>(pParent, rSet); + return std::make_unique<SmPrintOptionsTabPage>(pPage, pController, rSet); } void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 6429e4abdb6c..788f5f5e2c91 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -224,11 +224,11 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } } -std::unique_ptr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) +std::unique_ptr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ) { std::unique_ptr<SfxTabPage> xRet; if (nId == SID_SM_TP_PRINTOPTIONS) - xRet = SmPrintOptionsTabPage::Create(pParent, rSet); + xRet = SmPrintOptionsTabPage::Create(pPage, pController, rSet); return xRet; } diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index b0a020fdc448..bb12c5563d70 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1266,10 +1266,10 @@ bool SmViewShell::HasPrintOptionsPage() const return true; } -std::unique_ptr<SfxTabPage> SmViewShell::CreatePrintOptionsPage(TabPageParent pParent, +std::unique_ptr<SfxTabPage> SmViewShell::CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions) { - return SmPrintOptionsTabPage::Create(pParent, rOptions); + return SmPrintOptionsTabPage::Create(pPage, pController, rOptions); } SmEditWindow *SmViewShell::GetEditWindow() |