6 files changed, 29 insertions, 0 deletions
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 98ec40a808b6..6be2d87fa9a9 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -387,6 +387,8 @@ OUString NamedTableCopySource::getSelectStatement() const
     return const_cast< NamedTableCopySource* >( this )->impl_ensureStatement_throw();
 }
 
+namespace {
+
 // DummyCopySource
 class DummyCopySource : public ICopyTableSourceObject
 {
@@ -410,6 +412,8 @@ public:
                                 getPreparedSelectStatement() const override;
 };
 
+}
+
 const DummyCopySource& DummyCopySource::Instance()
 {
     static DummyCopySource s_aTheInstance;
diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
index 2f1b3e27b194..3c59a58f8b85 100644
--- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx
+++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
@@ -32,6 +32,8 @@ namespace dbaui
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::uno::Exception;
 
+    namespace {
+
     // AsyncDialogExecutor
     class DialogExecutor_Impl
     {
@@ -57,6 +59,8 @@ namespace dbaui
         DECL_LINK( onExecute, void*, void );
     };
 
+    }
+
     IMPL_LINK_NOARG( DialogExecutor_Impl, onExecute, void*, void )
     {
         try
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx
index 4bd0c9e4426d..599398e5d00f 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -64,6 +64,9 @@ namespace dbaui
     // FrameWindowActivationListener
     typedef ::cppu::WeakImplHelper<   XTopWindowListener
                                   >   FrameWindowActivationListener_Base;
+
+    namespace {
+
     class FrameWindowActivationListener : public FrameWindowActivationListener_Base
     {
     public:
@@ -94,6 +97,8 @@ namespace dbaui
         ControllerFrame_Data*   m_pData;
     };
 
+    }
+
     // ControllerFrame_Data
     struct ControllerFrame_Data
     {
diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx
index 0ee8e9985590..d8659ce6157d 100644
--- a/dbaccess/source/ui/misc/dbaundomanager.cxx
+++ b/dbaccess/source/ui/misc/dbaundomanager.cxx
@@ -78,6 +78,8 @@ namespace dbaui
         return static_cast< XUndoManager* >( &rAntiImpl );
     }
 
+    namespace {
+
     // OslMutexFacade
     class OslMutexFacade : public ::framework::IMutex
     {
@@ -96,6 +98,8 @@ namespace dbaui
         ::osl::Mutex&   m_rMutex;
     };
 
+    }
+
     void OslMutexFacade::acquire()
     {
         m_rMutex.acquire();
@@ -106,6 +110,8 @@ namespace dbaui
         m_rMutex.release();
     }
 
+    namespace {
+
     // UndoManagerMethodGuard
     /** guard for public UNO methods of the UndoManager
     */
@@ -133,6 +139,8 @@ namespace dbaui
         OslMutexFacade              m_aMutexFacade;
     };
 
+    }
+
     ::framework::IMutex& UndoManagerMethodGuard::getGuardedMutex()
     {
         return m_aMutexFacade;
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 505391d7cdb8..eb3331d6fe88 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -81,6 +81,8 @@ namespace dbaui
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::frame::XUntitledNumbers;
 
+    namespace {
+
     class DataSourceHolder
     {
     public:
@@ -116,6 +118,8 @@ namespace dbaui
         Reference< XOfficeDatabaseDocument >    m_xDocument;
     };
 
+    }
+
     struct DBSubComponentController_Impl
     {
     private:
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index 82ccab986fd6..045f5b10bcdc 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -31,6 +31,8 @@ namespace dbaui
     using namespace dbaccess;
     using namespace ::com::sun::star;
 
+    namespace {
+
     struct FeatureSupport
     {
         // authentication mode of the data source
@@ -54,6 +56,8 @@ namespace dbaui
         const sal_Char* pAsciiFeatureName;
     };
 
+    }
+
     // global tables
     static const FeatureMapping* lcl_getFeatureMappings()
     {