[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 2 commits - desktop/source sfx2/source sw/source

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx    |    7 ++++++-
 sfx2/source/view/viewsh.cxx    |    1 +
 sw/source/core/crsr/viscrs.cxx |    7 +++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 5bd14dff1d20250f52c23a11f8f54da639c072a1
Author:     Mert Tumer <mert.tu...@collabora.com>
AuthorDate: Fri Feb 25 13:05:28 2022 +0300
Commit:     Mert Tumer <mert.tu...@collabora.com>
CommitDate: Mon Mar 14 11:46:25 2022 +0100

    dont send text selection start/end when there is no selection
    
    when there is no selection, startrect and endrect get the
    cursor coordinates, we should not send it. Otherwise this
    causes selection handles to appear on online
    
    Signed-off-by: Mert Tumer <mert.tu...@collabora.com>
    Change-Id: I4402e04d4a16a1f840499c57421fd01caf43f116
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130525
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131522

diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 26e43813575d..0501162a2a16 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -521,6 +521,13 @@ OString SwSelPaintRects::getLOKPayload( int nType, int 
nViewId, bool* ignore ) c
             SwRect aEndRect;
             FillStartEnd(aStartRect, aEndRect);
 
+            // no selection rect
+            if (!size())
+            {
+                *ignore = true;
+                return OString();
+            }
+
             if( nType == LOK_CALLBACK_TEXT_SELECTION_START )
             {
                 if (aStartRect.HasArea())
commit 318e2b0e8dc7901271a121b8fd11e89cbc65d335
Author:     Mert Tumer <mert.tu...@collabora.com>
AuthorDate: Mon Jan 10 13:23:03 2022 +0300
Commit:     Mert Tumer <mert.tu...@collabora.com>
CommitDate: Mon Mar 14 11:46:14 2022 +0100

    lok: Fix freshly added comments are not displayed
    
    Signed-off-by: Mert Tumer <mert.tu...@collabora.com>
    Change-Id: Ice772eff8b9f8ae8c23ec1e66675e33a80492028
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128217
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131521

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9720a7a78967..183578df411a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1484,13 +1484,18 @@ void CallbackFlushHandler::queue(const int type, 
CallbackData& aCallbackData)
     SAL_INFO("lok", "Queue: [" << type << "]: [" << aCallbackData.getPayload() 
<< "] on " << m_queue1.size() << " entries.");
 
     bool bIsChartActive = false;
+    bool bIsComment = false;
     if (type == LOK_CALLBACK_GRAPHIC_SELECTION)
     {
         LokChartHelper aChartHelper(SfxViewShell::Current());
         bIsChartActive = aChartHelper.GetWindow() != nullptr;
     }
+    else if (type == LOK_CALLBACK_COMMENT)
+    {
+        bIsComment = true;
+    }
 
-    if (callbacksDisabled() && !bIsChartActive)
+    if (callbacksDisabled() && !bIsChartActive && !bIsComment)
     {
         // We drop notifications when this is set, except for important ones.
         // When we issue a complex command (such as .uno:InsertAnnotation)
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index f4ec9b29b0a1..cbb3749ec737 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1447,6 +1447,7 @@ static bool ignoreLibreOfficeKitViewCallback(int nType, 
const SfxViewShell_Impl*
         {
         case LOK_CALLBACK_FORM_FIELD_BUTTON:
         case LOK_CALLBACK_TEXT_SELECTION:
+        case LOK_CALLBACK_COMMENT:
             break;
         default:
             // Reject e.g. invalidate during paint.