diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-30 09:43:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-07 14:42:31 +0200 |
| commit | a2304f62e963b413b7575bedfb8d34e5f2d3ea58 (patch) | |
| tree | e92b8fce9d381deb02a9823ca24cd20a272c08d0 /starmath | |
| parent | 1a86f5643f3c36ead2f9aee42571664c2454ccf7 (diff) | |
weld writer page style dialog and SvxBorderBackgroundDlg
writer, format page is complete
Change-Id: I09f6e4354461c4374cdb0d0e0754dfee35415b45
Reviewed-on: https://gerrit.libreoffice.org/60058
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/dialog.hxx | 6 | ||||
| -rw-r--r-- | starmath/inc/view.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/smmod.cxx | 4 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 37dcbd5bd45a..847f65783ed4 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -284,9 +284,9 @@ public: virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override { + CustomWidgetController::SetDrawingArea(pDrawingArea); pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() * 27, pDrawingArea->get_text_height() * 9); - CustomWidgetController::SetDrawingArea(pDrawingArea); } void calccols(vcl::RenderContext& rRenderContext); @@ -315,9 +315,9 @@ public: virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override { + CustomWidgetController::SetDrawingArea(pDrawingArea); pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() * 27, pDrawingArea->get_text_height() * 9); - CustomWidgetController::SetDrawingArea(pDrawingArea); } void SetText(const OUString& rText) { m_aText = rText; } @@ -386,9 +386,9 @@ public: virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override { + CustomWidgetController::SetDrawingArea(pDrawingArea); pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() * 7, pDrawingArea->get_text_height() * 3); - CustomWidgetController::SetDrawingArea(pDrawingArea); } void SetSymbol(const SmSym *pSym); diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index f0d8af2424f5..7b6e741895bb 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -251,7 +251,7 @@ protected: void InsertFrom(SfxMedium &rMedium); virtual bool HasPrintOptionsPage() const override; - virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, + virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override; virtual void Deactivate(bool IsMDIActivate) override; virtual void Activate(bool IsMDIActivate) override; diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 3a4722da4b61..32cd5550d9e5 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -237,8 +237,8 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) VclPtr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) { VclPtr<SfxTabPage> pRet; - if(nId == SID_SM_TP_PRINTOPTIONS) - pRet = SmPrintOptionsTabPage::Create( TabPageParent(pParent.pParent), rSet ); + if (nId == SID_SM_TP_PRINTOPTIONS) + pRet = SmPrintOptionsTabPage::Create(pParent, rSet); return pRet; } diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index f817343dd5e0..ddf3e23e49b4 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1261,10 +1261,10 @@ bool SmViewShell::HasPrintOptionsPage() const return true; } -VclPtr<SfxTabPage> SmViewShell::CreatePrintOptionsPage(weld::Container* pPage, +VclPtr<SfxTabPage> SmViewShell::CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) { - return SmPrintOptionsTabPage::Create(pPage, rOptions); + return SmPrintOptionsTabPage::Create(pParent, rOptions); } SmEditWindow *SmViewShell::GetEditWindow() |