core.git: Branch 'distro/collabora/co-24.04' - sd/source

[Mike Kaganski (via logerrit)]

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

New commits:
commit 850100640505e409be2bd9fffa5139fe04609c23
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Jun 19 18:46:45 2024 +0500
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Jun 21 15:39:52 2024 +0200

    LOK: differentiate page kinds in sd::ViewShellBase::setEditMode
    
    A follow-up to commit 4ff2e148fa25933e64b7bbecbcd3ed551ad686ab (LOK:
    differentiate page kinds in sd::ViewShellBase::getEditMode, 2024-06-16).
    
    Change-Id: Ib982c9ee45ca71445f09d56f9165bc33b43e8540
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169313
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit 319e62915b35d7129a13e069d1a4213b254ce389)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169300
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sd/source/ui/view/ViewShellBase.cxx 
b/sd/source/ui/view/ViewShellBase.cxx
index cb64d10411b1..5f7f3137cde9 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1025,11 +1025,17 @@ void ViewShellBase::setEditMode(int nMode)
         switch ( nMode )
         {
         case 0:
+            pDrawViewShell->SetPageKind(PageKind::Standard);
             pDrawViewShell->ChangeEditMode(EditMode::Page, false);
             break;
         case 1:
+            pDrawViewShell->SetPageKind(PageKind::Standard);
             pDrawViewShell->ChangeEditMode(EditMode::MasterPage, false);
             break;
+        case 2:
+            pDrawViewShell->SetPageKind(PageKind::Notes);
+            pDrawViewShell->ChangeEditMode(EditMode::Page, false);
+            break;
         }
     }
 }