summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2021-01-28 12:20:29 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2021-01-29 10:15:49 +0100
commit873759184cc8728af0cdea4d8b689ef6da23375c (patch)
treee1900e26975bc9223374b724672c7396f1ca7b04
parentRevert "LOK: allow slide switching in mobile even if it is same slide" (diff)
downloadcore-873759184cc8728af0cdea4d8b689ef6da23375c.tar.gz
core-873759184cc8728af0cdea4d8b689ef6da23375c.zip
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> (cherry picked from commit 2be52f741e283b5f172ae536f0e99ce0f38df9e1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110113
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index bf1914465bac..31b91379a86f 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -283,6 +283,7 @@ void SlideBackground::HandleContextChange(
mpCloseMaster->Show();
mpEditMaster->Hide();
mpMasterSlide->Disable();
+ mpMasterSlide->Clear();
mpDspMasterBackground->Disable();
mpDspMasterObjects->Disable();
mpFillStyle->Hide();
@@ -299,6 +300,7 @@ void SlideBackground::HandleContextChange(
mpCloseMaster->Hide();
mpEditMaster->Hide();
mpMasterSlide->Disable();
+ mpMasterSlide->Clear();
mpDspMasterBackground->Disable();
mpDspMasterObjects->Disable();
mpFillStyle->Hide();
@@ -310,6 +312,7 @@ void SlideBackground::HandleContextChange(
mpCloseMaster->Hide();
mpEditMaster->Show();
mpMasterSlide->Enable();
+ populateMasterSlideDropdown();
mpDspMasterBackground->Enable();
mpDspMasterObjects->Enable();
mpFillStyle->Show();