[Libreoffice-commits] online.git: loolwsd/DocumentStoreManager.hpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Mon Mar 14 03:02:40 UTC 2016


 loolwsd/DocumentStoreManager.hpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e014b0b22fb2f1bb75f74121dba335ae92a40ce6
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri Mar 11 11:26:19 2016 -0500

    loolwsd: Storage passed to DocumentStoreManager
    
    Change-Id: Ifa7787dea5f558f166d02467c253375df88ae408
    Reviewed-on: https://gerrit.libreoffice.org/23207
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/DocumentStoreManager.hpp b/loolwsd/DocumentStoreManager.hpp
index 9369730..d8fca30 100644
--- a/loolwsd/DocumentStoreManager.hpp
+++ b/loolwsd/DocumentStoreManager.hpp
@@ -113,7 +113,7 @@ public:
             uriJailed = Poco::URI(Poco::URI("file://"), localPath);
         }
 
-        auto document = std::shared_ptr<DocumentStoreManager>(new DocumentStoreManager(uriPublic, uriJailed, childId, std::move(storage)));
+        auto document = std::shared_ptr<DocumentStoreManager>(new DocumentStoreManager(uriPublic, uriJailed, childId, storage));
 
         return document;
     }
@@ -125,6 +125,7 @@ public:
 
     bool save()
     {
+        assert(_storage);
         return _storage->saveLocalFileToStorage();
     }
 
@@ -136,7 +137,7 @@ private:
     DocumentStoreManager(const Poco::URI& uriPublic,
                          const Poco::URI& uriJailed,
                          const std::string& jailId,
-                         std::unique_ptr<StorageBase> storage) :
+                         std::unique_ptr<StorageBase>& storage) :
        _uriPublic(uriPublic),
        _uriJailed(uriJailed),
        _jailId(jailId),


More information about the Libreoffice-commits mailing list