summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-09-25 12:06:41 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-09-25 12:06:41 +0000
commit7a447d9df05bfd2e33abab9f175a8d2fafab1579 (patch)
tree783c0aaf4b43030a86b41cdfbe5d84e3b75f5827 /setup_native
parent6a0ba5d0b67d8ae0d3dd55923311944568cf905b (diff)
INTEGRATION: CWS obo05 (1.2.76); FILE MERGED
2006/06/30 14:10:25 obo 1.2.76.1: #i53611# disable C4350
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
index 051d03a3e595..4c45d131f7e0 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: registryw9x.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 16:37:02 $
+ * last change: $Author: vg $ $Date: 2006-09-25 13:06:41 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -58,7 +58,7 @@
#include <assert.h>
-#pragma warning(disable : 4786)
+#pragma warning(disable : 4786 4350)
//---------------------------------------
//