summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-09-25 12:06:31 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-09-25 12:06:31 +0000
commit6a0ba5d0b67d8ae0d3dd55923311944568cf905b (patch)
tree450793c98e19b69859b23e13c64d183fa17267a6 /setup_native
parentd76007166a1dd24966456e83b547d35d19f8a165 (diff)
INTEGRATION: CWS obo05 (1.4.2); FILE MERGED
2006/06/30 14:09:25 obo 1.4.2.1: #i53611# disable C4350
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registry.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registry.cxx b/setup_native/source/win32/customactions/reg4msdoc/registry.cxx
index 1caec175ebcc..36f21888603c 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registry.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registry.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: registry.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hr $ $Date: 2006-06-20 03:39:15 $
+ * last change: $Author: vg $ $Date: 2006-09-25 13:06:31 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -41,7 +41,7 @@
#include <assert.h>
#include <algorithm>
-#pragma warning(disable : 4786)
+#pragma warning(disable : 4786 4350)
//-----------------------------------------------------
/** Create instance and open the specified Registry key