summaryrefslogtreecommitdiff
path: root/ucb/source/ucp
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-11-13 08:13:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-11-13 08:13:00 +0100
commitca0308797df86ebece19260f3ca438a0cb437208 (patch)
tree07a4cc5a71085a07ac0199c62d82d6b1c60903ab /ucb/source/ucp
parentb7d0b49f5708b55e24aabb719e26ce5ec8628161 (diff)
tdf#121337: Fail on GIO error in GIO UCP getPropertyValue
Change-Id: I10ffe50be56ed99539f59f043a710863652d2394
Diffstat (limited to 'ucb/source/ucp')
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx7
1 files changed, 6 insertions, 1 deletions
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);
}