summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2015-12-03 15:48:40 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-12-15 15:06:55 +0000
commitedc742e4975024dd28d3b8e0c900bbe1b466d08e (patch)
treef5f71aedfc0cccd15c83cfa61bbfbb3f9271cbf1
parent4b4e78d6bec6e4cf4d9fc5afdf8604f034fc0b82 (diff)
Some WebDAV server answer without 'DAV:' XML namespace.
The call to assert() is not appropriate, better use a SAL_WARN_IF instead. The call to DAVProperties::createUCBPropName() method immediately after will take care of the missing namespace. The change to assert() was introduced in commit dd9c15b36f69bec4d4fc9b0049f7e496e5eb9e9d In libreoffice-5-1 branch it was introduced in commit 0ee79446c8c6daa8426eb2948b6e607b14e50059 Change-Id: Ib9b85426fc84907fb12f70759a189cedcf117b3a Reviewed-on: https://gerrit.libreoffice.org/20380 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 9b9329e479615194dda0288d699263412e5c4f1d) Reviewed-on: https://gerrit.libreoffice.org/20711 Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
index 33ff51a6339a..ca73cd21d809 100644
--- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
@@ -109,7 +109,7 @@ extern "C" int NPFR_propfind_iter( void* userdata,
DAVPropertyValue thePropertyValue;
thePropertyValue.IsCaseSensitive = true;
- assert( pname->nspace && "NPFR_propfind_iter - No namespace!" );
+ SAL_WARN_IF( !pname->nspace, "ucb.ucp.webdav", "NPFR_propfind_iter - No XML namespace!" );
DAVProperties::createUCBPropName( pname->nspace,
pname->name,