[Libreoffice-commits] core.git: sd/source

[Szymon Kłos (via logerrit)]

 sd/source/ui/view/drviews1.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2dd51938908b9856bd1ad4b252cd60805262baa5
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Nov 15 16:49:15 2022 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Sat Nov 19 16:44:21 2022 +0100

    lok: masterpage: don't switch page on mode change
    
    Go back to the last used page when closing MasterPage.
    There was a bug when one user was in MasterPage mode and
    other switched page - then on close we opened other user
    page.
    
    Change-Id: I02f3b36429a62b855b215803d6684b3382228326
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142740
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Ashod Nakashian <a...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142967
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 64440617e611..da00680667ce 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -409,7 +409,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool 
bIsLayerModeActive)
             OUString aPageName = pPage->GetName();
             maTabControl->InsertPage(pPage->getPageId(), aPageName);
 
-            if ( pPage->IsSelected() )
+            if ( !comphelper::LibreOfficeKit::isActive() && 
pPage->IsSelected() )
             {
                 nActualPageId = pPage->getPageId();
             }