diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:39:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:39:50 +0000 |
| commit | 226c57e697948b4b5abf10f7b34e1f43f8f26406 (patch) | |
| tree | 1115990becdcb0cd8b5f3159ab8a575616df7b4d | |
| parent | d631ef68ffb9a609858562dea5e2a99cc2178559 (diff) | |
INTEGRATION: CWS warnings01 (1.1.122); FILE MERGED
2006/01/31 13:35:23 sb 1.1.122.1: #i53898# Made code warning-free.
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx | 2 | ||||
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx index e0b1b153b4a1..04056c8b9222 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx @@ -6,7 +6,9 @@ #include "registryexception.hxx" #endif +#pragma warning(push, 1) /* disable warnings within system headers */ #include <windows.h> +#pragma warning(pop) ////////////////////////////////////////////////////////////////////// // Konstruktion/Destruktion diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx index 813d62db1c64..4449fbb68c72 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx @@ -6,8 +6,11 @@ #include "registryvalueimpl.hxx" #endif -#include <malloc.h> +#pragma warning(push, 1) /* disable warnings within system headers */ #include <windows.h> +#pragma warning(pop) + +#include <malloc.h> #include <assert.h> #include "stringconverter.hxx" |