[Libreoffice-commits] core.git: include/svx svx/source

[Rishabh Kumar]

 include/svx/sidebar/AreaPropertyPanelBase.hxx     |    2 +
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |   31 ++++++++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

New commits:
commit e4358002ace626c20a9e4069b9417073d09d8140
Author: Rishabh Kumar <kris.kr296 at gmail.com>
Date:   Fri May 27 03:44:15 2016 +0530

    Fix gradient angle spinbox in Area sidebar tab
    
    Regression introduced by commit - 3c99f8500f657ed84b316390d5175a6f5e56bc69
    
    Change-Id: I65a56b44f851d374e0a6aac8b7c544f4156b67f2
    Reviewed-on: https://gerrit.libreoffice.org/25524
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index e4ec0df..fc24c92 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -161,6 +161,7 @@ protected:
 
     DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void );
     DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void );
+    DECL_LINK_TYPED(ChangeGradientAngle, Edit&, void);
     DECL_LINK_TYPED(ChangeTrgrTypeHdl_Impl, ListBox&, void);
     DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void);
     DECL_LINK_TYPED(ModifyTransSliderHdl, Slider*, void);
@@ -173,6 +174,7 @@ protected:
     void Update();
     void ImpUpdateTransparencies();
     void SetTransparency(sal_uInt16 nVal);
+    void SelectFillAttrHdl_Impl();
 };
 
 } } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 5a7374f..350387b 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -161,6 +161,7 @@ void AreaPropertyPanelBase::Initialize()
     mpGradientStyle->SetSelectHdl( aLink );
     mpLbFillGradFrom->SetSelectHdl( aLink );
     mpLbFillGradTo->SetSelectHdl( aLink );
+    mpMTRAngle->SetModifyHdl(LINK(this,AreaPropertyPanelBase, ChangeGradientAngle));
 
     mpLBTransType->SetSelectHdl(LINK(this, AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl));
 
@@ -398,6 +399,26 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void)
 
 IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void)
 {
+    SelectFillAttrHdl_Impl();
+}
+
+IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ChangeGradientAngle, Edit&, void)
+{
+    SelectFillAttrHdl_Impl();
+}
+
+VclPtr<PopupControl> AreaPropertyPanelBase::CreateTransparencyGradientControl (PopupContainer* pParent)
+{
+    return VclPtrInstance<AreaTransparencyGradientControl>(pParent, *this);
+}
+
+void AreaPropertyPanelBase::DataChanged(
+    const DataChangedEvent& /*rEvent*/)
+{
+}
+
+void AreaPropertyPanelBase::SelectFillAttrHdl_Impl()
+{
     const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectEntryPos();
     const XFillStyleItem aXFillStyleItem(eXFS);
     SfxObjectShell* pSh = SfxObjectShell::Current();
@@ -499,16 +520,6 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void)
     mpSidebarController->NotifyResize();
 }
 
-VclPtr<PopupControl> AreaPropertyPanelBase::CreateTransparencyGradientControl (PopupContainer* pParent)
-{
-    return VclPtrInstance<AreaTransparencyGradientControl>(pParent, *this);
-}
-
-void AreaPropertyPanelBase::DataChanged(
-    const DataChangedEvent& /*rEvent*/)
-{
-}
-
 void AreaPropertyPanelBase::ImpUpdateTransparencies()
 {
     if(mpTransparanceItem.get() || mpFloatTransparenceItem.get())