sd/source/ui/func/fuconstr.cxx | 6 ++++--
sd/source/ui/func/fusel.cxx | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5a42461bff290d19309e0109b54a7f63cd06c40d
Author: mert <mert.tu...@collabora.com>
AuthorDate: Thu Feb 4 10:37:03 2021 +0300
Commit: Mert Tumer <mert.tu...@collabora.com>
CommitDate: Mon Mar 1 13:30:22 2021 +0100
LOK: disable rotation mode on selection of shape
Change-Id: Iff0ed673ae1c61ff0d753cf3a1f871213f8b3a7d
Signed-off-by: mert <mert.tu...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110399
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111509
Tested-by: Jenkins
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 7bf915055b4b..ca248d808840 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -39,6 +39,7 @@
#include <sdpage.hxx>
#include <sdresid.hxx>
#include <glob.hxx>
+#include <comphelper/lok.hxx>
using namespace com::sun::star;
@@ -187,9 +188,10 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
pSingleObj =
mpView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
}
- if (mpView->GetDragMode() == SdrDragMode::Move &&
mpView->IsRotateAllowed() &&
+ const bool bTiledRendering =
comphelper::LibreOfficeKit::isActive();
+ if (!bTiledRendering && (mpView->GetDragMode() ==
SdrDragMode::Move && mpView->IsRotateAllowed() &&
(mpViewShell->GetFrameView()->IsClickChangeRotation() ||
- (pSingleObj &&
pSingleObj->GetObjInventor()==SdrInventor::E3d)))
+ (pSingleObj &&
pSingleObj->GetObjInventor()==SdrInventor::E3d))))
{
mpView->SetDragMode(SdrDragMode::Rotate);
}
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index fbcd7ada5c53..138978339afb 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -707,6 +707,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
}
if (nSlotId == SID_OBJECT_SELECT
+ && !comphelper::LibreOfficeKit::isActive()
&& mpView->IsRotateAllowed()
&& (rMEvt.GetClicks() != 2)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
