[Libreoffice-commits] core.git: svx/source

[Stephan Bergmann]

 svx/source/tbxctrls/tbcontrl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 73b30df7847a00b5236fea11283cf256e4950102
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 22 13:15:14 2015 +0100

    Avoid overflowing SetSizePixel computation
    
    ...near the end of SetupEntry, which appears to not be needed here
    
    Change-Id: Ia273df8a22d26974572d8e9be8de2a27936ee496

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 491ce3a..4741096 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -800,7 +800,7 @@ void SvxStyleBox_Impl::CalcOptimalExtraUserWidth()
         OUString sStyleName(GetEntry(i));
 
         Push(PushFlags::FILLCOLOR | PushFlags::FONT | PushFlags::TEXTCOLOR);
-        SetupEntry(i, Rectangle(0, 0, RECT_MAX, ITEM_HEIGHT), this, sStyleName, false);
+        SetupEntry(i, Rectangle(0, 0, RECT_MAX, ITEM_HEIGHT), this, sStyleName, true);
         Rectangle aTextRectForActualFont;
         GetTextBoundRect(aTextRectForActualFont, sStyleName);
         if (AdjustFontForItemHeight(this, aTextRectForActualFont, ITEM_HEIGHT))