INTEGRATION: CWS warnings01 (1.3.14); FILE MERGED

2006/03/10 15:10:55 pl 1.3.14.1: #i55991# removed warnings for windows platform

shell/inc/internal/columninfo.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: columninfo.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:35:11 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 14:12:43 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,7 +36,14 @@
 #ifndef COLUMNINFO_HXX_INCLUDED
 #define COLUMNINFO_HXX_INCLUDED
 
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable:4917)
+#endif
 #include <shlobj.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
 
 
 class CColumnInfo : public IColumnProvider

shell/inc/internal/global.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: global.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:36:33 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 14:13:08 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,7 +36,13 @@
 #ifndef GLOBAL_HXX_INCLUDED
 #define GLOBAL_HXX_INCLUDED
 
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
 #include <windows.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
 
 #ifndef DBGMACROS_HXX_INCLUDED
 #include "internal/dbgmacros.hxx"

shell/inc/internal/infotips.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: infotips.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:37:10 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 14:13:20 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,8 +36,15 @@
 #ifndef INFOTIPS_HXX_INCLUDED
 #define INFOTIPS_HXX_INCLUDED
 
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable:4917)
+#endif
 #include <objidl.h>
 #include <shlobj.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
 #include <string>
 
 class CInfoTip : public IQueryInfo, public IPersistFile