.gitreview | 2 +-
kit/ChildSession.cpp | 19 ++++++++++++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 3a8f847811c24a9d4b73a515b0506732d9bc5c6c
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Jan 16 09:06:49 2018 +0100
kit: use NoFileSync flag for save
What LibreOffice sees as a save destination is just a temporary output
from the outside, so there is no point in doing fsync for that file.
This depends on core.git e90a16d71cdcfbd785401613a2e5a29cb1167acf (sfx2
store: handle NoFileSync for Save (not SaveAs), 2018-01-15).
(cherry picked from commit d0d87401c14aeedcded192680f05080c3dc08591)
Change-Id: I38774d7b3b0dd8e0d3135ace279db88e34bbd2ff
Reviewed-on: https://gerrit.libreoffice.org/47981
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/.gitreview b/.gitreview
index fc87636e..944e4275 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
port=29418
project=online
defaultremote=logerrit
-defaultbranch=master
+defaultbranch=distro/collabora/collabora-online-3-0
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 530c5d98..310ca95e 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -917,8 +917,25 @@ bool ChildSession::unoCommand(const char* /*buffer*/, int
/*length*/, const std:
}
else
{
+ std::string arguments;
+ if (tokens[1] == ".uno:Save" && tokens[2] == "{}")
+ {
+ // Save and no arguments, provide our default.
+ std::ostringstream oss;
+ oss << "{"
+ << "\"NoFileSync\":"
+ << "{"
+ << "\"type\":\"boolean\","
+ << "\"value\":true"
+ << "}"
+ << "}";
+ arguments = oss.str();
+ }
+ else
+ arguments = Poco::cat(std::string(" "), tokens.begin() + 2,
tokens.end());
+
getLOKitDocument()->postUnoCommand(tokens[1].c_str(),
- Poco::cat(std::string(" "),
tokens.begin() + 2, tokens.end()).c_str(),
+ arguments.c_str(),
bNotify);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
