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

[Caolán McNamara]

 sc/source/ui/formdlg/dwfunctr.cxx |    1 +
 scp2/source/base/file_base.scp    |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17748081ba7057f628ca45628b52a69ce86a7182
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 27 15:55:55 2017 +0100

    sdbcl is gone
    
    Change-Id: Id9c7106d2674a661b16b7772f866b3d103bae327

diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index d98fd8474194..c8537dadcd06 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -25,7 +25,6 @@ STD_RES_FILE( gid_File_Res_Dbp, dbp)
 STD_RES_FILE( gid_File_Res_Dbu, dbu)
 
 STD_RES_FILE( gid_File_Res_Cnr, cnr)
-STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
 STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
 
 STD_RES_FILE( gid_File_Res_Rpt, rpt)
commit e33447a24c6800bbd34ea1463ee823737bf555cd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 27 15:55:40 2017 +0100

    Resolves: tdf#107241 don't let floating function description grow infinitely
    
    Change-Id: Ief87c15c637d725d25416b64739fb3f5f07cded4

diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 8a567c694e72..e690b1568a07 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -58,6 +58,7 @@ ScFunctionWin::ScFunctionWin(vcl::Window* pParent, const css::uno::Reference<css
 {
     get(aCatBox, "category");
     get(aFuncList, "funclist");
+    aFuncList->set_height_request(10 * aFuncList->GetTextHeight());
     get(aInsertButton, "insert");
     get(aFiFuncDesc, "funcdesc");