8 files changed, 13 insertions, 14 deletions
diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx
index 243ad0d12317..c66e2215736f 100644
--- a/ucb/source/core/providermap.hxx
+++ b/ucb/source/core/providermap.hxx
@@ -41,7 +41,7 @@ private:
         com::sun::star::ucb::XContentProvider > resolveProvider() const;
 
 public:
-    ProviderListEntry_Impl(
+    explicit ProviderListEntry_Impl(
         const com::sun::star::uno::Reference<
             com::sun::star::ucb::XContentProvider >& xProvider )
     : m_xProvider( xProvider ) {}
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index f2e88a522f00..a06d6b8f1c5d 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -426,7 +426,7 @@ UniversalContentBroker::registerContentProvider(
     if (aIt == m_aProviders.end())
     {
         ProviderList_Impl aList;
-        aList.push_front(Provider);
+        aList.push_front( ProviderListEntry_Impl(Provider) );
         try
         {
             m_aProviders.add(Scheme, aList, false);
@@ -443,7 +443,7 @@ UniversalContentBroker::registerContentProvider(
 
         ProviderList_Impl & rList = aIt->getValue();
         xPrevious = rList.front().getProvider();
-        rList.push_front(Provider);
+        rList.push_front( ProviderListEntry_Impl(Provider) );
     }
 
     return xPrevious;
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.hxx b/ucb/source/ucp/gvfs/gvfs_provider.hxx
index 05d6682c452e..699ab964546b 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.hxx
@@ -28,7 +28,7 @@ namespace gvfs {
 class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
 {
 public:
-    ContentProvider( const ::com::sun::star::uno::Reference<
+    explicit ContentProvider( const ::com::sun::star::uno::Reference<
              ::com::sun::star::uno::XComponentContext >& rxContext );
     virtual ~ContentProvider();
 
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 0cd59ac93c29..4572a34b093c 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -494,7 +494,7 @@ bool HierarchyEntry::move(
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
-    OUString aNewPath = createPathFromHierarchyURL( rNewURL );
+    OUString aNewPath = createPathFromHierarchyURL( HierarchyUri(rNewURL) );
 
     if ( aNewPath == m_aPath )
         return true;
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index 75f9bc68236c..fac3a8e1d622 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
@@ -45,7 +45,7 @@ private:
 
 public:
     HierarchyUri() : m_bValid( false ) {}
-    HierarchyUri( const OUString & rUri )
+    explicit HierarchyUri( const OUString & rUri )
     : m_aUri( rUri ), m_bValid( false ) {}
 
     bool isValid() const
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 33d390934da4..6eb3875da89b 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -905,7 +905,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 const OUString& rContentId )
 {
     ContentProperties aData;
-    if ( loadData( pProvider, rContentId, aData ) )
+    if ( loadData( pProvider, Uri(rContentId), aData ) )
     {
         return getPropertyValues(
             rxContext, rProperties, aData, pProvider, rContentId );
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx
index 12d40e4e708f..39da47e9deb5 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx
@@ -49,7 +49,7 @@ private:
 
 public:
     Uri() : m_eState( UNKNOWN ) {}
-    Uri( const OUString & rUri )
+    explicit Uri( const OUString & rUri )
     : m_aUri( rUri ), m_eState( UNKNOWN ) {}
 
     bool operator== ( const Uri & rOther ) const
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx
index 483cab83daa2..daf3f47654eb 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -50,7 +50,7 @@ public:
     PropertyValue()
     : m_bIsCaseSensitive( true ) {}
 
-    PropertyValue( const ::com::sun::star::uno::Any & rValue,
+    explicit PropertyValue( const ::com::sun::star::uno::Any & rValue,
                    bool bIsCaseSensitive )
     : m_aValue( rValue),
       m_bIsCaseSensitive( bIsCaseSensitive ) {}
@@ -75,20 +75,19 @@ class ContentProperties
 public:
     ContentProperties();
 
-    ContentProperties( const DAVResource& rResource );
+    explicit ContentProperties( const DAVResource& rResource );
 
     // Mini props for transient contents.
     ContentProperties( const OUString & rTitle, bool bFolder );
 
     // Micro props for non-existing contents.
-    ContentProperties( const OUString & rTitle );
+    explicit ContentProperties( const OUString & rTitle );
 
     ContentProperties( const ContentProperties & rOther );
 
     bool contains( const OUString & rName ) const;
 
-    const com::sun::star::uno::Any &
-    getValue( const OUString & rName ) const;
+    const css::uno::Any& getValue( const OUString & rName ) const;
 
     // Maps the UCB property names contained in rProps with their DAV property
     // counterparts, if possible. All unmappable properties will be included
@@ -174,7 +173,7 @@ private:
     CachableContentProperties( const CachableContentProperties & ); // n.i.
 
 public:
-    CachableContentProperties( const ContentProperties & rProps );
+    explicit CachableContentProperties( const ContentProperties & rProps );
 
     void addProperties( const ContentProperties & rProps );