[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/source

[Caolán McNamara]

 sd/source/ui/animations/CustomAnimationDialog.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 43d64e9b0b634a682f5987bc6401e3207af25598
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 7 11:28:33 2017 +0000

    animation duration/scale etc don't fill horizontal space
    
    (cherry picked from commit d18089ec0a2a8758eda889a7b9b23b66128484d5)
    
    Change-Id: Ie211827c2f8231384b98fb08e0371a839e3dc41c
    Reviewed-on: https://gerrit.libreoffice.org/33997
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 21f6115..1d91489 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -118,6 +118,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
 {
     mpControl = VclPtr<ColorListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
     mpControl->SetDropDownLineCount( 10 );
+    mpControl->set_hexpand(true);
     mpControl->SetSelectHdl( LINK(this, ColorPropertyBox, OnSelect) );
     mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX );
 
@@ -280,6 +282,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 );
@@ -367,6 +370,7 @@ DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, Popup
     mpDropdownButton->SetPopupMenu( pMenu );
 
     SetSubEdit( mpSubControl );
+    set_hexpand(true);
     mpSubControl->SetParent( this );
     mpSubControl->Show();
 }