diff options
| -rw-r--r-- | sfx2/source/view/classificationcontroller.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 1e932c85c774..f37490c81db4 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -234,7 +234,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 7a93e507f185..a7fc4738f0a1 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -214,6 +214,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(); |