diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-09-23 09:08:20 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-10-07 18:52:03 +0200 |
| commit | fee3bc725bffe4fe6970a3ec5eaf5efdcd53285c (patch) | |
| tree | 1d0ae39d5b716f4785b0b57fbc8bebaf33db530a | |
| parent | 97cf7321e0cddae4570c6ec4c5fb5b55764c26fa (diff) | |
svx: move LOKit specifics into it's own method
Change-Id: I87f04d460d88c902426e881c03701b95414207d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123217
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
| -rw-r--r-- | include/svx/svdmrkv.hxx | 1 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 58f38d594c89..9b33b07c3a22 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -153,6 +153,7 @@ protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; virtual void ModelHasChanged() override; // Is called by the PaintView virtual void SetMarkHandles(SfxViewShell* pOtherShell); // maHdlList - fill (List of handles) + void modelHasChangedLOKit(); void SetMarkRects(); // Rects at the PageViews void CheckMarked(); // Scan MarkList after Del and Lock Layer ... void AddDragModeHdl(SdrDragMode eMode); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 7334b82324aa..9c39166d5bf1 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -229,7 +229,13 @@ void SdrMarkView::ModelHasChanged() AdjustMarkHdl(); } - if (!(comphelper::LibreOfficeKit::isActive() && GetMarkedObjectCount() > 0)) + if (comphelper::LibreOfficeKit::isActive()) + modelHasChangedLOKit(); +} + +void SdrMarkView::modelHasChangedLOKit() +{ + if (GetMarkedObjectCount() <= 0) return; //TODO: Is MarkedObjRect valid at this point? @@ -269,11 +275,10 @@ void SdrMarkView::ModelHasChanged() pResultSelection = &aSelection; } - if(SfxViewShell* pViewShell = GetSfxViewShell()) + if (SfxViewShell* pViewShell = GetSfxViewShell()) SfxLokHelper::notifyInvalidation(pViewShell, pResultSelection); } - bool SdrMarkView::IsAction() const { return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); |