[Libreoffice-commits] online.git: common/MessageQueue.cpp

[Gabriel Masei (via logerrit)]

 common/MessageQueue.cpp |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 95c9c58f5b3f8116aef348f48ce4583df59718a2
Author:     Gabriel Masei <gabriel.masei at 1and1.ro>
AuthorDate: Mon Sep 21 09:46:38 2020 +0300
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Sep 21 14:51:10 2020 +0200

    remove .uno:ModifiedStatus message from deduplication mechanism
    
    This fixes the following issue in Online:
    
    When a save is performed while a cell is still edited the save icon
    does not reflect the correct state of the document: it shows that
    the document is dirty although it is not.
    
    This works only in conjunction with the following commit from core:
    -lok: remove .uno:ModifiedStatus message from deduplication mechanism-
    
    Change-Id: Ie671097ef2b206c8801a5bdfc2b908ee260951fb
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103084
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index f239a2e9c..632c696b3 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -324,6 +324,11 @@ std::string TileQueue::removeCallbackDuplicate(const std::string& callbackMsg)
             if (unoCommand.empty())
                 return std::string();
 
+            // This is needed because otherwise it creates some problems when
+            // a save occurs while a cell is still edited in Calc.
+            if (unoCommand == ".uno:ModifiedStatus")
+                return std::string();
+
             // remove obsolete states of the same .uno: command
             for (std::size_t i = 0; i < getQueue().size(); ++i)
             {