summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorAriel Constenla-Haile <arielch@apache.org>2013-03-24 12:22:48 +0000
committerStephan Bergmann <sbergman@redhat.com>2013-08-15 16:55:24 +0200
commit424300b69a43c569dae5753db63c2ad7444d3d73 (patch)
treeaab40f692f2afc3efaf2e5193f699c5e06253b7a /ucb
parentb2dfbdff7a7436c8fc4a8d2304f573bf783b2d32 (diff)
i121945 - WebDAV ucp: return StringPair instead of NamedValue
Make css::ucb::XWebDAVCommandEnvironment::getUserRequestHeaders() return a sequence of css::beans::StringPair; this avoids all the any overhead, and is much more simple and intuitive. (cherry picked from commit 80199136d0d84b51b3d0529fb313b8f20f5cf851) Conflicts: extensions/source/update/feed/updatefeed.cxx offapi/type_reference/typelibrary_history.txt offapi/type_reference/types.rdb ucb/source/ucp/webdav/DAVResourceAccess.cxx (Would be an incompatible API CHANGE if we had not unpublished XWebDAVCommandEnvironment with 78cca63070ae6cf82b45ec3bc75fafa2db31a7f2 "Revert publishing of lots of UNO types.") Change-Id: I1c5d0a0b225fe86aca6ba6d6c8903985005387c2
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx16
1 files changed, 3 insertions, 13 deletions
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index ba6652bf75d6..9c1d3e93425d 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1119,24 +1119,14 @@ void DAVResourceAccess::getUserRequestHeaders(
if ( !xDAVEnv.is() )
return;
- uno::Sequence< beans::NamedValue > aRequestHeaders
+ uno::Sequence< beans::StringPair > aRequestHeaders
= xDAVEnv->getUserRequestHeaders( rURI, rMethod );
for ( sal_Int32 n = 0; n < aRequestHeaders.getLength(); ++n )
{
- OUString aValue;
- sal_Bool isString = aRequestHeaders[ n ].Value >>= aValue;
-
- if ( !isString )
- {
- OSL_ENSURE( isString,
- "DAVResourceAccess::getUserRequestHeaders :"
- "Value is not a string! Ignoring..." );
- continue;
- }
-
rRequestHeaders.push_back(
- DAVRequestHeader( aRequestHeaders[ n ].Name, aValue ) );
+ DAVRequestHeader( aRequestHeaders[ n ].First,
+ aRequestHeaders[ n ].Second ) );
}
}