summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extensions/source/update/feed/updatefeed.cxx54
-rw-r--r--offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl5
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx16
3 files changed, 32 insertions, 43 deletions
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 96a9311b99c3..b18b5c83654d 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -173,7 +173,7 @@ public:
throw ( uno::RuntimeException ) { return uno::Reference< ucb::XProgressHandler >(); };
// XWebDAVCommandEnvironment
- virtual uno::Sequence< beans::NamedValue > SAL_CALL getUserRequestHeaders(
+ virtual uno::Sequence< beans::StringPair > SAL_CALL getUserRequestHeaders(
const OUString&, const OUString& )
throw ( uno::RuntimeException ) { return m_aRequestHeaderList; };
@@ -188,7 +188,7 @@ public:
protected:
virtual ~UpdateInformationProvider();
- static uno::Any getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, OUString const & node, OUString const & item);
+ static OUString getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, OUString const & node, OUString const & item);
private:
uno::Reference< io::XInputStream > load(const OUString& rURL);
@@ -207,7 +207,7 @@ private:
const uno::Reference< xml::dom::XDocumentBuilder > m_xDocumentBuilder;
const uno::Reference< xml::xpath::XXPathAPI > m_xXPathAPI;
- uno::Sequence< beans::NamedValue > m_aRequestHeaderList;
+ uno::Sequence< beans::StringPair > m_aRequestHeaderList;
uno::Reference< ucb::XCommandProcessor > m_xCommandProcessor;
uno::Reference< task::XInteractionHandler > m_xInteractionHandler;
@@ -327,24 +327,22 @@ UpdateInformationProvider::UpdateInformationProvider(
com::sun::star::configuration::theDefaultProvider::get(xContext));
OUStringBuffer buf;
- OUString name;
- getConfigurationItem(
- xConfigurationProvider,
- "org.openoffice.Setup/Product",
- "ooName") >>= name;
- buf.append(name);
+ buf.append(
+ getConfigurationItem(
+ xConfigurationProvider,
+ "org.openoffice.Setup/Product",
+ "ooName"));
buf.append(sal_Unicode(' '));
- OUString version;
- getConfigurationItem(
- xConfigurationProvider,
- "org.openoffice.Setup/Product",
- "ooSetupVersion") >>= version;
- buf.append(version);
- OUString extension;
- getConfigurationItem(
- xConfigurationProvider,
- "org.openoffice.Setup/Product",
- "ooSetupExtension") >>= extension;
+ buf.append(
+ getConfigurationItem(
+ xConfigurationProvider,
+ "org.openoffice.Setup/Product",
+ "ooSetupVersion"));
+ OUString extension(
+ getConfigurationItem(
+ xConfigurationProvider,
+ "org.openoffice.Setup/Product",
+ "ooSetupExtension"));
if (!extension.isEmpty()) {
buf.append(extension);
}
@@ -366,13 +364,13 @@ UpdateInformationProvider::UpdateInformationProvider(
SAL_INFO("extensions.update", "UpdateUserAgent: " << aUserAgent);
- m_aRequestHeaderList[0].Name = "Accept-Language";
- m_aRequestHeaderList[0].Value = getConfigurationItem( xConfigurationProvider, "org.openoffice.Setup/L10N", "ooLocale" );
+ m_aRequestHeaderList[0].First = "Accept-Language";
+ m_aRequestHeaderList[0].Second = getConfigurationItem( xConfigurationProvider, "org.openoffice.Setup/L10N", "ooLocale" );
if( !aUserAgent.isEmpty() )
{
m_aRequestHeaderList.realloc(2);
- m_aRequestHeaderList[1].Name = "User-Agent";
- m_aRequestHeaderList[1].Value = uno::makeAny(aUserAgent);
+ m_aRequestHeaderList[1].First = "User-Agent";
+ m_aRequestHeaderList[1].Second = aUserAgent;
}
}
@@ -401,10 +399,11 @@ UpdateInformationProvider::~UpdateInformationProvider()
//------------------------------------------------------------------------------
-uno::Any
+OUString
UpdateInformationProvider::getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, OUString const & node, OUString const & item)
{
- beans::NamedValue aProperty;
+ rtl::OUString sRet;
+ beans::PropertyValue aProperty;
aProperty.Name = "nodepath";
aProperty.Value = uno::makeAny(node);
@@ -417,7 +416,8 @@ UpdateInformationProvider::getConfigurationItem(uno::Reference<lang::XMultiServi
aArgumentList ),
uno::UNO_QUERY_THROW);
- return xNameAccess->getByName(item);
+ xNameAccess->getByName(item) >>= sRet;
+ return sRet;
}
//------------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
index eda3d1487f32..7bc17321ca30 100644
--- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
@@ -20,7 +20,7 @@
#define __com_sun_star_ucb_XWebDAVCommandEnvironment_idl__
#include <com/sun/star/ucb/XCommandEnvironment.idl>
-#include <com/sun/star/beans/NamedValue.idl>
+#include <com/sun/star/beans/StringPair.idl>
module com { module sun { module star { module ucb {
@@ -43,9 +43,8 @@ interface XWebDAVCommandEnvironment : XCommandEnvironment
@return
A sequence of header name, header value pairs. The header
names must be the plain names and contain no trailing ":".
- The header value must be an Any containing a string.
*/
- sequence<com::sun::star::beans::NamedValue> getUserRequestHeaders(
+ sequence<com::sun::star::beans::StringPair> getUserRequestHeaders(
[in] string aURI,
[in] string aMethod);
};
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 ) );
}
}
generated by cgit (git 2.34.1) at 2025-02-22 19:26:03 +0000