diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:04:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:04:37 +0000 |
| commit | 313e861a0b01a16cc17e40bc7e34e4598e23d563 (patch) | |
| tree | fcc649ca1d82db460618b6911beb8f1583191cd8 /dtrans/source/win32/dtobj/DataFmtTransl.cxx | |
| parent | INTEGRATION: CWS warnings01 (1.8.4); FILE MERGED (diff) | |
| download | core-313e861a0b01a16cc17e40bc7e34e4598e23d563.tar.gz core-313e861a0b01a16cc17e40bc7e34e4598e23d563.zip | |
INTEGRATION: CWS warnings01 (1.19.4); FILE MERGED
2006/03/09 20:31:52 pl 1.19.4.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'dtrans/source/win32/dtobj/DataFmtTransl.cxx')
| -rw-r--r-- | dtrans/source/win32/dtobj/DataFmtTransl.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index c3d295e3d5bb..92164b768357 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: DataFmtTransl.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2005-09-08 18:22:45 $ + * last change: $Author: hr $ $Date: 2006-06-20 06:04:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,13 +77,19 @@ #include "Fetc.hxx" #endif +#if defined _MSC_VER +#pragma warning(push,1) +#pragma warning(disable:4917) +#endif #include <windows.h> - #if (_MSC_VER < 1300) #include <olestd.h> #endif - #include <shlobj.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif + //------------------------------------------------------------------------ // namespace directives @@ -163,7 +169,7 @@ CFormatEtc CDataFormatTranslator::getFormatEtcFromDataFlavor( const DataFlavor& OSL_ENSURE( sal_False, "Unexpected error" ); } - return getFormatEtcForClipformat( cf ); + return sal::static_int_cast<CFormatEtc>(getFormatEtcForClipformat( sal::static_int_cast<CLIPFORMAT>(cf) )); } //------------------------------------------------------------------------ @@ -233,7 +239,7 @@ CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformatName( const if ( !aClipFmtName.getLength( ) ) return CFormatEtc( CF_INVALID ); - CLIPFORMAT cf = RegisterClipboardFormatW( aClipFmtName.getStr( ) ); + CLIPFORMAT cf = sal::static_int_cast<CLIPFORMAT>(RegisterClipboardFormatW( aClipFmtName.getStr( ) )); return getFormatEtcForClipformat( cf ); } |