summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2016-05-10 18:40:47 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-05-11 11:12:55 +0000
commitad70397b7fa5af17c1769711ba80904b5543a7cd (patch)
tree12c555f5af9ec38a959695e7f24ef14a03dbf2f4 /sd
parent43896bcbea44aa92ee80ee7ba6cb39f5f514c751 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx1
-rw-r--r--sd/source/ui/sidebar/SlideBackground.hxx2
-rw-r--r--sd/source/ui/view/drviews7.cxx2
3 files changed, 4 insertions, 1 deletions
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 96d1304b519c..a772766bfc1d 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 1497029d181c..45e3fc2193e3 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 6d08aa48cf41..85e7ddb78c23 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();
}
}
}