diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-12 10:13:22 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-18 10:01:04 +0000 |
| commit | 1cf7025df7f825326ce57b4e2817ee9544f059b7 (patch) | |
| tree | 4d3126ca33a4befdc796ed59209870d983fbea66 /sfx2 | |
| parent | d1fe0d67111cfca14eae447a6c35541292f20228 (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.
(cherry picked from commit 8192da8e4de7a058ef95253f992f4143f83fa0f1)
Change-Id: I7e1ef4a016a37b25e084c4c6467a42ca557069a4
Reviewed-on: https://gerrit.libreoffice.org/27214
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/classificationcontroller.cxx | 4 |
1 files changed, 3 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); |