diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2021-01-28 12:20:29 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2021-01-28 16:08:05 +0100 |
| commit | 2be52f741e283b5f172ae536f0e99ce0f38df9e1 (patch) | |
| tree | 9373445db3d7210dd6b7ab7b2fa31f1887e9a4d5 /sd | |
| parent | 4fab953fe24943152cfdbbc88b0d904be73c8514 (diff) | |
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@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/sidebar/SlideBackground.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
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(); |