summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2021-01-26 11:17:40 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2021-01-26 13:47:36 +0100
commit6476f82aaf7ca6eabdc89ccb9aaca32e89335cff (patch)
treed236b1ec2a3dd8b86412f609ac243aab83b7f17e
parent7c1dd1001798092248b22ed392b12b6c271a831f (diff)
Revert "LOK: allow slide switching in mobile even if it is same slide"
This reverts commit 6693717155cc3f4ab998c5b77b839bb72cbc7236. The reverted commit lead to shape deselection by view switch. Change-Id: I51867e60f0e9e495e2ccf54016d181f4049ad520 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109936 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109949
-rw-r--r--sd/source/ui/view/drviews1.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 05c7b43d777e..d853f8edb4ac 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -33,7 +33,6 @@
#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>
@@ -932,8 +931,7 @@ 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()
- && SfxLokHelper::getDeviceFormFactor() != LOKDeviceFormFactor::MOBILE)
+ && maTabControl->GetPageText(maTabControl->GetPageId(nSelectedPage)) == pNewPage->GetName())
{
// this slide is already visible
return true;