summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-09-24 10:00:01 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-09-24 13:28:13 +0200
commitbfb7c7be5781246febcffd5fdafd1d74d9dd7bce (patch)
treeab4e9f27910c6c08883e2839b104d0005f60ce59 /cui
parent52a626ffb48d2b04a355b31063ca58198e8c2e11 (diff)
getDrawPreviewOptimalSize can take an OutputDevice arg
Change-Id: Ifb36166b153858ca7e32974e9b297e583b66c256 Reviewed-on: https://gerrit.libreoffice.org/79444 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/tabpages/tpbitmap.cxx2
-rw-r--r--cui/source/tabpages/tpgradnt.cxx2
-rw-r--r--cui/source/tabpages/tphatch.cxx2
-rw-r--r--cui/source/tabpages/tppattern.cxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 3357c5ba8a14..39f6a391e3e9 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -119,7 +119,7 @@ SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInA
m_xBtnImport->hide();
// Calculate size of display boxes
- Size aSize = getDrawPreviewOptimalSize(this);
+ Size aSize = getDrawPreviewOptimalSize(m_aCtlBitmapPreview.GetDrawingArea()->get_ref_device());
m_xBitmapLB->set_size_request(aSize.Width(), aSize.Height());
m_xCtlBitmapPreview->set_size_request(aSize.Width(), aSize.Height());
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 6274913ac078..fee60f812be5 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -68,7 +68,7 @@ SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet&
, m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "previewctl", m_aCtlPreview))
, m_xGradientLBWin(new weld::CustomWeld(*m_xBuilder, "gradientpresetlist", *m_xGradientLB))
{
- Size aSize = getDrawPreviewOptimalSize(this);
+ Size aSize = getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
m_xGradientLB->set_size_request(aSize.Width(), aSize.Height());
m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height());
// this page needs ExchangeSupport
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 6d99d73817e8..dc152538a9e7 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -63,7 +63,7 @@ SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAtt
, m_xHatchLBWin(new weld::CustomWeld(*m_xBuilder, "hatchpresetlist", *m_xHatchLB))
, m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "previewctl", m_aCtlPreview))
{
- Size aSize = getDrawPreviewOptimalSize(this);
+ Size aSize = getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
m_xHatchLBWin->set_size_request(aSize.Width(), aSize.Height());
m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height());
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index c2358a0fa546..7c1d713dc1b7 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -87,7 +87,7 @@ SvxPatternTabPage::SvxPatternTabPage(TabPageParent pParent, const SfxItemSet& rI
, m_xPatternLBWin(new weld::CustomWeld(*m_xBuilder, "patternpresetlist", *m_xPatternLB))
{
// size of the bitmap display
- Size aSize = getDrawPreviewOptimalSize(this);
+ Size aSize = getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
m_xPatternLB->set_size_request(aSize.Width(), aSize.Height());
m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height());