[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

[Aron Budea]

 sd/source/ui/sidebar/SlideBackground.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 4eeb0f5a76a6e9190fd1db457042720c10ef804a
Author: Aron Budea <aron.budea at collabora.com>
Date:   Fri Dec 22 13:26:49 2017 +0100

    tdf#109100: Hide label for margin control in Impress
    
    Change-Id: Ib61656913df673ebfde61e2c921f84cb81195a3b
    Reviewed-on: https://gerrit.libreoffice.org/46974
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 88f6ffeb9e0c0b942c2b0bc9d60af7bb7a6caaf8)
    Reviewed-on: https://gerrit.libreoffice.org/47119
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 9c94a208b2cb..76da35ddd0b0 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -240,7 +240,13 @@ void SlideBackground::HandleContextChange(
     if ( IsImpress() )
     {
         mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
+
+        // margin selector is only for Draw
         mpMarginSelectBox->Hide();
+        VclPtr<FixedText> pMarginLabel;
+        get(pMarginLabel, "labelmargin");
+        if ( pMarginLabel )
+            pMarginLabel->Hide();
 
         if ( maContext == maImpressMasterContext )
         {