If user permits, save to storage force-fully in case of doc conflict

There is one known problem still - after any user decides to overwrite
the file to storage, other users are not informed, so their dialog keeps
hanging on the screen until they press the cancel or reload button.

Change-Id: I6dad1585e4c53eeed79cd38316892a7f239d44ef

1 files changed, 3 insertions, 3 deletions

diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index bb25a2d7e..60c732757 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -78,7 +78,7 @@ public:
         _jailPath(jailPath),
         _fileInfo("", "lool", Poco::Timestamp::fromEpochTime(0), 0),
         _isLoaded(false),
-        _forceOverwrite(false)
+        _forceSave(false)
     {
         LOG_DBG("Storage ctor: " << uri.toString());
     }
@@ -92,7 +92,7 @@ public:
 
     /// Asks the storage object to force overwrite to storage upon next save
     /// even if document turned out to be changed in storage
-    void forceOverwrite() { _forceOverwrite = true; }
+    void forceSave() { _forceSave = true; }
 
     /// Returns the basic information about the file.
     FileInfo getFileInfo() { return _fileInfo; }
@@ -125,7 +125,7 @@ protected:
     std::string _jailedFilePath;
     FileInfo _fileInfo;
     bool _isLoaded;
-    bool _forceOverwrite;
+    bool _forceSave;
 
     static bool FilesystemEnabled;
     static bool WopiEnabled;