diff options
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/webdav/ContentProperties.cxx | 11 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/ContentProperties.hxx | 3 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/webdavcontent.cxx | 8 |
3 files changed, 5 insertions, 17 deletions
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 5069ef99ae75..0d5e0741465b 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -591,11 +591,6 @@ CachableContentProperties::CachableContentProperties( addProperties( rProps ); } -CachableContentProperties::CachableContentProperties( - const DAVResource & rResource ) -{ - addProperties( rResource ); -} void CachableContentProperties::addProperties( const ContentProperties & rProps ) @@ -616,6 +611,7 @@ void CachableContentProperties::addProperties( } } + void CachableContentProperties::addProperties( const std::vector< DAVPropertyValue > & rProps ) { @@ -631,9 +627,4 @@ void CachableContentProperties::addProperties( } } -void CachableContentProperties::addProperties( const DAVResource & rResource ) -{ - addProperties( rResource.properties ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index 7929b396399a..daf3f47654eb 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -173,15 +173,12 @@ private: CachableContentProperties( const CachableContentProperties & ); // n.i. public: - explicit CachableContentProperties( const DAVResource& rResource ); explicit CachableContentProperties( const ContentProperties & rProps ); void addProperties( const ContentProperties & rProps ); void addProperties( const std::vector< DAVPropertyValue > & rProps ); - void addProperties( const DAVResource & rResource ); - bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 32ca2dba96aa..3173f2655845 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -2169,9 +2169,9 @@ uno::Any Content::open( // cache headers. if ( !m_xCachedProps.get()) m_xCachedProps.reset( - new CachableContentProperties( aResource ) ); + new CachableContentProperties( ContentProperties( aResource ) ) ); else - m_xCachedProps->addProperties( aResource ); + m_xCachedProps->addProperties( ContentProperties( aResource ) ); m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); @@ -2215,7 +2215,7 @@ uno::Any Content::open( // cache headers. if ( !m_xCachedProps.get()) m_xCachedProps.reset( - new CachableContentProperties( aResource ) ); + new CachableContentProperties( ContentProperties( aResource ) ) ); else m_xCachedProps->addProperties( aResource.properties ); @@ -3362,7 +3362,7 @@ Content::ResourceType Content::getResourceType( { osl::MutexGuard g(m_aMutex); m_xCachedProps.reset( - new CachableContentProperties( resources[ 0 ] ) ); + new CachableContentProperties( ContentProperties( resources[ 0 ] ) ) ); m_xCachedProps->containsAllNames( aProperties, m_aFailedPropNames ); } |