summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 13:22:37 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 13:22:37 +0000
commit9438d56d4e8558e73959ce0638cfdd7a1986c6ab (patch)
treebe1cea286d96a41799c561a1b9a59b8000af0867 /shell
parent512668bab15c69e86dcf8d659cab2d7ba79ad104 (diff)
INTEGRATION: CWS warnings01 (1.4.14); FILE MERGED
2006/03/10 15:11:01 pl 1.4.14.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'shell')
-rw-r--r--shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 1c9226b4b65b..81d1874dde95 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: listviewbuilder.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 20:03:14 $
+ * last change: $Author: hr $ $Date: 2006-06-19 14:22:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -55,6 +55,13 @@
#include "internal/config.hxx"
#endif
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#include <commctrl.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
#include <commctrl.h>
#include <tchar.h>