[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/source

[mert (via logerrit)]

 sd/source/ui/func/fuconstr.cxx |    6 ++++--
 sd/source/ui/func/fusel.cxx    |    1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 08b25904e81a1b532fe889f53fc1f1909f4b1f06
Author:     mert <mert.tumer at collabora.com>
AuthorDate: Thu Feb 4 10:37:03 2021 +0300
Commit:     Mert Tumer <mert.tumer at collabora.com>
CommitDate: Wed Feb 24 08:33:18 2021 +0100

    LOK: disable rotation mode on selection of shape
    
    Change-Id: Iff0ed673ae1c61ff0d753cf3a1f871213f8b3a7d
    Signed-off-by: mert <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110399
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index e4eb8b3eda5f..23cbd65c00f1 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 baa6c6b9e3ad..0cb6e6c36c22 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)