diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:23:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:23:55 +0000 |
| commit | 1873ed5dce171a8dde1a22c46701be5749024e88 (patch) | |
| tree | 1a617179280bf7dc16ef87e7fbc6fc4dc4767bae /shell | |
| parent | c18258e4752937cc923d617a46a61ac6127f41af (diff) | |
INTEGRATION: CWS warnings01 (1.4.14); FILE MERGED
2006/03/10 15:11:03 pl 1.4.14.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/util/registry.cxx | 16 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/util/utilities.cxx | 9 |
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, |