diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:40:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:40:14 +0000 |
| commit | 02f7a6fba0217f152095929c9a4d99261685c4e1 (patch) | |
| tree | 82200f422fd7c4d3c5fe551d9a7625520f78d2bd /setup_native/source | |
| parent | 226c57e697948b4b5abf10f7b34e1f43f8f26406 (diff) | |
INTEGRATION: CWS warnings01 (1.2.18); FILE MERGED
2006/01/31 13:35:24 sb 1.2.18.1: #i53898# Made code warning-free.
Diffstat (limited to 'setup_native/source')
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx | 7 | ||||
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx index 5902fc730d2c..0b5512913589 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx @@ -4,9 +4,9 @@ * * $RCSfile: registrywnt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:37:39 $ + * last change: $Author: hr $ $Date: 2006-06-20 03:40:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,10 @@ // //--------------------------------------- +#pragma warning(push, 1) /* disable warnings within system headers */ #include <windows.h> +#pragma warning(pop) + #include <malloc.h> #ifndef _REGISTRYWNT_HXX_ diff --git a/setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx b/setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx index d0fe79e95075..562135d5c90a 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: stringconverter.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:38:19 $ + * last change: $Author: hr $ $Date: 2006-06-20 03:40:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,10 @@ #include "stringconverter.hxx" #endif +#pragma warning(push, 1) /* disable warnings within system headers */ #include <windows.h> +#pragma warning(pop) + #include <malloc.h> /** Convert a Unicode string to an ANSI string based on CP_ACP |