1 files changed, 12 insertions, 33 deletions

diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx
index f5497fc0efdd..97ea07568fde 100644
--- a/extensions/source/activex/SODispatchInterceptor.cxx
+++ b/extensions/source/activex/SODispatchInterceptor.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-// SODispatchInterceptor.cpp : Implementation of CHelpApp and DLL registration.
+// SODispatchInterceptor.cxx : Implementation of CHelpApp and DLL registration.
 
 #include <sal/config.h>
 
@@ -25,43 +25,21 @@
 
 #include <stdio.h>
 #include "StdAfx2.h"
+#include <so_activex.h>
 #include "SOActiveX.h"
 #include "SODispatchInterceptor.h"
 #include "com_uno_helper.h"
 #include <sal/macros.h>
 
-#if defined __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#endif
-#include <so_activex.h>
-#if defined __clang__
-#pragma clang diagnostic pop
-#endif
-
 COM_DECLSPEC_NOTHROW STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid)
 {
-    static const IID* arr[] =
-    {
-        &IID_ISODispatchInterceptor,
-    };
-
-    for (std::size_t i=0;i<SAL_N_ELEMENTS(arr);i++)
-    {
-#ifdef _MSC_VER
-        if (InlineIsEqualGUID(*arr[i],riid))
-#else
-        if (::ATL::InlineIsEqualGUID(*arr[i],riid))
-#endif
-            return S_OK;
-    }
+    if (InlineIsEqualGUID(IID_ISODispatchInterceptor, riid))
+        return S_OK;
     return S_FALSE;
 }
 
-STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL,
-                                                   BSTR aTargetFrameName,
-                                                   long nSearchFlags,
-                                                   IDispatch FAR* FAR* retVal )
+STDMETHODIMP SODispatchInterceptor::queryDispatch(IDispatch* aURL, BSTR aTargetFrameName,
+                                                  long nSearchFlags, IDispatch** retVal)
 {
     if ( !aURL || !retVal ) return E_FAIL;
 
@@ -116,7 +94,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL,
     return S_OK;
 }
 
-STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts, SAFEARRAY FAR* FAR* retVal)
+STDMETHODIMP SODispatchInterceptor::queryDispatches(SAFEARRAY* aDescripts, SAFEARRAY** retVal)
 {
     if ( !aDescripts || !retVal || SafeArrayGetDim( aDescripts ) != 1 )
         return E_FAIL;
@@ -156,7 +134,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts,
 }
 
 
-STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR* aArgs)
+STDMETHODIMP SODispatchInterceptor::dispatch(IDispatch* aURL, SAFEARRAY* aArgs)
 {
     // get url from aURL
     OLECHAR const * pUrlName = L"Complete";
@@ -211,19 +189,20 @@ STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR
     return S_OK;
 }
 
-STDMETHODIMP SODispatchInterceptor::addStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/)
+STDMETHODIMP SODispatchInterceptor::addStatusListener(IDispatch* /*xControl*/, IDispatch* /*aURL*/)
 {
     // not implemented
     return S_OK;
 }
 
-STDMETHODIMP SODispatchInterceptor::removeStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/)
+STDMETHODIMP SODispatchInterceptor::removeStatusListener(IDispatch* /*xControl*/,
+                                                         IDispatch* /*aURL*/)
 {
     // not implemented
     return S_OK;
 }
 
-STDMETHODIMP SODispatchInterceptor::getInterceptedURLs( SAFEARRAY FAR* FAR* pVal )
+STDMETHODIMP SODispatchInterceptor::getInterceptedURLs(SAFEARRAY** pVal)
 {
     *pVal = SafeArrayCreateVector( VT_BSTR, 0, 3 );