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 /sw/source/ui/envelp | |
| 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 'sw/source/ui/envelp')
| -rw-r--r-- | sw/source/ui/envelp/envlop1.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/envelp/envprt.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/envelp/labfmt.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 730351caeca3..16118d2ab258 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -51,9 +51,9 @@ SwEnvPreview::SwEnvPreview() void SwEnvPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea) { + CustomWidgetController::SetDrawingArea(pDrawingArea); pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() * 20, pDrawingArea->get_text_height() * 8); - CustomWidgetController::SetDrawingArea(pDrawingArea); } void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 9807e760e455..74860a832ff4 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -118,7 +118,7 @@ IMPL_LINK(SwEnvPrtPage, ButtonHdl, weld::Button&, rBtn, void) // Call printer setup if (m_xPrt) { - PrinterSetupDialog aDlg(GetDialogController()->getDialog()); + PrinterSetupDialog aDlg(GetDialogFrameWeld()); aDlg.SetPrinter(m_xPrt); aDlg.execute(); rBtn.grab_focus(); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index eb7d9621b0c0..09f6792ccc0c 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -122,6 +122,8 @@ SwLabPreview::SwLabPreview() void SwLabPreview::SetDrawingArea(weld::DrawingArea* pWidget) { + CustomWidgetController::SetDrawingArea(pWidget); + pWidget->set_size_request(pWidget->get_approximate_digit_width() * 54, pWidget->get_text_height() * 15); @@ -133,8 +135,6 @@ void SwLabPreview::SetDrawingArea(weld::DrawingArea* pWidget) m_lColsWidth = pWidget->get_pixel_size(m_aColsStr).Width(); m_lXWidth = pWidget->get_pixel_size(OUString('X')).Width(); m_lXHeight = pWidget->get_text_height(); - - CustomWidgetController::SetDrawingArea(pWidget); } void SwLabPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) |