tdf#121337: Fail on GIO error in GIO UCP getPropertyValue

Change-Id: I10ffe50be56ed99539f59f043a710863652d2394

tdf#121337: Fail on GIO error in GIO UCP getPropertyValue
Change-Id: I10ffe50be56ed99539f59f043a710863652d2394
ca030879 · Stephan Bergmann · b7d0b49f · ca030879
Kaydet (Commit) ca030879 authored Kas 13, 2018 tarafından Stephan Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

gio_content.cxx ucb/source/ucp/gio/gio_content.cxx +6 -1

No files found.
--- 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);
 }