extensions/source/activex/so_activex.cxx | 8 -------- shell/source/win32/spsupp/spsuppServ.cxx | 8 -------- winaccessibility/source/UAccCOM/UAccCOM.cxx | 8 -------- winaccessibility/source/service/AccObject.cxx | 8 -------- 4 files changed, 32 deletions(-)
New commits: commit cbd2e455b63b512a3a6e630f646d74774113d3ed Author: Mike Kaganski <[email protected]> AuthorDate: Mon Nov 10 12:58:49 2025 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Wed Nov 19 08:36:29 2025 +0100 Drop silencing clang-cl -Wextra-tokens in midl-generated code The following commits introduced these: 77a39107b1d629022d3ba8711f7a7051e9461280 (Silence clang-cl -Wextra-tokens in midl-generated code, 2015-11-28); 5ccdc4187bd679c41d89b920847fe0c04d81bdb8 (Silence clang-cl -Wextra-tokens in midl-generated code, 2015-11-30); 34604446fc81be99ccee28f1977bf85e6abfab45 (Various clang-cl/loplugin warnings, 2017-03-14). The problem was, that some versions of midl compiler generated an invalid code like "#endif !_MIDL_USE_GUIDDEF_", which caused warnings in gcc and clang (see e.g. https://stackoverflow.com/q/29153518/1397376). I see that as of VS 2022, this problem is not reproducible, so let's drop these. Change-Id: Icce797ae6fa8b1aca17ca0b5051e2af606126bf8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194010 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index 8d4575c02afd..38d32aa6e60f 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -25,15 +25,7 @@ #include <initguid.h> #include <so_activex.h> -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wextra-tokens" - // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code -#endif #include <so_activex_i.c> -#if defined __clang__ -#pragma clang diagnostic pop -#endif #include "SOActiveX.h" diff --git a/shell/source/win32/spsupp/spsuppServ.cxx b/shell/source/win32/spsupp/spsuppServ.cxx index 17d0797ed98e..ea82e041c19e 100644 --- a/shell/source/win32/spsupp/spsuppServ.cxx +++ b/shell/source/win32/spsupp/spsuppServ.cxx @@ -8,15 +8,7 @@ */ // Include MIDL-generated file -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wextra-tokens" - // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code -#endif #include <spsupp_i.c> -#if defined __clang__ -#pragma clang diagnostic pop -#endif #include <memory> #include <olectl.h> diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx index 68b0d040b114..37da8a6b6a3f 100644 --- a/winaccessibility/source/UAccCOM/UAccCOM.cxx +++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx @@ -23,16 +23,8 @@ #include <UAccCOM.h> #include <accHelper.hxx> -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored \ - "-Wextra-tokens" // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code -#endif #include <UAccCOM_i.c> #include <ia2_api_all_i.c> -#if defined __clang__ -#pragma clang diagnostic pop -#endif #include "MAccessible.h" #include "EnumVariant.h" diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index aafb82bd7fa9..589af9b18f27 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -37,15 +37,7 @@ #include <AccObject.hxx> #include <AccEventListener.hxx> -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wextra-tokens" - // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code -#endif #include <UAccCOM_i.c> -#if defined __clang__ -#pragma clang diagnostic pop -#endif using namespace com::sun::star::uno; using namespace com::sun::star::accessibility;
