diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:21:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:21:43 +0000 |
| commit | cce1b146f6fc79d691eb4333043d1bf6a048d6ea (patch) | |
| tree | addb64b7f3ac7be4ddea7ce90025e59666b154a0 /shell | |
| parent | 9ad8ca558bb4bd21b9440b57261371e666552e14 (diff) | |
INTEGRATION: CWS warnings01 (1.4.14); FILE MERGED
2006/03/10 15:11:00 pl 1.4.14.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/columninfo/columninfo.cxx | 4 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index 8ba3c00b22fa..6ff57ede9a0a 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -4,9 +4,9 @@ * * $RCSfile: columninfo.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:59:34 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:21:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index d941a1d20a05..8c3fa3338442 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ooofilt.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:00:59 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:21:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -82,7 +82,13 @@ // //-------------------------------------------------------------------------- +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif #include <string.h> #include <filter.h> #include <filterr.h> |