From 29bd62fdc2792e215999e9dd0ec9a4bf1102201d Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 17 Jan 2012 11:41:14 +0100 Subject: Switch flag sequence of OpenCommandArg3 to NamedValue. Based on feedback for 09954fc863c8ee900f157cab4458e1dcf51493d3, using the less-bulky NamedValue type instead of PropertyValue. --- ucb/source/ucp/webdav/DAVResourceAccess.cxx | 2 +- ucb/source/ucp/webdav/DAVResourceAccess.hxx | 6 +++--- ucb/source/ucp/webdav/DAVSession.hxx | 4 ++-- ucb/source/ucp/webdav/DAVSessionFactory.cxx | 2 +- ucb/source/ucp/webdav/DAVSessionFactory.hxx | 4 ++-- ucb/source/ucp/webdav/NeonSession.cxx | 16 ++++++++-------- ucb/source/ucp/webdav/NeonSession.hxx | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'ucb') diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 5ff430d00806..ce76e198d1b3 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -1045,7 +1045,7 @@ void DAVResourceAccess::UNLOCK( } //========================================================================= -void DAVResourceAccess::setFlags( const uno::Sequence< beans::PropertyValue >& rFlags ) +void DAVResourceAccess::setFlags( const uno::Sequence< beans::NamedValue >& rFlags ) throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx index e0dce824c839..30770b06e3c1 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include "DAVAuthListener.hxx" @@ -55,7 +55,7 @@ class DAVResourceAccess osl::Mutex m_aMutex; rtl::OUString m_aURL; rtl::OUString m_aPath; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aFlags; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; com::sun::star::uno::Reference< @@ -73,7 +73,7 @@ public: DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); - void setFlags( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rFlags ) + void setFlags( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) throw ( DAVException ); void setURL( const rtl::OUString & rNewURL ) diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index 74db5a526afc..b353d33e644e 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -41,7 +41,7 @@ #include "DAVRequestEnvironment.hxx" namespace com { namespace sun { namespace star { namespace beans { - struct PropertyValue; + struct NamedValue; } } } } namespace com { namespace sun { namespace star { namespace ucb { @@ -71,7 +71,7 @@ public: } virtual sal_Bool CanUse( const ::rtl::OUString & inPath, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rFlags ) = 0; + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) = 0; virtual sal_Bool UsesProxy() = 0; diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx index 8fbdbaae85c9..41e19ae1b22f 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx @@ -40,7 +40,7 @@ DAVSessionFactory::~DAVSessionFactory() rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( const ::rtl::OUString & inUri, - const uno::Sequence< beans::PropertyValue >& rFlags, + const uno::Sequence< beans::NamedValue >& rFlags, const uno::Reference< lang::XMultiServiceFactory > & rxSMgr ) throw( DAVException ) { diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx index 9847aec5f3c1..4e642c42af86 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx @@ -43,7 +43,7 @@ using namespace com::sun::star; namespace com { namespace sun { namespace star { namespace beans { - struct PropertyValue; + struct NamedValue; } } } } namespace com { namespace sun { namespace star { namespace lang { @@ -62,7 +62,7 @@ public: rtl::Reference< DAVSession > createDAVSession( const ::rtl::OUString & inUri, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rFlags, + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr ) diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index ec421ad2b9b4..2ed00dcf047a 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -70,7 +70,7 @@ extern "C" { #include #include #include -#include +#include #include #include @@ -155,17 +155,17 @@ static sal_uInt16 makeStatusCode( const rtl::OUString & rStatusText ) } // ------------------------------------------------------------------- -static bool noKeepAlive( const uno::Sequence< beans::PropertyValue >& rFlags ) +static bool noKeepAlive( const uno::Sequence< beans::NamedValue >& rFlags ) { if ( !rFlags.hasElements() ) return false; // find "KeepAlive" property - const beans::PropertyValue* pAry(rFlags.getConstArray()); - const sal_Int32 nLen(rFlags.getLength()); - const beans::PropertyValue* pValue( + const beans::NamedValue* pAry(rFlags.getConstArray()); + const sal_Int32 nLen(rFlags.getLength()); + const beans::NamedValue* pValue( std::find_if(pAry,pAry+nLen, - boost::bind(comphelper::TPropertyValueEqualFunctor(), + boost::bind(comphelper::TNamedValueEqualFunctor(), _1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KeepAlive"))))); if ( pValue != pAry+nLen && !pValue->Value.get() ) @@ -643,7 +643,7 @@ NeonLockStore NeonSession::m_aNeonLockStore; NeonSession::NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, const rtl::OUString& inUri, - const uno::Sequence< beans::PropertyValue >& rFlags, + const uno::Sequence< beans::NamedValue >& rFlags, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ) : DAVSession( rSessionFactory ), @@ -855,7 +855,7 @@ void NeonSession::Init() // ------------------------------------------------------------------- // virtual sal_Bool NeonSession::CanUse( const rtl::OUString & inUri, - const uno::Sequence< beans::PropertyValue >& rFlags ) + const uno::Sequence< beans::NamedValue >& rFlags ) { try { diff --git a/ucb/source/ucp/webdav/NeonSession.hxx b/ucb/source/ucp/webdav/NeonSession.hxx index 4ed7603b0220..f15eac408c4e 100644 --- a/ucb/source/ucp/webdav/NeonSession.hxx +++ b/ucb/source/ucp/webdav/NeonSession.hxx @@ -55,7 +55,7 @@ private: rtl::OUString m_aProxyName; sal_Int32 m_nPort; sal_Int32 m_nProxyPort; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aFlags; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; HttpSession * m_pHttpSession; void * m_pRequestData; const ucbhelper::InternetProxyDecider & m_rProxyDecider; @@ -76,13 +76,13 @@ protected: public: NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, const rtl::OUString& inUri, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rFlags, + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ); // DAVSession methods virtual sal_Bool CanUse( const ::rtl::OUString & inPath, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rFlags ); + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ); virtual sal_Bool UsesProxy(); -- cgit