svx/source/svdraw/svdmrkv.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
New commits: commit 9a65f2086082cbb35016b7b83e008f7b5cc3cd54 Author: Michael Meeks <[email protected]> AuthorDate: Fri Jan 24 16:42:48 2020 +0100 Commit: Michael Meeks <[email protected]> CommitDate: Tue Jan 28 22:39:46 2020 +0100 lok: create marking overlay object, but add no objects to it null mpMarkObjOverlay was used for a number of other reasons. Change-Id: I0681d9c544f0cd3f93e991eb048b97bd58f94787 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87409 Tested-by: Jenkins Reviewed-by: Michael Meeks <[email protected]> diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index bcc048b8a788..acba9103244a 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -96,6 +96,9 @@ ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx: : maSecondPosition(rStartPos), mbUnmarking(bUnmarking) { + if (comphelper::LibreOfficeKit::isActive()) + return; // We do client-side object manipulation with the Kit API + for(sal_uInt32 a(0); a < rView.PaintWindowCount(); a++) { SdrPaintWindow* pCandidate = rView.GetPaintWindow(a); @@ -358,12 +361,8 @@ void SdrMarkView::BegMarkObj(const Point& rPnt, bool bUnmark) DBG_ASSERT(nullptr == mpMarkObjOverlay, "SdrMarkView::BegMarkObj: There exists a mpMarkObjOverlay (!)"); - // We do client-side object manipulation with the Kit API - if (!comphelper::LibreOfficeKit::isActive()) - { - basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y()); - mpMarkObjOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark); - } + basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y()); + mpMarkObjOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark); maDragStat.Reset(rPnt); maDragStat.NextPoint(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
