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

[Mike Kaganski (via logerrit)]

 sd/source/ui/view/ViewShellBase.cxx |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 1fdfb512290d1a79e55ae5629725ae15be0a2999
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jun 16 12:46:54 2024 +0500
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jun 17 09:49:12 2024 +0200

    LOK: differentiate page kinds in sd::ViewShellBase::getEditMode
    
    E.g., sending a LOK_CALLBACK_GRAPHIC_VIEW_SELECTION payload, the
    "mode" must be different for notes view and for normal view.
    
    Change-Id: I1f328290087f3185b7bef69560b28df6adb82e90
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168917
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 4ff2e148fa25933e64b7bbecbcd3ed551ad686ab)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168934
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sd/source/ui/view/ViewShellBase.cxx 
b/sd/source/ui/view/ViewShellBase.cxx
index e73bdee1841f..cb64d10411b1 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -991,9 +991,25 @@ int ViewShellBase::getEditMode() const
         switch ( pDrawViewShell->GetEditMode() )
         {
         case EditMode::Page:
-            return 0;
+            switch (pDrawViewShell->GetPageKind())
+            {
+                case PageKind::Standard:
+                    return 0;
+                case PageKind::Notes:
+                    return 2;
+                default:
+                    assert(!"Unhandled page kind");
+                    return 0;
+            }
         case EditMode::MasterPage:
-            return 1;
+            switch (pDrawViewShell->GetPageKind())
+            {
+                case PageKind::Standard:
+                    return 1;
+                default:
+                    assert(!"Unhandled page kind");
+                    return 1;
+            }
         }
     }