kit/ChildSession.cpp | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 684d7302219752cbbb03e7df45a3765c9166a0d1
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Mar 26 17:36:15 2018 +0200
ChildSession: use NoFileSync as default during convert-to as well
This already worked for normal save, but not for convert-to.
Depends on core.git commit 0518bb5c3a98d973c3675fdd4cb8c52a669a3507
(desktop lok: handle NoFileSync in saveAs(), 2018-03-26).
Change-Id: Iec1a92fba2094f3954cc1a4ed6ee3372076fddc5
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 6a10dca89..cb85e9ba4 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1172,6 +1172,10 @@ bool ChildSession::saveAs(const char* /*buffer*/, int
/*length*/, const std::vec
getLOKitDocument()->setView(_viewId);
+ if (filterOptions.empty())
+ // Save and no arguments, provide our default.
+ filterOptions = "NoFileSync";
+
LOG_DBG("Calling LOK's saveAs with: '" << url.c_str() << "', '" <<
(format.size() == 0 ? "(nullptr)" : format.c_str()) << "', '"
<<
(filterOptions.size() == 0 ? "(nullptr)" :
filterOptions.c_str()) << "'.");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
