[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - sfx2/source

Tomaž Vajngerl tomaz.vajngerl at collabora.co.uk
Tue Jul 21 23:06:05 PDT 2015


 sfx2/source/dialog/templdlg.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8e957ae85f3cd9a6805296702bae41d30e6f0cef
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Sat Jul 18 17:18:25 2015 +0900

    tdf#91495 don't change tree entry height when preview is disabled
    
    Change-Id: Ic707f4407bb3aef5f2a7b9d13a0340c6d9afb3fe
    (cherry picked from commit 9f75bad228ca1f410b7a450084b02ad13745110e)
    Reviewed-on: https://gerrit.libreoffice.org/17180
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index d99a5e4..ad73163 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -330,8 +330,11 @@ SfxActionListBox::SfxActionListBox(SfxCommonTemplateDialog_Impl* pParent, WinBit
 
 void SfxActionListBox::Recalc()
 {
-    SetEntryHeight(32 * GetDPIScaleFactor());
-    RecalcViewData();
+    if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
+    {
+        SetEntryHeight(32 * GetDPIScaleFactor());
+        RecalcViewData();
+    }
 }
 
 PopupMenu* SfxActionListBox::CreateContextMenu()


More information about the Libreoffice-commits mailing list