diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:06:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 05:06:19 +0000 |
| commit | 97178a9bf1460e34fa707fa9a10b0adefbee81b3 (patch) | |
| tree | 5b85c7d4a9d14910b8d0eefc38c2b3979fc7e876 | |
| parent | d52711cd856811017a8934114513bb5e6b6d0a0f (diff) | |
INTEGRATION: CWS warnings01 (1.4.4); FILE MERGED
2006/03/09 20:31:56 pl 1.4.4.1: #i55991# removed warnings for windows platform
| -rw-r--r-- | dtrans/source/win32/dtobj/TxtCnvtHlp.hxx | 10 | ||||
| -rw-r--r-- | dtrans/source/win32/dtobj/XNotifyingDataObject.hxx | 12 |
2 files changed, 18 insertions, 4 deletions
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx index 8c36208d4323..a0257f73fdae 100644 --- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx +++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx @@ -4,9 +4,9 @@ * * $RCSfile: TxtCnvtHlp.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 18:25:32 $ + * last change: $Author: hr $ $Date: 2006-06-20 06:06:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,7 +49,13 @@ #include "DTransHelper.hxx" #endif +#if defined _MSC_VER +#pragma warning(push,1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif //------------------------------------------------------------------------ // deklarations diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx index 0f1ae9736da5..b5782076aa2f 100644 --- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx +++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx @@ -4,9 +4,9 @@ * * $RCSfile: XNotifyingDataObject.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 18:26:06 $ + * last change: $Author: hr $ $Date: 2006-06-20 06:06:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,8 +50,14 @@ #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> #endif +#if defined _MSC_VER +#pragma warning(push,1) +#endif #include <objidl.h> #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif #include <systools/win32/comtools.hxx> @@ -72,6 +78,8 @@ public: const com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboardOwner >& aXClipOwner, CWinClipbImpl* theWinClipImpl ); + virtual ~CXNotifyingDataObject() {} + //----------------------------------------------------------------- // ole interface implementation //----------------------------------------------------------------- |