diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:25:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:25:31 +0000 |
| commit | 146edc00230a66fe0d33c24a97c462bdd0786a3f (patch) | |
| tree | 0f2e03fee6141b27cd2e7356d072887e64a230b8 /shell | |
| parent | ab8882f9f583f2da1294a3444a8119ff54922353 (diff) | |
INTEGRATION: CWS warnings01 (1.3.14); FILE MERGED
2006/03/10 15:11:04 pl 1.3.14.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/sysshell/systemshell.cxx | 13 | ||||
| -rw-r--r-- | shell/source/win32/workbench/TestSmplMail.cxx | 10 |
2 files changed, 18 insertions, 5 deletions
diff --git a/shell/source/win32/sysshell/systemshell.cxx b/shell/source/win32/sysshell/systemshell.cxx index d5b71906b727..7eb97d24e55b 100644 --- a/shell/source/win32/sysshell/systemshell.cxx +++ b/shell/source/win32/sysshell/systemshell.cxx @@ -4,9 +4,9 @@ * * $RCSfile: systemshell.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:11:08 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:25:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,7 +45,14 @@ #include <osl/file.hxx> #endif +#if defined _MSC_VER +#pragma warning(push, 1) +#pragma warning(disable:4917) +#endif #include <Shlobj.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif namespace SystemShell { @@ -57,7 +64,7 @@ namespace SystemShell @param aFileUrl The file url of the document. */ - void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType) + void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& /*aMimeType*/) { rtl::OUString system_path; osl::FileBase::RC rc = osl::FileBase::getSystemPathFromFileURL(aFileUrl, system_path); diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx index e912e67e5636..28db11a6c866 100644 --- a/shell/source/win32/workbench/TestSmplMail.cxx +++ b/shell/source/win32/workbench/TestSmplMail.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TestSmplMail.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:11:41 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:25:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,7 +71,13 @@ #endif #include <stdio.h> +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif #include <osl/file.hxx> |