1 files changed, 4 insertions, 24 deletions
diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx
index f40f6263512d..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,36 +25,16 @@
 
 #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;
 }