diff options
| author | mert <mert.tumer@collabora.com> | 2021-02-04 10:37:03 +0300 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2021-04-09 17:42:28 +0100 |
| commit | 5874a2fbad9dc873ccaa671333b461f793c586ca (patch) | |
| tree | 8416df74ed6b4840445284801103d4c0cc473cf0 | |
| parent | 078736fff53d9bac951a4046b4ecebdaf98e694f (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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111509
Tested-by: Jenkins
| -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 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 904696bb063a..30ef0e9bf9a4 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) |