INTEGRATION: CWS warnings01 (1.4.14); FILE MERGED

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

shell/inc/internal/config.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: config.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:35:31 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 14:12:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,7 +36,7 @@
 #ifndef CONFIG_HXX_INCLUDED
 #define CONFIG_HXX_INCLUDED
 
-#pragma warning (disable : 4786 4503)
+#pragma warning (disable : 4786 4503 4917)
 
 #include <tchar.h>
 

shell/inc/internal/propsheets.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: propsheets.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:38:17 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 14:13:32 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,7 +40,13 @@
 #include "internal/metainforeader.hxx"
 #endif
 
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
 #include <shlobj.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
 #include <string>
 #include <memory>