[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/source

[Caolán McNamara]

 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 40d11c282cae31bd82e87fd0a0ea54c162e7e53c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 8 09:50:52 2014 +0000

    Related: rhbz#1164614 better default size for no xslt entries case
    
    Change-Id: I75dd1210b4e8e5e7cb2c2ce1e83e085a9c480b91

diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index fc0da39..7c32e25 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1390,7 +1390,12 @@ void SvxPathControl::Resize()
 
 Size SvxPathControl::GetOptimalSize() const
 {
-    return m_pVBox->GetOptimalSize();
+    Size aDefSize(LogicToPixel(Size(150, 0), MapMode(MAP_APPFONT)));
+    Size aOptSize(m_pVBox->GetOptimalSize());
+    long nRowHeight(GetTextHeight());
+    aOptSize.Height() = nRowHeight * 10;
+    aOptSize.Width() = std::max(aDefSize.Width(), aOptSize.Width());
+    return aOptSize;
 }
 
 SvxPathControl::~SvxPathControl()