diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-08 14:41:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-08 14:41:30 +0000 |
| commit | 6260348ae5bd5cdf85e8cf8b0624a427d2526420 (patch) | |
| tree | b4cd304298a7bfdc1e7345bc8fd1633bcfb59137 /svtools | |
| parent | c243427501966c5fe3f5f8b294ad36bee82da25c (diff) | |
INTEGRATION: CWS draw8 (1.1.152); FILE MERGED
2003/03/25 08:49:02 thb 1.1.152.2: #107878# Was DELETEZ before, added zeroing
2003/03/24 16:35:54 thb 1.1.152.1: #107878# Corrected to array delete
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/imivctl2.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 70220537f8c4..48a588e2d32e 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: imivctl2.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: pb $ $Date: 2001-05-07 10:33:55 $ + * last change: $Author: rt $ $Date: 2003-04-08 15:41:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -592,7 +592,7 @@ IcnGridMap_Impl::IcnGridMap_Impl(SvxIconChoiceCtrl_Impl* pView) IcnGridMap_Impl::~IcnGridMap_Impl() { - DELETEZ(_pGridMap); + delete[] _pGridMap, _pGridMap=0; } void IcnGridMap_Impl::Expand() @@ -611,7 +611,7 @@ void IcnGridMap_Impl::Expand() BOOL* pNewGridMap = new BOOL[nNewGridRows*nNewGridCols]; memset( pNewGridMap, 0, nNewGridRows * nNewGridCols * sizeof(BOOL) ); memcpy( pNewGridMap, _pGridMap, _nGridRows * _nGridCols * sizeof(BOOL) ); - delete _pGridMap; + delete[] _pGridMap; _pGridMap = pNewGridMap; _nGridRows = nNewGridRows; _nGridCols = nNewGridCols; @@ -820,7 +820,7 @@ void IcnGridMap_Impl::Clear() { if( _pGridMap ) { - DELETEZ(_pGridMap); + delete[] _pGridMap, _pGridMap=0; _nGridRows = 0; _nGridCols = 0; _aLastOccupiedGrid.SetEmpty(); |