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

[Katarina Behrens]

 include/svx/itemwin.hxx                  |    2 +-
 sd/source/ui/sidebar/SlideBackground.cxx |    1 +
 sd/source/ui/sidebar/SlideBackground.hxx |    2 +-
 sd/source/ui/view/drviews7.cxx           |    2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ad70397b7fa5af17c1769711ba80904b5543a7cd
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Tue May 10 18:40:47 2016 +0200

    tdf#89466: SvxFillTypeBox::Selected needs to be called
    
    when something is selected in order to flag that its
    an acceptable value and should not be reset to the
    previous value on losing focus
    
    Have to use SvxFillTypeBox instead of base ListBox
    to achieve that and so SvxFillTypeBox has to then be
    SVX_DLLPUBLIC
    
    Change-Id: I92f6264cc9cc0a9c7c8c0b5c3c73517fe456d13e
    Reviewed-on: https://gerrit.libreoffice.org/24858
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index f059069..90167d5 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -94,7 +94,7 @@ public:
 
 // class SvxFillTypeBox --------------------------------------------------
 
-class SvxFillTypeBox : public FillTypeLB
+class SVX_DLLPUBLIC SvxFillTypeBox : public FillTypeLB
 {
 public:
     SvxFillTypeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 96d1304..a772766 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -587,6 +587,7 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, FillStyleModifyHdl, ListBox&, void)
         default:
         break;
     }
+    mpFillStyle->Selected();
 }
 
 IMPL_LINK_NOARG_TYPED(SlideBackground, PaperSizeModifyHdl, ListBox&, void)
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index 1497029..45e3fc2 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -72,7 +72,7 @@ private:
     VclPtr<ListBox> mpPaperSizeBox;
     VclPtr<ListBox> mpPaperOrientation;
     VclPtr<ListBox> mpMasterSlide;
-    VclPtr<ListBox> mpFillStyle;
+    VclPtr<SvxFillTypeBox> mpFillStyle;
     VclPtr<ColorLB> mpFillLB;
     VclPtr<SvxFillAttrBox> mpFillAttr;
     VclPtr<ColorLB> mpFillGrad;
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 6d08aa4..85e7ddb 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1761,6 +1761,8 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq)
                 default:
                 break;
             }
+
+            rReq.Done();
         }
     }
 }