11 files changed, 51 insertions, 4 deletions
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx
index fccfc8b0571f..e056ef04d55c 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -67,6 +67,8 @@ namespace toolkit
 
     //= AnimatedImagesPeer_Data
 
+    namespace {
+
     struct CachedImage
     {
         OUString                 sImageURL;
@@ -85,6 +87,8 @@ namespace toolkit
         }
     };
 
+    }
+
     struct AnimatedImagesPeer_Data
     {
         AnimatedImagesPeer&                             rAntiImpl;
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 55abed46bf87..d2b250894a67 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -79,6 +79,8 @@ namespace toolkit
 
     //= StyleMethodGuard
 
+    namespace {
+
     class StyleMethodGuard
     {
     public:
@@ -92,6 +94,7 @@ namespace toolkit
         SolarMutexGuard const  m_aGuard;
     };
 
+    }
 
     //= WindowStyleSettings
 
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 140d9c103db6..b8328104e518 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -75,8 +75,6 @@ namespace
         static Sequence<OUString> s_aLanguageDependentProperties{ "HelpText", "Title" };
         return s_aLanguageDependentProperties;
     }
-}
-
 
 // functor for disposing a control model
 struct DisposeControlModel
@@ -94,6 +92,7 @@ struct DisposeControlModel
     }
 };
 
+}
 
 // functor for searching control model by name
 struct FindControlModel
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index d260dce6ad7c..b1e944ddf697 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -62,6 +62,8 @@ using namespace ::com::sun::star::util;
 // we probably will need both a hash of control models and hash of controls
 // => use some template magic
 
+namespace {
+
 template< typename T >
 class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< container::XNameContainer >
 {
@@ -123,8 +125,6 @@ public:
     }
 };
 
-namespace {
-
 class UnoControlDialogModel :   public ControlModelContainerBase
 {
 protected:
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index a40856f16179..8bcc53aaccd0 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -487,6 +487,7 @@
             m_nPropertyMapId = aPropMapIdPos->second;
     }
 
+    namespace {
 
     struct PropertyNameLess
     {
@@ -508,6 +509,7 @@
         }
     };
 
+    }
 
     ::cppu::IPropertyArrayHelper* OCommonGeometryControlModel::createArrayHelper( sal_Int32 _nId ) const
     {
@@ -569,6 +571,7 @@
         return css::uno::Sequence<sal_Int8>();
     }
 
+    namespace {
 
     struct Int32Equal
     {
@@ -581,6 +584,7 @@
         }
     };
 
+    }
 
     void SAL_CALL OCommonGeometryControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index b989f3f5a8e5..358eb60a5082 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -226,12 +226,16 @@ Sequence< Reference< XControl > > StdTabController::getControls(  )
     return aSeq;
 }
 
+namespace {
+
 struct ComponentEntry
 {
     css::awt::XWindow*  pComponent;
     ::Point             aPos;
 };
 
+}
+
 void StdTabController::autoTabOrder(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 9aa4a5e22277..c58faaed4b96 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -53,12 +53,16 @@ using namespace ::com::sun::star::util;
 using ::com::sun::star::accessibility::XAccessibleContext;
 using ::com::sun::star::accessibility::XAccessible;
 
+namespace {
+
 struct LanguageDependentProp
 {
     const char* pPropName;
     sal_Int32 const nPropNameLength;
 };
 
+}
+
 static const LanguageDependentProp aLanguageDependentProp[] =
 {
     { "Text",            4 },
@@ -86,6 +90,7 @@ static Sequence< OUString> lcl_ImplGetPropertyNames( const Reference< XMultiProp
     return aNames;
 }
 
+namespace {
 
 class VclListenerLock
 {
@@ -108,6 +113,8 @@ public:
     VclListenerLock& operator=(const VclListenerLock&) = delete;
 };
 
+}
+
 typedef ::std::map< OUString, sal_Int32 >    MapString2Int;
 struct UnoControl_Data
 {
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index d7f2aefaba85..11d8160dc505 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -40,6 +40,8 @@ using namespace ::com::sun::star;
 
 //  class UnoControlHolder
 
+namespace {
+
 struct UnoControlHolder
 {
     uno::Reference< awt::XControl > mxControl;
@@ -56,6 +58,8 @@ public:
     const uno::Reference< awt::XControl >&   getControl() const { return mxControl; }
 };
 
+}
+
 class UnoControlHolderList
 {
 public:
@@ -324,6 +328,8 @@ static void implUpdateVisibility
 
 typedef ::cppu::WeakImplHelper< beans::XPropertyChangeListener > PropertyChangeListenerHelper;
 
+namespace {
+
 class DialogStepChangedListener: public PropertyChangeListenerHelper
 {
 private:
@@ -341,6 +347,8 @@ public:
 
 };
 
+}
+
 void SAL_CALL DialogStepChangedListener::disposing( const  lang::EventObject& /*_rSource*/)
 {
     mxControlContainer.clear();
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index cbb04926bd95..d6d4d77f4514 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -1994,6 +1994,8 @@ stardiv_Toolkit_UnoGroupBoxControl_get_implementation(
 
 // = UnoControlListBoxModel_Data
 
+namespace {
+
 struct ListItem
 {
     OUString ItemText;
@@ -2015,8 +2017,12 @@ struct ListItem
     }
 };
 
+}
+
 typedef beans::Pair< OUString, OUString > UnoListItem;
 
+namespace {
+
 struct StripItemData
 {
     UnoListItem operator()( const ListItem& i_rItem )
@@ -2025,6 +2031,8 @@ struct StripItemData
     }
 };
 
+}
+
 struct UnoControlListBoxModel_Data
 {
     explicit UnoControlListBoxModel_Data( UnoControlListBoxModel& i_rAntiImpl )
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index abbd9a79066c..682354607111 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -49,6 +49,8 @@ namespace toolkit
 
     //= AccessibleDummyFactory
 
+    namespace {
+
     class AccessibleDummyFactory:
         public IAccessibleFactory
     {
@@ -129,6 +131,7 @@ namespace toolkit
         }
     };
 
+    }
 
     AccessibleDummyFactory::AccessibleDummyFactory()
     {
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index b09b0a7e8fff..c3b67df41ac4 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -45,6 +45,8 @@ using ::com::sun::star::graphic::XGraphic;
 
 using namespace com::sun::star;
 
+namespace {
+
 struct ImplPropertyInfo
 {
     OUString                 aName;
@@ -65,6 +67,8 @@ struct ImplPropertyInfo
 
 };
 
+}
+
 #define DECL_PROP_1( asciiname, id, type, attrib1 ) \
     ImplPropertyInfo( asciiname, BASEPROPERTY_##id, cppu::UnoType<type>::get(), css::beans::PropertyAttribute::attrib1 )
 #define DECL_PROP_2( asciiname, id, type, attrib1, attrib2 ) \
@@ -268,6 +272,7 @@ static ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
     return aImplPropertyInfos;
 }
 
+namespace {
 
 struct ImplPropertyInfoCompareFunctor
 {
@@ -281,6 +286,8 @@ struct ImplPropertyInfoCompareFunctor
     }
 };
 
+}
+
 static void ImplAssertValidPropertyArray()
 {
     static bool bSorted = false;