From c00ea79e4a272ac16cc1d94d4f2eb14404d59043 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Fri, 6 Nov 2009 11:03:40 +0000
Subject: cmcfixes66: #i106674# fix remaining new[]/delete mismatches

---
 sw/source/core/doc/doccomp.cxx    | 4 ++--
 sw/source/filter/ww1/w1class.cxx  | 2 +-
 sw/source/filter/ww1/w1filter.cxx | 4 ++--
 sw/source/filter/ww8/ww8par.cxx   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 5fa7731fcb..58e3cccc6f 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -428,7 +428,7 @@ Compare::Compare( ULONG nDiff, CompareData& rData1, CompareData& rData2 )
         SetDiscard( rData2, pDiscard2, pCount1 );
 
         // die Arrays koennen wir wieder vergessen
-        delete pCount1; delete pCount2;
+        delete [] pCount1; delete [] pCount2;
 
         CheckDiscard( rData1.GetLineCount(), pDiscard1 );
         CheckDiscard( rData2.GetLineCount(), pDiscard2 );
@@ -437,7 +437,7 @@ Compare::Compare( ULONG nDiff, CompareData& rData1, CompareData& rData2 )
         pMD2 = new MovedData( rData2, pDiscard2 );
 
         // die Arrays koennen wir wieder vergessen
-        delete pDiscard1; delete pDiscard2;
+        delete [] pDiscard1; delete [] pDiscard2;
     }
 
     {
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 7fb33d4529..a137ca479f 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -257,7 +257,7 @@ Ww1StyleSheet::Ww1StyleSheet(Ww1Fib& _rFib)
             DBG_ASSERT(cbStshf==0, "Ww1StyleSheet");
             bOK = cbStshf == 0;
         }
-    delete del;
+    delete [] del;
 }
 
 USHORT Ww1StyleSheet::ReadNames( BYTE*& p, USHORT& rnCountBytes )
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 60cc3b95e3..29490aa1e3 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1899,11 +1899,11 @@ void Ww1Picture::WriteBmp(SvStream& rOut)
                 nSize -= sizeof(BYTE);
             }
             if(rOut.Write(pBuf, padx) != padx){
-                delete pBuf;
+                delete [] pBuf;
                 goto error;
             }
         }
-        delete pBuf;
+        delete [] pBuf;
     }
 #else
     for (j=0;nSize>0&&j<maxy;j++)
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9b5a785220..c73394f7b4 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4379,7 +4379,7 @@ ULONG SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGloss)
                         sal_uInt8 *pIn = new sal_uInt8[nUnencryptedHdr];
                         pStrm->Read(pIn, nUnencryptedHdr);
                         aDecryptMain.Write(pIn, nUnencryptedHdr);
-                        delete pIn;
+                        delete [] pIn;
 
                         DecryptXOR(aCtx, *pStrm, aDecryptMain);
 
-- 
cgit v1.2.3