remove some old MSVC workarounds

Change-Id: I6abd8aaffb27b3c85df7c0518f7f576be4e32222
Reviewed-on: https://gerrit.libreoffice.org/36660
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 21 insertions, 26 deletions

diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index b5302709667d..2d427c01ef8c 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -43,18 +43,18 @@ Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId(  )
 
 Sequence<Type> SAL_CALL OFormsCollection::getTypes()
 {
-    return concatSequences(OInterfaceContainer::getTypes(), FormsCollectionComponentBase::getTypes(), OFormsCollection_BASE::getTypes());
+    return concatSequences(OInterfaceContainer::getTypes(), ::cppu::OComponentHelper::getTypes(), OFormsCollection_BASE::getTypes());
 }
 
 OFormsCollection::OFormsCollection(const Reference<XComponentContext>& _rxFactory)
-    :FormsCollectionComponentBase( m_aMutex )
+    : ::cppu::OComponentHelper( m_aMutex )
     ,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XForm>::get() )
     ,OFormsCollection_BASE()
 {
 }
 
 OFormsCollection::OFormsCollection( const OFormsCollection& _cloneSource )
-    :FormsCollectionComponentBase( m_aMutex )
+    : ::cppu::OComponentHelper( m_aMutex )
     ,OInterfaceContainer( m_aMutex, _cloneSource )
     ,OFormsCollection_BASE()
 {
@@ -62,7 +62,7 @@ OFormsCollection::OFormsCollection( const OFormsCollection& _cloneSource )
 
 OFormsCollection::~OFormsCollection()
 {
-    if (!FormsCollectionComponentBase::rBHelper.bDisposed)
+    if (!::cppu::OComponentHelper::rBHelper.bDisposed)
     {
         acquire();
         dispose();
@@ -77,7 +77,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType)
         aReturn = OInterfaceContainer::queryInterface(_rType);
 
         if (!aReturn.hasValue())
-            aReturn = FormsCollectionComponentBase::queryAggregation(_rType);
+            aReturn = ::cppu::OComponentHelper::queryAggregation(_rType);
     }
 
     return aReturn;
@@ -121,7 +121,7 @@ void OFormsCollection::disposing()
         SAL_INFO( "forms.component", "forms::OFormsCollection::disposing" );
         OInterfaceContainer::disposing();
     }
-    FormsCollectionComponentBase::disposing();
+    ::cppu::OComponentHelper::disposing();
     m_xParent = nullptr;
 }
 
diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx
index 50e3f51a3864..5493a6c2f5a1 100644
--- a/forms/source/component/FormsCollection.hxx
+++ b/forms/source/component/FormsCollection.hxx
@@ -35,13 +35,10 @@ namespace frm
 // Implements the UNO Container for Forms and contains all assigned Forms.
 // It can either represent the Context for Forms or be passed a Context.
 
-typedef ::cppu::OComponentHelper FormsCollectionComponentBase;
-typedef ::cppu::ImplHelper2<    css::form::XForms
-                                ,css::lang::XServiceInfo > OFormsCollection_BASE;
-
-// else MSVC kills itself on some statements
+typedef ::cppu::ImplHelper2< css::form::XForms
+                             ,css::lang::XServiceInfo > OFormsCollection_BASE;
 class OFormsCollection
-        :public FormsCollectionComponentBase
+        :public ::cppu::OComponentHelper
         ,public OInterfaceContainer
         ,public OFormsCollection_BASE
 {
@@ -54,7 +51,7 @@ public:
     virtual ~OFormsCollection() override;
 
 public:
-    DECLARE_UNO3_AGG_DEFAULTS(OFormsCollection, FormsCollectionComponentBase)
+    DECLARE_UNO3_AGG_DEFAULTS(OFormsCollection, ::cppu::OComponentHelper)
 
     virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
@@ -135,11 +132,11 @@ public:
     virtual void SAL_CALL removeScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1) override
         { OInterfaceContainer::removeScriptListener(p1); }
     virtual void SAL_CALL dispose() override
-        { FormsCollectionComponentBase::dispose(); }
+        { ::cppu::OComponentHelper::dispose(); }
     virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override
-        { FormsCollectionComponentBase::addEventListener(p1); }
+        { ::cppu::OComponentHelper::addEventListener(p1); }
     virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override
-        { FormsCollectionComponentBase::removeEventListener(p1); }
+        { ::cppu::OComponentHelper::removeEventListener(p1); }
     virtual void SAL_CALL addContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) override
         { OInterfaceContainer::addContainerListener(p1); }
     virtual void SAL_CALL removeContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) override
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 2b57d987951b..80fb45eec122 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -275,9 +275,7 @@ private:
 };
 
 typedef ::cppu::ImplHelper1< css::form::XFormComponent> OFormComponents_BASE;
-typedef ::cppu::OComponentHelper FormComponentsBase;
-    // else MSVC kills itself on some statements
-class OFormComponents   :public FormComponentsBase
+class OFormComponents   :public ::cppu::OComponentHelper
                         ,public OInterfaceContainer
                         ,public OFormComponents_BASE
 {
@@ -290,7 +288,7 @@ public:
     OFormComponents( const OFormComponents& _cloneSource );
     virtual ~OFormComponents() override;
 
-    DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, FormComponentsBase)
+    DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, ::cppu::OComponentHelper)
 
     virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 492c4b063d5f..efeda375b814 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -1252,7 +1252,7 @@ Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType)
         aReturn = OInterfaceContainer::queryInterface(_rType);
 
         if (!aReturn.hasValue())
-            aReturn = FormComponentsBase::queryAggregation(_rType);
+            aReturn =  ::cppu::OComponentHelper::queryAggregation(_rType);
     }
 
     return aReturn;
@@ -1261,12 +1261,12 @@ Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType)
 
 Sequence<Type> SAL_CALL OFormComponents::getTypes()
 {
-    return ::comphelper::concatSequences(OInterfaceContainer::getTypes(), FormComponentsBase::getTypes(), OFormComponents_BASE::getTypes());
+    return ::comphelper::concatSequences(OInterfaceContainer::getTypes(),  ::cppu::OComponentHelper::getTypes(), OFormComponents_BASE::getTypes());
 }
 
 
 OFormComponents::OFormComponents(const Reference<XComponentContext>& _rxFactory)
-    :FormComponentsBase( m_aMutex )
+    : ::cppu::OComponentHelper( m_aMutex )
     ,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XFormComponent>::get() )
     ,OFormComponents_BASE()
 {
@@ -1274,7 +1274,7 @@ OFormComponents::OFormComponents(const Reference<XComponentContext>& _rxFactory)
 
 
 OFormComponents::OFormComponents( const OFormComponents& _cloneSource )
-    :FormComponentsBase( m_aMutex )
+    : ::cppu::OComponentHelper( m_aMutex )
     ,OInterfaceContainer( m_aMutex, _cloneSource )
     ,OFormComponents_BASE()
 {
@@ -1283,7 +1283,7 @@ OFormComponents::OFormComponents( const OFormComponents& _cloneSource )
 
 OFormComponents::~OFormComponents()
 {
-    if (!FormComponentsBase::rBHelper.bDisposed)
+    if (! ::cppu::OComponentHelper::rBHelper.bDisposed)
     {
         acquire();
         dispose();
@@ -1295,7 +1295,7 @@ OFormComponents::~OFormComponents()
 void OFormComponents::disposing()
 {
     OInterfaceContainer::disposing();
-    FormComponentsBase::disposing();
+     ::cppu::OComponentHelper::disposing();
     m_xParent = nullptr;
 }