commit bdfc0056c12452bae2bfe7b05547cf3f13ca4241
author Andre Fischer <af@apache.org> Mon May 13 13:34:46 2013 +0000
committer Michael Meeks <michael.meeks@suse.com> Mon May 20 11:33:33 2013 +0100
tree 6f7560f1a0522d2d576a4aa7c70ce1f6d56a534b
parent 4e023d28bd914ef6ed32c7daa08b098618157089

Resolves: #i122275# Don't show the layout panel for master pages

(cherry picked from commit 7fe1777ad29d92d16fbc11b7279375d37d11cef8)

Conflicts:
	sd/source/ui/view/drviewsa.cxx

Change-Id: I37bb08e08bd8537e692cf60f415ed40f9cf5abc5

sd/source/ui/view/drviews1.cxx

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index faf114f..552f61b 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -458,6 +458,11 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
        Invalidate( SID_TITLE_MASTERPAGE );
        Invalidate( SID_NOTES_MASTERPAGE );
        Invalidate( SID_HANDOUT_MASTERPAGE );

        if (meEditMode == EM_PAGE)
            SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
        else
            SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
    }
}

sd/source/ui/view/drviewsa.cxx

diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index a747165..a580d60 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -137,7 +137,10 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas

    mpSelectionChangeHandler->Connect();

    SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
    if (mpFrameView->GetViewShEditMode(mePageKind) == EM_PAGE)
        SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
    else
        SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));

    doShow();
}