From ffa11622ea6fc46c427421490b5cc1137b6f0511 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 27 Oct 2017 19:26:50 +0200 Subject: loplugin:includeform: extensions (Windows) Change-Id: I6619004353fb7e94506e2a75c77b42156f0b6c6d --- extensions/source/activex/SOActionsApproval.cxx | 2 +- extensions/source/activex/SOActionsApproval.h | 2 +- extensions/source/activex/SOActiveX.cxx | 2 +- extensions/source/activex/SOActiveX.h | 2 +- extensions/source/activex/SOComWindowPeer.cxx | 2 +- extensions/source/activex/SOComWindowPeer.h | 2 +- extensions/source/activex/SODispatchInterceptor.cxx | 4 ++-- extensions/source/activex/SODispatchInterceptor.h | 2 +- extensions/source/activex/so_activex.cxx | 6 +++--- extensions/source/ole/jscriptclasses.hxx | 2 +- extensions/source/ole/ole2uno.cxx | 4 ++-- extensions/source/ole/ole2uno.hxx | 2 +- extensions/source/ole/unotypewrapper.cxx | 2 +- extensions/source/ole/unotypewrapper.hxx | 2 +- extensions/source/ole/windata.hxx | 4 ++-- extensions/source/scanner/scanwin.cxx | 2 +- extensions/source/update/check/onlinecheck.cxx | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) (limited to 'extensions') diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx index 548eb33ea78c..6b2d179700e9 100644 --- a/extensions/source/activex/SOActionsApproval.cxx +++ b/extensions/source/activex/SOActionsApproval.cxx @@ -32,7 +32,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif -#include "so_activex.h" +#include #if defined __clang__ #pragma clang diagnostic pop #endif diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h index e61a23357b04..fd0c05331e89 100644 --- a/extensions/source/activex/SOActionsApproval.h +++ b/extensions/source/activex/SOActionsApproval.h @@ -37,7 +37,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif -#include "so_activex.h" +#include #if defined __clang__ #pragma clang diagnostic pop #endif diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index 304b74812756..1105dac8561a 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -32,7 +32,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif -#include "so_activex.h" +#include #if defined __clang__ #pragma clang diagnostic pop #endif diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h index 5f652e6b6752..b850a53a2b01 100644 --- a/extensions/source/activex/SOActiveX.h +++ b/extensions/source/activex/SOActiveX.h @@ -37,7 +37,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif -#include "so_activex.h" +#include #if defined __clang__ #pragma clang diagnostic pop #endif diff --git a/extensions/source/activex/SOComWindowPeer.cxx b/extensions/source/activex/SOComWindowPeer.cxx index a4728a4f0557..4d1da0f2fad8 100644 --- a/extensions/source/activex/SOComWindowPeer.cxx +++ b/extensions/source/activex/SOComWindowPeer.cxx @@ -31,7 +31,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif -#include "so_activex.h" +#include #if defined __clang__ #pragma clang diagnostic pop #endif diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h index 0ff68e8250e6..b06f2efbdd67 100644 --- a/extensions/source/activex/SOComWindowPeer.h +++ b/extensions/source/activex/SOComWindowPeer.h @@ -37,7 +37,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif -#include "so_activex.h" +#include #if defined __clang__ #pragma clang diagnostic pop #endif diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx index 8f90d4fb7f91..ed610c56da8f 100644 --- a/extensions/source/activex/SODispatchInterceptor.cxx +++ b/extensions/source/activex/SODispatchInterceptor.cxx @@ -23,7 +23,7 @@ #include -#include "stdio.h" +#include #include "StdAfx2.h" #include "SOActiveX.h" #include "SODispatchInterceptor.h" @@ -34,7 +34,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif -#include "so_activex.h" +#include #if defined __clang__ #pragma clang diagnostic pop #endif diff --git a/extensions/source/activex/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h index 8705cbfac3c6..dbb2b6a4f031 100644 --- a/extensions/source/activex/SODispatchInterceptor.h +++ b/extensions/source/activex/SODispatchInterceptor.h @@ -33,7 +33,7 @@ #include -#include "so_activex.h" +#include class CSOActiveX; diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index b9858d01ec6b..2b59692ed804 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -23,7 +23,7 @@ // To build a separate proxy/stub DLL, // run nmake -f so_activexps.mk in the project directory. -#include "stdio.h" +#include #include "StdAfx2.h" #include "resource.h" #include @@ -32,7 +32,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif -#include "so_activex.h" +#include #if defined __clang__ #pragma clang diagnostic pop #endif @@ -42,7 +42,7 @@ #pragma clang diagnostic ignored "-Wextra-tokens" // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code #endif -#include "so_activex_i.c" +#include #if defined __clang__ #pragma clang diagnostic pop #endif diff --git a/extensions/source/ole/jscriptclasses.hxx b/extensions/source/ole/jscriptclasses.hxx index 55278d8982b4..5d43b3a6b772 100644 --- a/extensions/source/ole/jscriptclasses.hxx +++ b/extensions/source/ole/jscriptclasses.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_JSCRIPTCLASSES_HXX #define INCLUDED_EXTENSIONS_SOURCE_OLE_JSCRIPTCLASSES_HXX -#include +#include "wincrap.hxx" #include "comifaces.hxx" diff --git a/extensions/source/ole/ole2uno.cxx b/extensions/source/ole/ole2uno.cxx index 59997a142f9f..a42c26fac140 100644 --- a/extensions/source/ole/ole2uno.cxx +++ b/extensions/source/ole/ole2uno.cxx @@ -18,8 +18,8 @@ */ -#include "osl/getglobalmutex.hxx" -#include "rtl/instance.hxx" +#include +#include #include "ole2uno.hxx" using namespace osl; diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index dae716a28d13..a3447a8d952c 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.hxx @@ -25,7 +25,7 @@ #pragma once #endif -#include +#include "wincrap.hxx" #include #include diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx index fa12a9636e53..333ced2f4d45 100644 --- a/extensions/source/ole/unotypewrapper.cxx +++ b/extensions/source/ole/unotypewrapper.cxx @@ -18,7 +18,7 @@ */ #include "unotypewrapper.hxx" -#include "rtl/ustring.hxx" +#include #include #include diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx index e5b4c3c20dca..4414a654b6bb 100644 --- a/extensions/source/ole/unotypewrapper.hxx +++ b/extensions/source/ole/unotypewrapper.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_UNOTYPEWRAPPER_HXX #define INCLUDED_EXTENSIONS_SOURCE_OLE_UNOTYPEWRAPPER_HXX -#include +#include "wincrap.hxx" #include "comifaces.hxx" diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx index 11d7ce57827d..69aa63398d18 100644 --- a/extensions/source/ole/windata.hxx +++ b/extensions/source/ole/windata.hxx @@ -23,7 +23,7 @@ #pragma warning (disable:4668) #pragma warning (disable:4548) -#include "oleidl.h" +#include #if defined __clang__ #pragma clang diagnostic push @@ -45,7 +45,7 @@ #pragma warning (pop) -#include "osl/diagnose.h" +#include namespace ole_adapter { diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 437b408a6918..ef70a9b5adbf 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -44,7 +44,7 @@ #pragma warning (push,1) #pragma warning (disable:4668) #endif -#include "twain/twain.h" +#include #if defined _MSC_VER #pragma warning (pop) #endif diff --git a/extensions/source/update/check/onlinecheck.cxx b/extensions/source/update/check/onlinecheck.cxx index be6912f17afb..fd77299d11ef 100644 --- a/extensions/source/update/check/onlinecheck.cxx +++ b/extensions/source/update/check/onlinecheck.cxx @@ -24,7 +24,7 @@ #include #include -#include +#include "onlinecheck.hxx" #define WIN32_LEAN_AND_MEAN #include -- cgit