diff options
| author | mert <mert.tumer@collabora.com> | 2021-02-04 10:37:03 +0300 |
|---|---|---|
| committer | Mert Tumer <mert.tumer@collabora.com> | 2021-02-24 08:33:18 +0100 |
| commit | 08b25904e81a1b532fe889f53fc1f1909f4b1f06 (patch) | |
| tree | 54b5cfb9c8e3161013ba4fdd38b26db01f9a3e52 | |
| parent | 3c4a9d6d31829bd826d96126554e60687a3e36c2 (diff) | |
LOK: disable rotation mode on selection of shape
Change-Id: Iff0ed673ae1c61ff0d753cf3a1f871213f8b3a7d
Signed-off-by: mert <mert.tumer@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110399
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
| -rw-r--r-- | sd/source/ui/func/fuconstr.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/func/fusel.cxx | 1 |
2 files changed, 5 insertions, 2 deletions
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) |