summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-03-26 12:50:50 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-03-26 12:50:50 +0000
commitd24a2cb2758c2e2838393957bdd74922aa0a7fa4 (patch)
treee1c2eb02ca6ab4c1cb79240e7345ee06071db60d /shell
parent64d763d0898ccc36dd4ebe1229049c3988f8b983 (diff)
INTEGRATION: CWS mingwport03 (1.4.32); FILE MERGED
2006/11/09 00:18:05 vg 1.4.32.2: RESYNC: (1.4-1.5); FILE MERGED 2006/09/07 14:32:53 vg 1.4.32.1: #i53572# MinGW port
Diffstat (limited to 'shell')
-rw-r--r--shell/source/win32/shlxthandler/ooofilt/propspec.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
index b69827ce0e05..2402137f8bcc 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.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 01:44:46 $
+ * last change: $Author: vg $ $Date: 2007-03-26 13:50:50 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -160,7 +160,8 @@ inline void * operator new( size_t /*size*/, void * p )
CFullPropSpec & CFullPropSpec::operator=( CFullPropSpec const & Property )
{
// Clean up.
- CFullPropSpec::~CFullPropSpec();
+ this->CFullPropSpec::~CFullPropSpec();
+
#pragma warning( disable : 4291 ) // unmatched operator new
new (this) CFullPropSpec( Property );
#pragma warning( default : 4291 )