From 768cb747ee11a85d2f209f46fad95c4d6ce76537 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 9 Jul 2012 17:24:54 +0400 Subject: fdo#47071: Undocked toolbars do not show all icons in special ratio restore the old behaviour (pre-1703501a100cd6d52578baeb4e8097218b285ffb) for floating toolbars. Change-Id: I8435bd94a44744c5af7a3abdbeb99e8f7cf0af24 Signed-off-by: Jan Holesovsky --- vcl/source/window/toolbox.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index a055c6a8e28a..6e3228bed0df 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) -- cgit v1.2.3