[Libreoffice-commits] core.git: extensions/source

[Mike Kaganski (via logerrit)]

 extensions/source/activex/SOActionsApproval.cxx     |    4 ----
 extensions/source/activex/SOComWindowPeer.cxx       |    4 ----
 extensions/source/activex/SODispatchInterceptor.cxx |    4 ----
 3 files changed, 12 deletions(-)

New commits:
commit c06e4fffd5b1148ba4fad59866ff9efd20e5e3e8
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Aug 23 09:48:31 2022 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Aug 23 09:45:45 2022 +0200

    Drop obsolete code
    
    Clang also defines _MSC_VER macro.
    
    Change-Id: I7e483eb1811a3ce5c78a6721895026d004ca98fe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138712
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/extensions/source/activex/SOActionsApproval.cxx 
b/extensions/source/activex/SOActionsApproval.cxx
index a4092166272b..3ea4ac8dcf33 100644
--- a/extensions/source/activex/SOActionsApproval.cxx
+++ b/extensions/source/activex/SOActionsApproval.cxx
@@ -45,11 +45,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
SOActionsApproval::InterfaceSupportsErrorInfo(
 
     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;
     }
     return S_FALSE;
diff --git a/extensions/source/activex/SOComWindowPeer.cxx 
b/extensions/source/activex/SOComWindowPeer.cxx
index 0a556466d32f..dbd2bcc3e662 100644
--- a/extensions/source/activex/SOComWindowPeer.cxx
+++ b/extensions/source/activex/SOComWindowPeer.cxx
@@ -44,11 +44,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
SOComWindowPeer::InterfaceSupportsErrorInfo(RE
 
     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;
     }
     return S_FALSE;
diff --git a/extensions/source/activex/SODispatchInterceptor.cxx 
b/extensions/source/activex/SODispatchInterceptor.cxx
index f40f6263512d..adffa93fa64c 100644
--- a/extensions/source/activex/SODispatchInterceptor.cxx
+++ b/extensions/source/activex/SODispatchInterceptor.cxx
@@ -48,11 +48,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
SODispatchInterceptor::InterfaceSupportsErrorI
 
     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;
     }
     return S_FALSE;