wsd/Storage.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 302f892d97f0f4b12e0994dec89b75b7d52ee2c6
Author: Pranav Kant <[email protected]>
Date: Tue Aug 22 19:49:20 2017 +0530
wsd: Do not throw when cannot save local file out of jail
Change-Id: Ie155823536694facb8bfcfe49f6386a7fc845689
(cherry picked from commit da4fe86b829a06c128e637c5fab34f16402d2956)
Reviewed-on: https://gerrit.libreoffice.org/49005
Reviewed-by: Samuel Mehrbrodt <[email protected]>
Tested-by: Samuel Mehrbrodt <[email protected]>
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index f3bbce3c..e24a31a5 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -297,7 +297,7 @@ StorageBase::SaveResult
LocalStorage::saveLocalFileToStorage(const std::string&
{
LOG_ERR("copyTo(\"" << _jailedFilePath << "\", \"" << _uri.getPath() <<
"\") failed: " << exc.displayText());
- throw;
+ return StorageBase::SaveResult::FAILED;
}
return StorageBase::SaveResult::OK;
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
