ucb/source/ucp/webdav/ContentProperties.cxx | 11 +----------
ucb/source/ucp/webdav/ContentProperties.hxx | 3 ---
ucb/source/ucp/webdav/webdavcontent.cxx | 8 ++++----
3 files changed, 5 insertions(+), 17 deletions(-)
New commits:
commit 482f0517083d13b3efb7d367b2f1f7a792fc6e47
Author: Giuseppe Castagno <giuseppe.casta...@acca-esse.eu>
Date: Mon Aug 17 16:39:46 2015 +0200
cppcheck:noExplicitConstructor in webdav, serf version
Explicitly add constructors that where previously hidden.
The right implementation of what I did
in aade7198d72bc4ddb18f10729b89f0435e6ca197.
The explict keyword was added in 6343754e310a589cb49e2a1da0cd68472571179d
Change-Id: I66f6ee51c8b51d93d6ac673e75555e13024e4b48
Reviewed-on: https://gerrit.libreoffice.org/17823
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx
b/ucb/source/ucp/webdav/ContentProperties.cxx
index 5069ef9..0d5e074 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 7929b39..daf3f47 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 32ca2db..3173f26 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 );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
