diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:25:51 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:25:51 +0000 |
| commit | e210831c62eee86564ca5a6fbad19214f832ae0c (patch) | |
| tree | 768c49f1d082a7ac33354a4e9e644b30cc837d65 /sfx2/source/appl/shutdowniconw32.cxx | |
| parent | f8be882dd7a0653caf4108552cdc8e8021d5b871 (diff) | |
INTEGRATION: CWS mingwport06 (1.44.16); FILE MERGED
2007/08/27 14:26:30 vg 1.44.16.1: #i75499# pragma for MSVC
Diffstat (limited to 'sfx2/source/appl/shutdowniconw32.cxx')
| -rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 6feb1dd62b..e3200a8f56 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shutdowniconw32.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: hr $ $Date: 2007-08-01 11:04:12 $ + * last change: $Author: kz $ $Date: 2007-09-06 14:25:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,7 +39,9 @@ #ifdef WNT // necessary to include system headers without warnings +#ifdef _MSC_VER #pragma warning(disable:4668 4917) +#endif // Support Windows 95 too #undef WINVER |