[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/source

[Pranam Lashkari (via logerrit)]

 sd/source/ui/view/drviews1.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6693717155cc3f4ab998c5b77b839bb72cbc7236
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Wed Aug 26 22:50:56 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 9 12:00:17 2020 +0200

    LOK: allow slide switching in mobile even if it is same slide
    
    problem:
    In the mobile view taping on the selected slide preview would open the wizard
    but when some object is selected on the slide
    wizard would open for that object
    this patch helps us to set the Page as selection and as result
    mobile wizard opens for the slide even when some object on slide is selected
    
    Change-Id: I99cbece8b18ec8766956157c0231e5a0f600d993
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101423
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 3a370de8b33b..bedad6f183e5 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -30,6 +30,7 @@
 #include <svx/svdpagv.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
+#include <sfx2/lokhelper.hxx>
 #include <svx/svdoole2.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/module.hxx>
@@ -913,7 +914,8 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
                     SdPage* pCurrentPage = pPV ? dynamic_cast<SdPage*>(pPV->GetPage()) : nullptr;
                     if (pCurrentPage
                         && pNewPage == pCurrentPage
-                        && maTabControl->GetPageText(maTabControl->GetPageId(nSelectedPage)) == pNewPage->GetName())
+                        && maTabControl->GetPageText(maTabControl->GetPageId(nSelectedPage)) == pNewPage->GetName()
+                        && SfxLokHelper::getDeviceFormFactor() != LOKDeviceFormFactor::MOBILE)
                     {
                         // this slide is already visible
                         return true;