summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-07-12 10:13:22 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-07-21 10:22:09 +0200
commit85f84f4a12812d23ee4cac88c3892128548fa718 (patch)
tree737135fc16d2ff11f38f6f0aba07f8a9a8973c74
parent931af50553379d08c61457261cd9dcdda3ecb0ca (diff)
tdf#100600 sfx2 classification: never replace the control with label
Thanks to Caolán McNamara for pointing out where is the condition of the replacement in VCL. Change-Id: I7e1ef4a016a37b25e084c4c6467a42ca557069a4 Reviewed-on: https://gerrit.libreoffice.org/27133 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 8192da8e4de7a058ef95253f992f4143f83fa0f1)
-rw-r--r--sfx2/source/view/classificationcontroller.cxx4
-rw-r--r--vcl/source/window/toolbox2.cxx6
2 files changed, 9 insertions, 1 deletions
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx
index a04287f61c1f..7ec52ca00cbe 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -235,7 +235,9 @@ void ClassificationCategoriesController::removeEntries()
}
ClassificationControl::ClassificationControl(vcl::Window* pParent)
- : Window(pParent, WB_DIALOGCONTROL)
+ // WB_NOLABEL means here that the control won't be replaced with a label
+ // when it wouldn't fit the available space.
+ : Window(pParent, WB_DIALOGCONTROL | WB_NOLABEL)
{
m_pLabels[SfxClassificationPolicyType::IntellectualProperty] = VclPtr<FixedText>::Create(this, WB_CENTER);
m_pLabels[SfxClassificationPolicyType::NationalSecurity] = VclPtr<FixedText>::Create(this, WB_CENTER);
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index c3d11735e9bf..8b08e941e4f0 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -215,6 +215,12 @@ Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, cons
// get size of item window and check if it fits
// no windows in vertical toolbars (the default is mbShowWindow=false)
Size aWinSize = mpWindow->GetSizePixel();
+
+ if (mpWindow->GetStyle() & WB_NOLABEL)
+ // Window wants no label? Then don't check width, it'll be just
+ // clipped.
+ bCheckMaxWidth = false;
+
if ( !bCheckMaxWidth || (aWinSize.Width() <= maxWidth) )
{
aSize.Width() = aWinSize.Width();