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

[Libreoffice Gerrit user]

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

New commits:
commit 832c9836e4fb649cf6860aadced35ae6def0adf5
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Mon Nov 19 14:28:57 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 21 13:45:10 2018 +0100

    tdf#117108: do not show the master view button after updating the sidebar
    
    Change-Id: I3e6af9c2a555599e4aa288b8d6e99b43b09d35a6
    Reviewed-on: https://gerrit.libreoffice.org/63570
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 60e6593f042e3e2869ece89cc43390b3254b3205)
    Reviewed-on: https://gerrit.libreoffice.org/63697
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 930423a170a9..f3ba7365cbfe 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -283,6 +283,7 @@ void SlideBackground::HandleContextChange(
 
         if (maContext == maDrawOtherContext)
         {
+            mpEditMaster->Hide();
             mpFillStyle->Show();
             mpBackgroundLabel->Show();
         }