core.git: Branch 'distro/collabora/co-24.04' - desktop/source

[Andras Timar (via logerrit)]

 desktop/source/lib/init.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bdb0dd485da24a95b61df6136362ab189803bc27
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Oct 17 16:46:51 2024 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Oct 18 08:52:49 2024 +0200

    Prevent 'Failed to dispatch .uno:None' message
    
    This was seen when checking grammar checker suggestion.
    When I click on the top element of the context menu of
    underlined text (e.g. Grammar error), I get
    
    warn:lok:1663798:1663791:desktop/source/lib/init.cxx:283:
    lok exception 'Failed to dispatch .uno:None'
    
    This .uno:None was introduced by Tamas Zolnai especially for
    LOK: 3616bb68f247735c46c1a4cd9568775e77be6441
    His intention was to add an empty command that does nothing.
    
    Change-Id: I12a9a1e17dcf65cdd78266f44e6201ed3d5fa01f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175102
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7d13a476a3f1..62842df51cf8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5383,6 +5383,9 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
     if (!isCommandAllowed(aCommand))
         return;
 
+    if (gImpl && aCommand == ".uno:None")
+        return;
+
     LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis);
 
     std::vector<beans::PropertyValue> 
aPropertyValuesVector(jsonToPropertyValuesVector(pArguments));