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

[Caolán McNamara]

 extensions/source/bibliography/toolbar.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 3b6748a4002f4b61ae477da7a84b4a0feccdef12
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 20 14:55:08 2014 +0100

    Resolves: fdo#79227 labels are truncated
    
    Change-Id: I9d5cd9491325aab6c844c889bf4db6baab2e75c8
    (cherry picked from commit 71804294c79136ef43a8f91b5c961e266d32187a)
    Reviewed-on: https://gerrit.libreoffice.org/11043
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 3db37df..e9d2e7b 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -220,15 +220,13 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
     aEdQuery.Show();
 
     OUString aStr=GetItemText(TBC_FT_SOURCE);
-    Rectangle aRect=GetItemRect(TBC_FT_SOURCE);
     aFtSource.SetText(aStr);
-    aFtSource.SetSizePixel(aRect.GetSize());
+    aFtSource.SetSizePixel(aFtSource.get_preferred_size());
     aFtSource.SetBackground(Wallpaper( COL_TRANSPARENT ));
 
     aStr=GetItemText(TBC_FT_QUERY);
-    aRect=GetItemRect(TBC_FT_QUERY);
     aFtQuery.SetText(aStr);
-    aFtQuery.SetSizePixel(aRect.GetSize());
+    aFtQuery.SetSizePixel(aFtQuery.get_preferred_size());
     aFtQuery.SetBackground(Wallpaper( COL_TRANSPARENT ));
 
     SetItemWindow(TBC_FT_SOURCE,&aFtSource);