[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source

[Ivan Timofeev]

 vcl/source/window/toolbox.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20ed0cf74cc4dc4e181b5403a1faf351b6eb38b7
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Mon Jul 9 17:24:54 2012 +0400

    fdo#47071: Undocked toolbars do not show all icons in special ratio
    
     restore the old behaviour (pre-1703501a100cd6d52578baeb4e8097218b285ffb)
     for floating toolbars.
    
    Change-Id: I8435bd94a44744c5af7a3abdbeb99e8f7cf0af24
    (cherry picked from commit 89de7eef5090c5efdca1314f8838bdc977001e5d)

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 8242ec9..dda343a 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2190,7 +2190,7 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool b
             else if ( it->meType == TOOLBOXITEM_SEPARATOR )
             {
                 nCurWidth = it->mnSepSize;
-                if ( ( it != lastVisible ) && (nLineWidth+nCurWidth+nMenuWidth > nWidthTotal) )
+                if ( !ImplIsFloatingMode() && ( it != lastVisible ) && (nLineWidth+nCurWidth+nMenuWidth > nWidthTotal) )
                     bBreak = sal_True;
             }
             // treat breaks as separators, except when using old style toolbars (ie. no menu button)