diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:07:29 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:07:29 +0000 |
| commit | 61fc13b99e146b4ad1cbc2cb7ab25545ccb41a79 (patch) | |
| tree | b186ba5fb0331ecd6759b4bb0a2de925ad0ce3cd | |
| parent | 98e9b2da389315d34fb063de17b9d70f2f213e2a (diff) | |
INTEGRATION: CWS warnings01 (1.14.4); FILE MERGED
2006/03/09 20:31:59 pl 1.14.4.1: #i55991# removed warnings for windows platform
| -rw-r--r-- | dtrans/source/win32/misc/ImplHelper.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx index 5d0f99255dd7..5a824a0442e8 100644 --- a/dtrans/source/win32/misc/ImplHelper.cxx +++ b/dtrans/source/win32/misc/ImplHelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ImplHelper.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-08 18:28:10 $ + * last change: $Author: hr $ $Date: 2006-06-20 06:07:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,7 +55,13 @@ #endif #include <memory> +#if defined _MSC_VER +#pragma warning(push,1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif //------------------------------------------------------------------------ // defines @@ -92,8 +98,8 @@ sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset ) sal_uInt32 winChrs = rtl_getBestWindowsCharsetFromTextEncoding( txtEnc ); CHARSETINFO chrsInf; - sal_Bool bRet = TranslateCharsetInfo( - (DWORD*)winChrs, &chrsInf, TCI_SRCCHARSET ); + sal_Bool bRet = TranslateCharsetInfo( (DWORD*)winChrs, &chrsInf, TCI_SRCCHARSET ) ? + sal_True : sal_False; // if one of the above functions fails // we will return the current ANSI codepage |