sd/source/ui/view/drviews1.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 6226d29d576c87a6bea03690badb4cef18ec4a88
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Tue Jan 26 11:17:40 2021 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Tue Jan 26 14:20:19 2021 +0100
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109943
Tested-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 18b6ba8a89c9..b1105e38872f 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -30,7 +30,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 <sfx2/module.hxx>
@@ -915,8 +914,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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
