2 files changed, 20 insertions, 5 deletions
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index 3fecaf22c308..b5af30d9767f 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: registry.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 20:06:57 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 14:23:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,7 +33,13 @@
  *
  ************************************************************************/
 
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
 #include <windows.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
 #include <malloc.h>
 
 #ifndef DBGMACROS_HXX_INCLUDED
@@ -44,7 +50,13 @@
 #include "internal/registry.hxx"
 #endif
 
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
 #include <objbase.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
 
 //---------------------------------------
 //
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index 46ab0bbba7c1..49b0f7ab7e0d 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: utilities.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 20:07:15 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 14:23:55 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -97,7 +97,10 @@ std::wstring GetResString(int ResId)
 {
     wchar_t szResStr[MAX_RES_STRING];
 
-    int rc = LoadStringW(
+    #if OSL_DEBUG_LEVEL > 0
+    int rc =
+    #endif
+    LoadStringW(
         GetModuleHandleW(MODULE_NAME),
         ResId,
         szResStr,