diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:30:08 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:30:08 +0000 |
| commit | 62887fa98ecf975241094892603cc12b7878469a (patch) | |
| tree | 9fac7fa0a5c013d4947b50527b5ffd09c92c8b9a /setup_native/source | |
| parent | c56ec7d0e54240ab00bca8a1d9ba79eb8bbaf9ee (diff) | |
INTEGRATION: CWS mingwport06 (1.6.18); FILE MERGED
2007/08/24 13:12:57 vg 1.6.18.1: #i75499# pragma is for MSVC
Diffstat (limited to 'setup_native/source')
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/registrar.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx index 726389c72b4a..11d073e4451f 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx @@ -19,7 +19,9 @@ #endif #include <assert.h> +#ifdef _MSC_VER #pragma warning(disable: 4350 4482) +#endif const int MSWORD = 0x1; const int MSEXCEL = 0x2; |