[Libreoffice-commits] core.git: 2 commits - chart2/source sd/source

[Caolán McNamara]

 chart2/source/controller/inc/ChartWindow.hxx      |    4 +---
 sd/source/ui/animations/CustomAnimationDialog.cxx |    4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d18089ec0a2a8758eda889a7b9b23b66128484d5
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
    
    Change-Id: Ie211827c2f8231384b98fb08e0371a839e3dc41c

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index ba06029..f9aa985 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();
 }
commit 5601c77e99d9e9dec4b1cb90084324657e2def65
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 7 11:33:53 2017 +0000

    fix oss-fuzz build
    
    Change-Id: I0e292bcca27035b316bcf0c93dbd6c87e3f93e3b

diff --git a/chart2/source/controller/inc/ChartWindow.hxx b/chart2/source/controller/inc/ChartWindow.hxx
index 6b0feaf..e9c1827 100644
--- a/chart2/source/controller/inc/ChartWindow.hxx
+++ b/chart2/source/controller/inc/ChartWindow.hxx
@@ -21,8 +21,6 @@
 
 #include <vcl/window.hxx>
 
-class OpenGLWindow;
-
 namespace chart
 {
 
@@ -72,7 +70,7 @@ public:
 private:
     ChartController* m_pWindowController;
     bool m_bInPaint;
-    VclPtr<OpenGLWindow> m_pOpenGLWindow;
+    VclPtr<vcl::Window> m_pOpenGLWindow;
 
     void adjustHighContrastMode();
 };