summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorIvan Timofeev <timofeev.i.s@gmail.com>2012-07-09 17:24:54 +0400
committerIvan Timofeev <timofeev.i.s@gmail.com>2012-07-09 17:29:55 +0400
commit20ed0cf74cc4dc4e181b5403a1faf351b6eb38b7 (patch)
tree474a7333b9dd3a3c28bf3f37c7c018ff74ba7950 /vcl
parent2e3e332e5207b771fb05e6844ea96f742024001f (diff)
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)
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/toolbox.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 8242ec9c9041..dda343ad8c54 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)