wsd/Storage.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 34eb014e2b57e21557d1345a31f93877b212af28
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Nov 6 23:10:21 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Nov 6 23:16:43 2018 +0200
Drop the spaces from "Local Host #0" xauthor parameter
That "name" will be passed as the xauthor parameter in a message like:
child-01b9 load url=file:///.../x.odt?permission=edit
jail=file:///.../x.odt xjail=file:///.../x.odt authorid=localhost1
xauthorid=localhost1 author=Local%20Host%20#1 xauthor=Local Host #1 readonly=0
lang=en-US
and that is parsed into space-separated tokens. Which leads to warning
messages like:
WRN Unexpected doc options token [Host]. Skipping.| common/Session.cpp:94
WRN Unexpected doc options token [#1]. Skipping.| common/Session.cpp:94
So use "LocalHost#0" etc instead.
Change-Id: I01ce8c4fb8309a7a9d3395e4fd874e469475d44c
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 3abcc12fa..a3f86e743 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -269,7 +269,7 @@ std::unique_ptr<LocalStorage::LocalFileInfo>
LocalStorage::getLocalFileInfo()
_fileInfo = FileInfo({filename, "localhost", lastModified, size});
// Set automatic userid and username
- return std::unique_ptr<LocalStorage::LocalFileInfo>(new
LocalFileInfo({"localhost" + std::to_string(LastLocalStorageId), "Local Host #"
+ std::to_string(LastLocalStorageId++)}));
+ return std::unique_ptr<LocalStorage::LocalFileInfo>(new
LocalFileInfo({"localhost" + std::to_string(LastLocalStorageId), "LocalHost#" +
std::to_string(LastLocalStorageId++)}));
}
std::string LocalStorage::loadStorageFileToLocal(const Authorization& /*auth*/)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
