diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:24:23 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:24:23 +0000 |
| commit | 3b2f2f8b109d26284439ce51bd09106dadd369df (patch) | |
| tree | 00f4258feaebbb4ee6956de7967d21afbd241fa4 /shell/source/win32/simplemail | |
| parent | 1873ed5dce171a8dde1a22c46701be5749024e88 (diff) | |
INTEGRATION: CWS warnings01 (1.3.14); FILE MERGED
2006/03/10 15:11:03 pl 1.3.14.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'shell/source/win32/simplemail')
| -rw-r--r-- | shell/source/win32/simplemail/senddoc.cxx | 18 | ||||
| -rw-r--r-- | shell/source/win32/simplemail/simplemapi.hxx | 10 |
2 files changed, 22 insertions, 6 deletions
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index 7b35605b1d94..042bc55c56db 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: senddoc.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:07:49 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:24:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,7 +46,13 @@ #endif #define WIN32_LEAN_AND_MEAN +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif #include <tchar.h> #include <iostream> @@ -147,7 +153,7 @@ void initAttachementList(MapiAttachmentList_t* pMapiAttachmentList) MapiFileDesc mfd; ZeroMemory(&mfd, sizeof(mfd)); mfd.lpszPathName = const_cast<char*>(iter->c_str()); - mfd.nPosition = -1; + mfd.nPosition = sal::static_int_cast<ULONG>(-1); pMapiAttachmentList->push_back(mfd); } } @@ -295,7 +301,11 @@ int main(int argc, char* argv[]) mapi.MAPILogoff(hSession, 0, 0, 0); } } - catch (const std::runtime_error& ex) + catch (const std::runtime_error& + #if OSL_DEBUG_LEVEL > 0 + ex + #endif + ) { OSL_ENSURE(false, ex.what()); } diff --git a/shell/source/win32/simplemail/simplemapi.hxx b/shell/source/win32/simplemail/simplemapi.hxx index f8318bc7546e..0945e7bdef7e 100644 --- a/shell/source/win32/simplemail/simplemapi.hxx +++ b/shell/source/win32/simplemail/simplemapi.hxx @@ -4,9 +4,9 @@ * * $RCSfile: simplemapi.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:08:26 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:24:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,9 +37,15 @@ #define INCLUDED_SIMPLEMAPI_HXX #define WIN32_LEAN_AND_MEAN +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> #include <mapi.h> #include <mapix.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif class CSimpleMapi { |