summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2017-10-02 22:02:55 +0200
committerKatarina Behrens <Katarina.Behrens@cib.de>2017-10-03 22:35:03 +0200
commit6f581504b77cf780898ffb568a66d4aa86df1c73 (patch)
tree058196160f491d90a332428538a059572cad7f27
parent20db1be102731059e43ec5b3c2ae80039621f887 (diff)
tdf#109100: Hide margine control in Impress
Change-Id: I6f3453ce309d70f444063f17b3109cc91a50823f Reviewed-on: https://gerrit.libreoffice.org/43056 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx63
1 files changed, 34 insertions, 29 deletions
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index fcd11edcb44e..f98e5bed6894 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -228,36 +228,41 @@ void SlideBackground::HandleContextChange(
return;
maContext = rContext;
- if ( maContext == maImpressMasterContext )
+ if ( IsImpress() )
{
- mpCloseMaster->Show();
- mpEditMaster->Hide();
- mpMasterSlide->Disable();
- mpDspMasterBackground->Disable();
- mpDspMasterObjects->Disable();
- mpFillStyle->Show();
- mpBackgroundLabel->Show();
- mpInsertImage->Show();
- }
- else if ( maContext == maImpressHandoutContext )
- {
- mpFillStyle->Hide();
- mpFillLB->Hide();
- mpFillAttr->Hide();
- mpFillGrad->Hide();
- mpBackgroundLabel->Hide();
- mpInsertImage->Hide();
- }
- else if (maContext == maImpressOtherContext )
- {
- mpCloseMaster->Hide();
- mpEditMaster->Show();
- mpMasterSlide->Enable();
- mpDspMasterBackground->Enable();
- mpDspMasterObjects->Enable();
- mpFillStyle->Show();
- mpBackgroundLabel->Show();
- mpInsertImage->Show();
+ mpMarginSelectBox->Hide();
+
+ if ( maContext == maImpressMasterContext )
+ {
+ mpCloseMaster->Show();
+ mpEditMaster->Hide();
+ mpMasterSlide->Disable();
+ mpDspMasterBackground->Disable();
+ mpDspMasterObjects->Disable();
+ mpFillStyle->Show();
+ mpBackgroundLabel->Show();
+ mpInsertImage->Show();
+ }
+ else if ( maContext == maImpressHandoutContext )
+ {
+ mpFillStyle->Hide();
+ mpFillLB->Hide();
+ mpFillAttr->Hide();
+ mpFillGrad->Hide();
+ mpBackgroundLabel->Hide();
+ mpInsertImage->Hide();
+ }
+ else if (maContext == maImpressOtherContext )
+ {
+ mpCloseMaster->Hide();
+ mpEditMaster->Show();
+ mpMasterSlide->Enable();
+ mpDspMasterBackground->Enable();
+ mpDspMasterObjects->Enable();
+ mpFillStyle->Show();
+ mpBackgroundLabel->Show();
+ mpInsertImage->Show();
+ }
}
// else Draw or something else, do nothing
}