diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:01:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:01:25 +0000 |
| commit | 56996f38ad8331c4f9b2da515c0c5e2c6dd79700 (patch) | |
| tree | 44d1c69eb20e11cf8b53aff8b8510ef13703c651 /dtrans/source/win32/clipb/WinClipbImpl.hxx | |
| parent | 851d6c7c1f5d740314b677e68cebdf4b3bb19f79 (diff) | |
INTEGRATION: CWS warnings01 (1.10.4); FILE MERGED
2006/03/09 20:31:44 pl 1.10.4.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'dtrans/source/win32/clipb/WinClipbImpl.hxx')
| -rw-r--r-- | dtrans/source/win32/clipb/WinClipbImpl.hxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx index cfd8302607ca..31770a556688 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.hxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx @@ -4,9 +4,9 @@ * * $RCSfile: WinClipbImpl.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-08 18:14:55 $ + * last change: $Author: hr $ $Date: 2006-06-20 06:01:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,8 +45,8 @@ #include <sal/types.h> #endif -#ifndef _RTL_USTRING_ -#include <rtl/ustring> +#ifndef _RTL_USTRING_HXX_ +#include <rtl/ustring.hxx> #endif #ifndef _COM_SUN_STAR_DATATRANSFER_XTRANSFERABLE_HPP_ @@ -65,7 +65,13 @@ #include "..\..\inc\MtaOleClipb.hxx" #endif +#if defined _MSC_VER +#pragma warning(push,1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif class CWinClipboard; class CXNotifyingDataObject; |