diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2021-01-26 11:17:40 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2021-01-26 14:20:19 +0100 |
| commit | 6226d29d576c87a6bea03690badb4cef18ec4a88 (patch) | |
| tree | 8416ecf7c5014dfef3cbf308383ddbe73ccabdae /sd/source | |
| parent | c87723180ccfe11e63823ff8f17d9370d98188f8 (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/+/109943
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
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; |