summaryrefslogtreecommitdiff
path: root/dtrans
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 05:06:56 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 05:06:56 +0000
commit723445a3581de1f7a6904e84cf7eda9bb503f4f8 (patch)
tree2330e126a645836f32ada8ae0ae7c2f67453a16f /dtrans
parente188d7284ca93b80f0c2a61bf941841af29b875a (diff)
INTEGRATION: CWS warnings01 (1.15.4); FILE MERGED
2006/03/09 20:31:58 pl 1.15.4.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'dtrans')
-rw-r--r--dtrans/source/win32/ftransl/ftransl.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 906032b39809..52733aa47643 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: ftransl.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 18:27:13 $
+ * last change: $Author: hr $ $Date: 2006-06-20 06:06:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -53,7 +53,14 @@
#include "..\misc\ImplHelper.hxx"
#endif
+#if defined _MSC_VER
+#pragma warning(push,1)
+#pragma warning(disable:4917)
+#endif
#include <shlobj.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
//------------------------------------------------------------------------
// defines