summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 02:37:53 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 02:37:53 +0000
commitfdf9e46ee0e8bfb47fda845147e1c44aae214997 (patch)
tree59de83aa1277c45ed43d9441103442ce4dc260a1
parent0704a7876e1bfa6d5bcf654fdb7cb09812a3fa21 (diff)
INTEGRATION: CWS warnings01 (1.3.18); FILE MERGED
2006/04/07 20:57:57 sb 1.3.18.2: RESYNC: (1.3-1.4); FILE MERGED 2006/01/31 13:35:20 sb 1.3.18.1: #i53898# Made code warning-free.
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx b/setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx
index c6f6dc6ea32a..e45247c65157 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: reg4msdocmsi.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2006-03-06 14:04:11 $
+ * last change: $Author: hr $ $Date: 2006-06-20 03:37:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -33,10 +33,13 @@
*
************************************************************************/
+#pragma warning(push, 1) /* disable warnings within system headers */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#include <tchar.h>
#include <msiquery.h>
+#pragma warning(pop)
+
+#include <tchar.h>
#ifndef _REGISTER_HXX_
#include "register.hxx"