summaryrefslogtreecommitdiff
path: root/dtrans
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 05:04:48 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 05:04:48 +0000
commit17b9b527f376b91dfff2205e033977dbb8390159 (patch)
tree34363bda6a1ed539ddea537df19f80da43f965d9 /dtrans
parent313e861a0b01a16cc17e40bc7e34e4598e23d563 (diff)
INTEGRATION: CWS warnings01 (1.8.4); FILE MERGED
2006/03/09 20:31:53 pl 1.8.4.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'dtrans')
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.hxx14
1 files changed, 10 insertions, 4 deletions
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index 70c511741ea7..d2248a4c829c 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: DataFmtTransl.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 18:23:03 $
+ * last change: $Author: hr $ $Date: 2006-06-20 06:04:48 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -57,11 +57,17 @@
#include <sal/types.h>
#endif
-#ifndef _RTL_USTRING_
-#include <rtl/ustring>
+#ifndef _RTL_USTRING_HXX_
+#include <rtl/ustring.hxx>
#endif
+#if defined _MSC_VER
+#pragma warning(push,1)
+#endif
#include <windows.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
//-----------------------------------------------
// declaration