[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/source

[Tamás Zolnai (via logerrit)]

 sd/source/ui/sidebar/SlideBackground.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2be52f741e283b5f172ae536f0e99ce0f38df9e1
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Jan 28 12:20:29 2021 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Jan 28 16:08:05 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 <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 197d43abf4b8..0ba486884b25 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -291,6 +291,7 @@ void SlideBackground::HandleContextChange(
             mpCloseMaster->Show();
             mpEditMaster->Hide();
             mpMasterSlide->Disable();
+            mpMasterSlide->Clear();
             mpDspMasterBackground->Disable();
             mpDspMasterObjects->Disable();
             mpFillStyle->Hide();
@@ -307,6 +308,7 @@ void SlideBackground::HandleContextChange(
             mpCloseMaster->Hide();
             mpEditMaster->Hide();
             mpMasterSlide->Disable();
+            mpMasterSlide->Clear();
             mpDspMasterBackground->Disable();
             mpDspMasterObjects->Disable();
             mpFillStyle->Hide();
@@ -318,6 +320,7 @@ void SlideBackground::HandleContextChange(
             mpCloseMaster->Hide();
             mpEditMaster->Show();
             mpMasterSlide->Enable();
+            populateMasterSlideDropdown();
             mpDspMasterBackground->Enable();
             mpDspMasterObjects->Enable();
             mpFillStyle->Show();