sd/source/ui/sidebar/SlideBackground.cxx | 3 +++ 1 file changed, 3 insertions(+)
New commits: commit c69d1552b6ad37f237513c6a0ff7ef3396742482 Author: Tamás Zolnai <[email protected]> AuthorDate: Thu Jan 28 12:20:29 2021 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Feb 1 20:22:06 2021 +0100 tdf#139965: Broken master slide list after switching mode. Let's update the master slide combobox by context change. populateMasterSlideDropdown() will fill the list when we switch to normal view. The same method is called when the sidebar created in normal view. mpMasterSlide->Clear() will clean the list when we switch to master view. The same happens, when the sidebar is created in a master view context (the list is empty). Change-Id: I322619e409a5352ddcd59a249dd0c874054c1e4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110075 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tamás Zolnai <[email protected]> (cherry picked from commit 2be52f741e283b5f172ae536f0e99ce0f38df9e1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110114 Tested-by: Jenkins (cherry picked from commit 6c30a605b1d59d31b9a46b6d33ac56a46621dec4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110226 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index fb720af1f034..28c560fa14be 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -303,6 +303,7 @@ void SlideBackground::HandleContextChange( mxCloseMaster->show(); mxEditMaster->hide(); mxMasterSlide->set_sensitive(false); + mxMasterSlide->clear(); mxDspMasterBackground->set_sensitive(false); mxDspMasterObjects->set_sensitive(false); mxFillStyle->hide(); @@ -314,6 +315,7 @@ void SlideBackground::HandleContextChange( mxCloseMaster->hide(); mxEditMaster->hide(); mxMasterSlide->set_sensitive(false); + mxMasterSlide->clear(); mxDspMasterBackground->set_sensitive(false); mxDspMasterObjects->set_sensitive(false); mxFillStyle->hide(); @@ -325,6 +327,7 @@ void SlideBackground::HandleContextChange( mxCloseMaster->hide(); mxEditMaster->show(); mxMasterSlide->set_sensitive(true); + populateMasterSlideDropdown(); mxDspMasterBackground->set_sensitive(true); mxDspMasterObjects->set_sensitive(true); mxFillStyle->show(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
