4 files changed, 22 insertions, 0 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index aa386fdae3e7..1e877c66d063 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -97,6 +97,8 @@ ScVbaControl::getWindowPeer()
     return xWinPeer;
 }
 
+namespace {
+
 //ScVbaControlListener
 class ScVbaControlListener: public cppu::WeakImplHelper< lang::XEventListener >
 {
@@ -108,6 +110,8 @@ public:
     virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) override;
 };
 
+}
+
 ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pControl( pTmpControl )
 {
 }
@@ -430,6 +434,7 @@ void SAL_CALL ScVbaControl::setTag( const OUString& aTag )
     return OORGBToXLRGB( nForeColor );
 }
 
+namespace {
 
 struct PointerStyles
 {
@@ -437,6 +442,8 @@ struct PointerStyles
    PointerStyle const loPointStyle;
 };
 
+}
+
 // 1 -> 1 map of styles ( some dubious choices in there though )
 PointerStyles const styles[] = {
   /// assuming pointer default is Arrow
@@ -759,6 +766,8 @@ void ScVbaControl::setLocked( bool bLocked )
     m_xProps->setPropertyValue( "ReadOnly" , uno::makeAny( bLocked ) );
 }
 
+namespace {
+
 class ControlProviderImpl : public cppu::WeakImplHelper< XControlProvider >
 {
     uno::Reference< uno::XComponentContext > m_xCtx;
@@ -767,6 +776,8 @@ public:
     virtual uno::Reference< msforms::XControl > SAL_CALL createControl( const uno::Reference< drawing::XControlShape >& xControl, const uno::Reference< frame::XModel >& xDocOwner ) override;
 };
 
+}
+
 uno::Reference< msforms::XControl > SAL_CALL
 ControlProviderImpl::createControl( const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< frame::XModel >& xDocOwner )
 {
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index 01abc34f67dd..c3cf49b86f0d 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -42,6 +42,8 @@ using namespace ooo::vba;
 
 typedef  std::unordered_map< OUString, sal_Int32 > ControlIndexMap;
 
+namespace {
+
 class ControlArrayWrapper : public ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess >
 {
     uno::Reference< awt::XControlContainer > mxDialog;
@@ -190,6 +192,7 @@ public:
 
 };
 
+}
 
 static uno::Reference<container::XIndexAccess >
 lcl_controlsWrapper( const uno::Reference< awt::XControl >& xDlg )
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
index dfbbb19a3bde..b1601f99ec43 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
@@ -26,6 +26,8 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
+namespace {
+
 class ListPropListener : public PropListener
 {
 private:
@@ -40,6 +42,8 @@ public:
     virtual css::uno::Any getValueEvent() override;
 };
 
+}
+
 ListPropListener::ListPropListener( const uno::Reference< beans::XPropertySet >& xProps, const uno::Any& pvargIndex, const uno::Any& pvarColumn ) : m_xProps( xProps ), m_pvargIndex( pvargIndex ), m_pvarColumn( pvarColumn )
 {
 }
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 18c74ffdff30..58ca2182cda6 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -27,6 +27,8 @@ using namespace ooo::vba;
 
 const OUString SVALUE( "MultiPageValue" );
 
+namespace {
+
 class PagesImpl : public cppu::WeakImplHelper< container::XIndexAccess >
 {
     sal_Int32 const mnPages;
@@ -52,6 +54,8 @@ public:
     }
 };
 
+}
+
 ScVbaMultiPage::ScVbaMultiPage(
         const uno::Reference< ov::XHelperInterface >& xParent,
         const uno::Reference< uno::XComponentContext >& xContext,