summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-02-07 11:28:33 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-02-09 09:53:18 +0000
commit914e20d2eae5375594b8cdf69fd387672dde48a0 (patch)
tree51abde174296242f5eac78c54f55b7628bd2fb0b /sd
parent60e55044891305756fc3fdbcbd8ddbd592c40df9 (diff)
animation duration/scale etc don't fill horizontal space
Change-Id: Ie211827c2f8231384b98fb08e0371a839e3dc41c (cherry picked from commit d18089ec0a2a8758eda889a7b9b23b66128484d5) Reviewed-on: https://gerrit.libreoffice.org/33996 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 6726317d95ba..ef4169836c9f 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -119,6 +119,7 @@ PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pPare
: PropertySubControl( nControlType ), maModifyLink(rModifyHdl)
{
mpControl = VclPtr<ListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
+ mpControl->set_hexpand(true);
mpControl->SetDropDownLineCount( 10 );
mpControl->SetSelectHdl( LINK(this, PresetPropertyBox, OnSelect) );
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX );
@@ -201,6 +202,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent
: PropertySubControl( nControlType ), maModifyLink(rModifyHdl)
{
mpControl = VclPtr<SvxColorListBox>::Create(pParent);
+ mpControl->set_hexpand(true);
mpControl->SetSelectHdl( LINK(this, ColorPropertyBox, OnSelect) );
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX );
@@ -262,6 +264,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent,
: PropertySubControl( nControlType ), maModifyHdl(rModifyHdl)
{
mpControl = VclPtr<FontNameBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
+ mpControl->set_hexpand(true);
mpControl->SetDropDownLineCount( 10 );
mpControl->SetSelectHdl( LINK(this, FontPropertyBox, ControlSelectHdl) );
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX );
@@ -349,6 +352,7 @@ DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, Popup
mpDropdownButton->SetPopupMenu( pMenu );
SetSubEdit( mpSubControl );
+ set_hexpand(true);
mpSubControl->SetParent( this );
mpSubControl->Show();
}