[Libreoffice-commits] core.git: sd/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Sep 23 12:14:41 UTC 2018
sd/source/ui/sidebar/SlideBackground.cxx | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 14ce6a88e3fc299af1f643edfc2230ace5d614c1
Author: Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Sun Sep 23 11:37:33 2018 +0200
Commit: Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Sun Sep 23 14:12:21 2018 +0200
ŧdf#120069: Do not crash changing background color in draw
Regression from c57f10b67fceef47d304d74dce93be7389a7720c,
where I disabled the master background in Impress but not in Draw,
and both share some common code.
Besides, disable master background in draw as well. Follow-up of bug
tdf#111306
Change-Id: I772382b5ed8eff3a35d001ea498810613137d172
Reviewed-on: https://gerrit.libreoffice.org/60913
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index f4e4d045e174..b3b54bfde71d 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -279,6 +279,17 @@ void SlideBackground::HandleContextChange(
else if ( IsDraw() )
{
mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_LABEL));
+
+ if (maContext == maDrawOtherContext)
+ {
+ mpFillStyle->Show();
+ mpBackgroundLabel->Show();
+ }
+ else if (maContext == maDrawMasterContext)
+ {
+ mpFillStyle->Hide();
+ mpBackgroundLabel->Hide();
+ }
}
}
@@ -286,7 +297,7 @@ void SlideBackground::Update()
{
eFillStyle nPos = static_cast<eFillStyle>(mpFillStyle->GetSelectedEntryPos());
- if(maContext != maImpressOtherContext)
+ if(maContext != maImpressOtherContext && maContext != maDrawOtherContext)
nPos = NONE;
SfxObjectShell* pSh = SfxObjectShell::Current();
More information about the Libreoffice-commits
mailing list