summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranam Lashkari <lpranam@collabora.com>2020-08-26 22:50:56 +0530
committerAndras Timar <andras.timar@collabora.com>2020-09-02 10:18:20 +0200
commit0629280e4811e8c85eae8b00a3827102cf9110bd (patch)
tree38fbe0b949d27bee5163dc4acbafdec7857f1af2
parentf6c4bfb4a7403c5283f33f5c04f62bb4ef32bf80 (diff)
LOK: allow slide switching in mobile even if it is same slideco-6.2-23
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/+/101364 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--sd/source/ui/view/drviews1.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index d853f8edb4ac..05c7b43d777e 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -33,6 +33,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 <vcl/scrbar.hxx>
@@ -931,7 +932,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;