[Libreoffice-commits] core.git: sc/source sw/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/dbgui/validate.cxx          |    4 +++-
 sw/source/ui/dbui/mmaddressblockpage.cxx |    8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit ac1dff224e597ccbd235e41fcd918ea79727ccd2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 23 16:38:15 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 23 20:27:57 2019 +0200

    replace LogicToPixel uses in SfxTabPages
    
    Change-Id: I4022c8ac71f2bdfc77c8920568b8242431391623
    Reviewed-on: https://gerrit.libreoffice.org/79418
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index a4bacae396df..d9f1b00a4a48 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -354,7 +354,9 @@ ScTPValidationValue::ScTPValidationValue(TabPageParent pParent, const SfxItemSet
     , m_pBtnRefParent(m_xRefGrid.get())
 {
     m_xEdMin->SetReferences(nullptr, m_xFtMin.get());
-    Size aSize(LogicToPixel(Size(174, 105), MapMode(MapUnit::MapAppFont)));
+
+    Size aSize(m_xEdList->get_approximate_digit_width() * 40,
+               m_xEdList->get_height_rows(25));
     m_xEdList->set_size_request(aSize.Width(), aSize.Height());
     m_xEdMax->SetReferences(nullptr, m_xFtMax.get());
 
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 18ddc67d2c4e..8c50dd1f454a 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -74,10 +74,10 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(SwMailMergeWizard* pWiz
     , m_xSettingsWIN(new weld::CustomWeld(*m_xBuilder, "settingspreview", *m_xSettings))
     , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "addresspreview", *m_xPreview))
 {
-    Size aSize(LogicToPixel(Size(164 , 45), MapMode(MapUnit::MapAppFont)));
-    m_xSettingsWIN->set_size_request(aSize.Width(), aSize.Height());
-    aSize = LogicToPixel(Size(176, 46), MapMode(MapUnit::MapAppFont));
-    m_xPreviewWIN->set_size_request(aSize.Width(), aSize.Height());
+    m_xSettingsWIN->set_size_request(m_xDifferentlist->get_approximate_digit_width() * 40,
+                                     m_xDifferentlist->get_text_height() * 6);
+    m_xPreviewWIN->set_size_request(m_xDifferentlist->get_approximate_digit_width() * 44,
+                                    m_xDifferentlist->get_text_height() * 6);
     m_sChangeAddress = m_xDifferentlist->get_label();
     m_sDocument = m_xDocumentIndexFI->get_label();