6 files changed, 48 insertions, 0 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 1ba6f7ad6fb5..2020cb99f614 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -177,6 +177,8 @@ Image FmFilterItem::GetImage() const
 
 // Hints for communication between model and view
 
+namespace {
+
 class FmFilterHint : public SfxHint
 {
     FmFilterData* const   m_pData;
@@ -225,6 +227,8 @@ public:
     FmFilterCurrentChangedHint(){}
 };
 
+}
+
 // class FmFilterAdapter, listener at the FilterControls
 class FmFilterAdapter : public ::cppu::WeakImplHelper< XFilterControllerListener >
 {
@@ -935,6 +939,8 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem )
     }
 }
 
+namespace {
+
 class FmFilterItemsString : public SvLBoxString
 {
 public:
@@ -948,6 +954,8 @@ public:
     virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData = nullptr) override;
 };
 
+}
+
 const int nxDBmp = 12;
 
 void FmFilterItemsString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
@@ -994,6 +1002,8 @@ void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pE
     pViewData->mnHeight = aSize.Height();
 }
 
+namespace {
+
 class FmFilterString : public SvLBoxString
 {
     OUString m_aName;
@@ -1011,6 +1021,8 @@ public:
     virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData = nullptr) override;
 };
 
+}
+
 const int nxD = 4;
 
 void FmFilterString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData)
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 5edf19daa490..f76f8e86f729 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -71,14 +71,19 @@ namespace svxform
     using ::com::sun::star::awt::XControl;
     using ::com::sun::star::beans::XPropertySet;
 
+    namespace {
+
     class FormScriptingEnvironment;
 
+    }
 
     //= FormScriptListener
 
     typedef ::cppu::WeakImplHelper <   XScriptListener
                                     >   FormScriptListener_Base;
 
+    namespace {
+
     /** implements the XScriptListener interface, is used by FormScriptingEnvironment
     */
     class FormScriptListener    :public FormScriptListener_Base
@@ -169,6 +174,8 @@ namespace svxform
         void impl_registerOrRevoke_throw( const Reference< XEventAttacherManager >& _rxManager, bool _bRegister );
     };
 
+    }
+
     FormScriptListener::FormScriptListener( FormScriptingEnvironment* pScriptExecutor )
         :m_pScriptExecutor( pScriptExecutor )
     {
@@ -770,6 +777,8 @@ namespace svxform
         m_pScriptExecutor = nullptr;
     }
 
+    namespace {
+
     // tdf#88985 If LibreOffice tries to exit during the execution of a macro
     // then: detect the effort, stop basic execution, block until the macro
     // returns due to that stop, then restart the quit. This avoids the app
@@ -869,6 +878,8 @@ namespace svxform
         }
     };
 
+    }
+
     IMPL_LINK( FormScriptListener, OnAsyncScriptEvent, void*, p, void )
     {
         ScriptEvent* _pEvent = static_cast<ScriptEvent*>(p);
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 021d5b40b201..2a543178b571 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -74,12 +74,16 @@ namespace svxform
 
     // maps from ascii values to int values
 
+    namespace {
+
     struct Ascii2Int16
     {
         const sal_Char* pAscii;
         sal_Int16 const nValue;
     };
 
+    }
+
     static const Ascii2Int16* lcl_getSearchForTypeValueMap()
     {
         static const Ascii2Int16 s_aSearchForTypeMap[] =
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 7b632521b465..2552161a43f9 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -77,6 +77,8 @@ using namespace ::dbtools;
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase.hxx>
 
+namespace {
+
 class ScriptEventListenerWrapper : public cppu::WeakImplHelper< XScriptListener >
 {
 public:
@@ -164,6 +166,8 @@ struct PropertySetInfo
                                             // sal_False -> the set has _no_ such property or its value isn't empty
 };
 
+}
+
 typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCache;
 
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 0a1aa102d718..d5fde904fff6 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -206,6 +206,8 @@ namespace svxform
     namespace RowChangeAction = ::com::sun::star::sdb::RowChangeAction;
     namespace FormFeature = ::com::sun::star::form::runtime::FormFeature;
 
+namespace {
+
 struct ColumnInfo
 {
     // information about the column itself
@@ -241,6 +243,8 @@ struct ColumnInfo
     }
 };
 
+}
+
 class ColumnInfoCache
 {
 public:
@@ -415,6 +419,8 @@ const ColumnInfo& ColumnInfoCache::getColumnInfo( size_t _pos )
     return m_aColumns[ _pos ];
 }
 
+namespace {
+
 class OParameterContinuation : public OInteraction< XInteractionSupplyParameters >
 {
     Sequence< PropertyValue >       m_aValues;
@@ -428,6 +434,7 @@ public:
     virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) override;
 };
 
+}
 
 void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues )
 {
@@ -449,6 +456,8 @@ struct FmFieldInfo
     {xField->getPropertyValue(FM_PROP_NAME) >>= aFieldName;}
 };
 
+namespace {
+
 class FmXAutoControl: public UnoControl
 
 {
@@ -464,6 +473,7 @@ protected:
     virtual void ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ) override;
 };
 
+}
 
 void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer )
 {
@@ -493,6 +503,7 @@ IMPL_LINK_NOARG( FormController, OnActivateTabOrder, Timer*, void )
     activateTabOrder();
 }
 
+namespace {
 
 struct UpdateAllListeners
 {
@@ -504,6 +515,8 @@ struct UpdateAllListeners
     }
 };
 
+}
+
 IMPL_LINK_NOARG( FormController, OnInvalidateFeatures, Timer*, void )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index 9e14d3758cd1..0c72859d0945 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -55,6 +55,9 @@ namespace svxform
     typedef ::cppu::WeakImplHelper <   form::XFormController
                                     ,   XServiceInfo
                                     >   LegacyFormController_Base;
+
+    namespace {
+
     /** is an implementation of the legacy form controller service, namely css.form.FormController, supporting the
         css.form.XFormController interface.
 
@@ -100,6 +103,7 @@ namespace svxform
         const Reference< form::runtime::XFormController >   m_xDelegator;
     };
 
+    }
 
     Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl(  )
     {