ucb/source/ucp/gio/gio_content.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit ca0308797df86ebece19260f3ca438a0cb437208
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Nov 13 08:13:00 2018 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Nov 13 08:13:00 2018 +0100
tdf#121337: Fail on GIO error in GIO UCP getPropertyValue
Change-Id: I10ffe50be56ed99539f59f043a710863652d2394
diff --git a/ucb/source/ucp/gio/gio_content.cxx
b/ucb/source/ucp/gio/gio_content.cxx
index bc840e699fe5..a581c34adb2a 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -544,7 +544,12 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
const uno::Sequence< beans::Property >& rProperties,
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
{
- GFileInfo *pInfo = getGFileInfo(xEnv);
+ GError * err = nullptr;
+ GFileInfo *pInfo = getGFileInfo(xEnv, &err);
+ if (pInfo == nullptr && !mbTransient) {
+ ucbhelper::cancelCommandExecution(mapGIOError(err), xEnv);
+ }
+ assert(err == nullptr);
return getPropertyValuesFromGFileInfo(pInfo, m_xContext, xEnv,
rProperties);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
