diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:23:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:23:45 +0000 |
| commit | 3b7af6d48dc40031045479ea8bde7fec7a7e8236 (patch) | |
| tree | 03cec3d260f3826318519bf057faea73cd764f21 /shell | |
| parent | 27f0fe7102fd578380a7e0b9f2d98f99926f179c (diff) | |
INTEGRATION: CWS mingwport06 (1.6.38); FILE MERGED
2007/08/27 14:27:00 vg 1.6.38.2: #i75499# pragma for MSVC
2007/08/24 13:14:41 vg 1.6.38.1: #i75499# pragma is for MSVC
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/ooofilt/propspec.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx index 2402137f8bcc..32c08d16e11a 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx @@ -4,9 +4,9 @@ * * $RCSfile: propspec.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2007-03-26 13:50:50 $ + * last change: $Author: kz $ $Date: 2007-09-06 14:23:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,7 +47,9 @@ #pragma warning(push, 1) #endif #include <windows.h> +#ifdef _MSC_VER #pragma warning(disable: 4512) +#endif #include <filter.h> #if defined _MSC_VER #pragma warning(pop) @@ -162,9 +164,13 @@ CFullPropSpec & CFullPropSpec::operator=( CFullPropSpec const & Property ) // Clean up. this->CFullPropSpec::~CFullPropSpec(); +#ifdef _MSC_VER #pragma warning( disable : 4291 ) // unmatched operator new +#endif new (this) CFullPropSpec( Property ); +#ifdef _MSC_VER #pragma warning( default : 4291 ) +#endif return *this; } CFullPropSpec::~CFullPropSpec() |