diff options
Diffstat (limited to 'extensions/source/activex/SOActionsApproval.cxx')
-rw-r--r-- | extensions/source/activex/SOActionsApproval.cxx | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx index a4092166272b..6fd6d0888141 100644 --- a/extensions/source/activex/SOActionsApproval.cxx +++ b/extensions/source/activex/SOActionsApproval.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// SOActionsApproval.cpp : Implementation of CHelpApp and DLL registration. +// SOActionsApproval.cxx : Implementation of CHelpApp and DLL registration. #include <sal/config.h> @@ -25,33 +25,14 @@ #include "StdAfx2.h" +#include <so_activex.h> #include "SOActionsApproval.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 SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) { - static const IID* arr[] = { - &IID_ISOActionsApproval, - }; - - 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_ISOActionsApproval, riid)) + return S_OK; return S_FALSE; } |