summaryrefslogtreecommitdiff
path: root/setup_native/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-09-25 12:07:22 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-09-25 12:07:22 +0000
commitba59cdc662c2a3d0ebb7c9ce8ccf878fbf760f61 (patch)
tree50c210476ef24bfab4551bace45ebb5d2402b548 /setup_native/source
parent242ab201531dc746300a6e0c303ed24f47c367f8 (diff)
INTEGRATION: CWS obo05 (1.1.180); FILE MERGED
2006/06/30 14:13:31 obo 1.1.180.1: #i53611# disable C4350
Diffstat (limited to 'setup_native/source')
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
index 1c7ebf8d66e5..c2d29f2ad146 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
@@ -6,6 +6,8 @@
#include "registrywnt.hxx"
#include "registryw9x.hxx"
+#pragma warning(disable : 4350)
+
//------------------------------
//
//------------------------------