diff options
author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-07-09 17:24:54 +0400 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2012-07-13 16:32:58 +0200 |
commit | 768cb747ee11a85d2f209f46fad95c4d6ce76537 (patch) | |
tree | 1d480ec50da93b2cfbb46b9c97933855ee179956 | |
parent | fdo#35953 resize controls on Solver dialog of Calc (diff) | |
download | core-768cb747ee11a85d2f209f46fad95c4d6ce76537.tar.gz core-768cb747ee11a85d2f209f46fad95c4d6ce76537.zip |
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 <kendy@suse.cz>
-rw-r--r-- | vcl/source/window/toolbox.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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) |