8 files changed, 24 insertions, 0 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 31f87284d0d4..ffa29b1bb6ce 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -537,6 +537,7 @@ void SAL_CALL OButtonControl::removeActionListener(const Reference<XActionListen
     m_aActionListeners.removeInterface(_rxListener);
 }
 
+namespace {
 
 class DoPropertyListening
 {
@@ -555,6 +556,7 @@ public:
     void    handleListening( const OUString& _rPropertyName );
 };
 
+}
 
 DoPropertyListening::DoPropertyListening(
         const Reference< XInterface >& _rxComponent, const Reference< XPropertyChangeListener >& _rxListener,
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index f2b307c702ad..3bd03fce0b03 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -98,6 +98,8 @@ using namespace ::com::sun::star::util;
 namespace frm
 {
 
+namespace {
+
 class DocumentModifyGuard
 {
 public:
@@ -129,6 +131,8 @@ private:
     Reference< XModifiable2 >   m_xDocumentModify;
 };
 
+}
+
 // submitting and resetting html-forms asynchronously
 class OFormSubmitResetThread: public OComponentEventThread
 {
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 7ab3e7732f7d..fb584d478ced 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -89,6 +89,8 @@ void ControlModelLock::addPropertyNotification( const sal_Int32 _nHandle, const
     m_aNewValues.push_back( _rNewValue );
 }
 
+namespace {
+
 class FieldChangeNotifier
 {
 public:
@@ -112,6 +114,8 @@ private:
     Reference< XPropertySet >   m_xOldField;
 };
 
+}
+
 // base class for form layer controls
 OControl::OControl( const Reference< XComponentContext >& _rxContext, const OUString& _rAggregateService, const bool _bSetDelegator )
             :OComponentHelper(m_aMutex)
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 178cf037312d..805076b545d1 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -76,6 +76,8 @@ using namespace css::form::binding;
 
 namespace frm
 {
+namespace {
+
 class StandardFormatsSupplier : protected SvNumberFormatsSupplierObj, public ::utl::ITerminationListener
 {
 protected:
@@ -90,6 +92,9 @@ protected:
     virtual bool    queryTermination() const override;
     virtual void    notifyTermination() override;
 };
+
+}
+
 WeakReference< XNumberFormatsSupplier > StandardFormatsSupplier::s_xDefaultFormatsSupplier;
 StandardFormatsSupplier::StandardFormatsSupplier(const Reference< XComponentContext > & _rxContext,LanguageType _eSysLanguage)
     :SvNumberFormatsSupplierObj()
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index c1b72d90daed..848b2ce0629b 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -34,6 +34,7 @@
 #include <svtools/imageresourceaccess.hxx>
 #include <comphelper/processfactory.hxx>
 
+namespace {
 
 class ImgProdLockBytes : public SvLockBytes
 {
@@ -52,6 +53,7 @@ public:
     virtual ErrCode     Stat( SvLockBytesStat* ) const override;
 };
 
+}
 
 ImgProdLockBytes::ImgProdLockBytes( SvStream* pStm, bool bOwner ) :
         SvLockBytes( pStm, bOwner )
diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index a40783149416..6569c8a4373e 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -52,6 +52,8 @@ namespace frm
 
     namespace ImageType = ::com::sun::star::ui::ImageType;
 
+    namespace {
+
     class DocumentCommandImageProvider : public ICommandImageProvider
     {
     public:
@@ -71,6 +73,7 @@ namespace frm
         Reference< XImageManager >    m_xModuleImageManager;
     };
 
+    }
 
     void DocumentCommandImageProvider::impl_init_nothrow( const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument )
     {
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index ac86a12b0454..c318b936d8af 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -347,6 +347,7 @@ void SAL_CALL OInterfaceContainer::writeEvents(const Reference<XObjectOutputStre
         lcl_restoreEvents( aSave, m_xEventAttacher );
 }
 
+namespace {
 
 struct TransformEventTo52Format
 {
@@ -370,6 +371,7 @@ struct TransformEventTo52Format
     }
 };
 
+}
 
 void OInterfaceContainer::transformEvents()
 {
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index c079591e61b8..e7f0fb4cb352 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -76,6 +76,7 @@ namespace frm
         return s_aSystem;
     }
 
+    namespace {
 
     struct FormatEntry
     {
@@ -84,6 +85,7 @@ namespace frm
         LocaleType      eLocale;
     };
 
+    }
 
     static FormatEntry* lcl_getFormatTable(sal_Int16 nTableId)
     {