Kaydet (Commit) c57f10b6 authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Xisco Faulí

tdf#111306: Hide background widget in sidebar in master and notes view

Background is lost if it's changed from the sidebar in master or
notes view, thus hide the widget for now, until the real issue is fixed.

Keep the insert image button visible as it works.

The background can be changed from the page properties dialog

Change-Id: Ic3f6116cb0997024096343cb20ec40ac07307918
Reviewed-on: https://gerrit.libreoffice.org/57440
Tested-by: Jenkins
Reviewed-by: 's avatarXisco Faulí <xiscofauli@libreoffice.org>
üst 228b9801
......@@ -244,11 +244,11 @@ void SlideBackground::HandleContextChange(
mpMasterSlide->Disable();
mpDspMasterBackground->Disable();
mpDspMasterObjects->Disable();
mpFillStyle->Show();
mpBackgroundLabel->Show();
mpFillStyle->Hide();
mpBackgroundLabel->Hide();
mpInsertImage->Show();
}
else if ( maContext == maImpressHandoutContext )
else if ( maContext == maImpressHandoutContext || maContext == maImpressNotesContext )
{
mpCloseMaster->Hide();
mpEditMaster->Hide();
......@@ -270,17 +270,7 @@ void SlideBackground::HandleContextChange(
mpBackgroundLabel->Show();
mpInsertImage->Show();
}
else if (maContext == maImpressNotesContext)
{
mpCloseMaster->Hide();
mpEditMaster->Hide();
mpMasterSlide->Disable();
mpDspMasterBackground->Disable();
mpDspMasterObjects->Disable();
mpFillStyle->Show();
mpBackgroundLabel->Show();
mpInsertImage->Hide();
}
// Need to do a relayouting, otherwise the panel size is not updated after show / hide controls
sfx2::sidebar::Panel* pPanel = dynamic_cast<sfx2::sidebar::Panel*>(GetParent());
if(pPanel)
......@@ -296,7 +286,7 @@ void SlideBackground::Update()
{
eFillStyle nPos = static_cast<eFillStyle>(mpFillStyle->GetSelectedEntryPos());
if(maContext == maImpressHandoutContext)
if(maContext != maImpressOtherContext)
nPos = NONE;
SfxObjectShell* pSh = SfxObjectShell::Current();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment