4 files changed, 32 insertions, 1 deletions
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 9641a4e0a87a..5c698a2d7ba6 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -74,6 +74,8 @@ using namespace com::sun::star::uno;
 namespace ucbhelper
 {
 
+namespace {
+
 class EmptyInputStream : public ::cppu::WeakImplHelper< XInputStream >
 {
 public:
@@ -86,6 +88,8 @@ public:
     virtual void SAL_CALL closeInput() override;
 };
 
+}
+
 sal_Int32 EmptyInputStream::readBytes(
     Sequence< sal_Int8 > & data, sal_Int32 )
 {
@@ -116,6 +120,7 @@ void EmptyInputStream::closeInput()
 
 // class ContentEventListener_Impl.
 
+namespace {
 
 class ContentEventListener_Impl : public cppu::OWeakObject,
                                       public XContentEventListener
@@ -140,13 +145,14 @@ public:
     virtual void SAL_CALL disposing( const EventObject& Source ) override;
 };
 
+}
 
 // class Content_Impl.
 
 
 class Content_Impl : public salhelper::SimpleReferenceObject
 {
-friend class ContentEventListener_Impl;
+friend ContentEventListener_Impl;
 
     mutable OUString               m_aURL;
     Reference< XComponentContext >      m_xCtx;
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index b56ffbf76d71..062dd64b2887 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -62,6 +62,8 @@ namespace ucbhelper
 namespace proxydecider_impl
 {
 
+namespace {
+
 // A simple case ignoring wildcard matcher.
 class WildCard
 {
@@ -77,9 +79,12 @@ public:
     bool Matches( const OUString & rStr ) const;
 };
 
+}
 
 typedef std::pair< WildCard, WildCard > NoProxyListEntry;
 
+namespace {
+
 class HostnameCache
 {
     typedef std::pair< OUString, OUString > HostListEntry;
@@ -111,6 +116,7 @@ public:
     }
 };
 
+}
 
 class InternetProxyDecider_Impl :
     public cppu::WeakImplHelper< util::XChangesListener >
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index a7f39fced3d8..653f0d47e125 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -48,6 +48,8 @@ using namespace com::sun::star;
 namespace ucbhelper_impl
 {
 
+namespace {
+
 class PropertyEventSequence
 {
     uno::Sequence< beans::PropertyChangeEvent > m_aSeq;
@@ -64,8 +66,12 @@ public:
     { m_aSeq.realloc( m_nPos ); return m_aSeq; }
 };
 
+}
+
 typedef void* XPropertiesChangeListenerPtr; // -> Compiler problems!
 
+namespace {
+
 struct equalPtr
 {
     bool operator()( const XPropertiesChangeListenerPtr& rp1,
@@ -83,6 +89,8 @@ struct hashPtr
     }
 };
 
+}
+
 typedef std::unordered_map
 <
     XPropertiesChangeListenerPtr,
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 133b66a1da56..de8f868c8445 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -38,6 +38,8 @@ using namespace com::sun::star;
 namespace ucbhelper_impl
 {
 
+namespace {
+
 struct PropertyInfo
 {
     const char* pName;
@@ -46,6 +48,8 @@ struct PropertyInfo
     const uno::Type& (*pGetCppuType)();
 };
 
+}
+
 static const uno::Type& sal_Int32_getCppuType()
 {
     return cppu::UnoType<sal_Int32>::get();
@@ -80,6 +84,7 @@ static const PropertyInfo aPropertyTable[] =
 
 // class PropertySetInfo
 
+namespace {
 
 class PropertySetInfo :
         public cppu::OWeakObject,
@@ -115,9 +120,13 @@ public:
     virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 };
 
+}
+
 typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
     PropertyChangeListenerContainer;
 
+namespace {
+
 class PropertyChangeListeners : public PropertyChangeListenerContainer
 {
 public:
@@ -125,6 +134,8 @@ public:
         : PropertyChangeListenerContainer( rMtx ) {}
 };
 
+}
+
 } // namespace ucbhelper_impl
 
 using namespace ucbhelper_impl;