[Libreoffice-commits] core.git: include/svx svx/source

[Tomaž Vajngerl (via logerrit)]

 include/svx/svdmrkv.hxx       |    1 +
 svx/source/svdraw/svdmrkv.cxx |   11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit fee3bc725bffe4fe6970a3ec5eaf5efdcd53285c
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Sep 23 09:08:20 2021 +0200
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Oct 7 18:52:03 2021 +0200

    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 at gmail.com>

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();