CWS-TOOLING: integrate CWS cmcfixes66binfilter_ooo/DEV300_m65

13 files changed, 21 insertions, 21 deletions

diff --git a/binfilter/bf_sc/source/core/data/sc_column.cxx b/binfilter/bf_sc/source/core/data/sc_column.cxx
index 0a0b200c7..e9f4745f7 100644
--- a/binfilter/bf_sc/source/core/data/sc_column.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_column.cxx
@@ -775,8 +775,8 @@ namespace binfilter {
 /*N*/           }
 /*N*/       }
 /*N*/
-/*N*/       delete pDelRows;
-/*N*/       delete ppDelCells;
+/*N*/       delete[] pDelRows;
+/*N*/       delete[] ppDelCells;
 /*N*/   }
 /*N*/
 /*N*/   pDocument->SetAutoCalc( bOldAutoCalc );
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
index 959e0af48..b58968051 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
@@ -469,11 +469,11 @@ static const char pStorageName[] = "Configurations";
 /*N*/   pBuf[nLen] = 0;
 /*N*/   if( strcmp( pBuf, pHeader ) )
 /*N*/   {
-/*N*/       delete pBuf;
+/*N*/       delete[] pBuf;
 /*?*/       return SfxConfigManager::ERR_FILETYPE;
 /*N*/   }
 /*N*/
-/*N*/   delete pBuf;
+/*N*/   delete[] pBuf;
 /*N*/
 /*N*/   // compare version
 /*N*/   char c;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index f941d5f8c..80ebd109b 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -218,7 +218,7 @@ static const char __FAR_DATA pDocInfoHeader[] = "SfxDocumentInfo";
 /*N*/                     aString = String();
 /*N*/             }
 /*N*/
-/*N*/             delete pString;
+/*N*/             delete[] pString;
 /*N*/         }
 /*N*/         else
 /*N*/         {
diff --git a/binfilter/bf_so3/source/inplace/outplace.cxx b/binfilter/bf_so3/source/inplace/outplace.cxx
index e7cd07f3e..c92f76c08 100644
--- a/binfilter/bf_so3/source/inplace/outplace.cxx
+++ b/binfilter/bf_so3/source/inplace/outplace.cxx
@@ -1177,7 +1177,7 @@ void SvOutPlaceObject::Draw
                 }
 
                 DeleteMetaFile( hMet );
-                delete pBuf;
+                delete[] pBuf;
             }
         }
 
@@ -1700,7 +1700,7 @@ void SvOutPlaceObject::DrawObject
                 }
 
                 DeleteMetaFile( hMet );
-                delete pBuf;
+                delete[] pBuf;
             }
         }
 
diff --git a/binfilter/bf_so3/source/inplace/rmapplet.cxx b/binfilter/bf_so3/source/inplace/rmapplet.cxx
index f2aa48ba5..bc264602f 100644
--- a/binfilter/bf_so3/source/inplace/rmapplet.cxx
+++ b/binfilter/bf_so3/source/inplace/rmapplet.cxx
@@ -191,7 +191,7 @@ void RmAppletStub::Create(RmAppletContext* pContext, const INetURLObject& rURL1,
     strcpy( aBuf, RMAPPLET_PACKAGE ); // #100211# - checked
     strcat( aBuf, pClassName );       // #100211# - checked
     createObject( DCA_NAMESPACE(OObjectBroker, dca)::getBroker("dcabroker"), aBuf );
-    delete aBuf;
+    delete[] aBuf;
 
     DBG_TRACE( "Rm: Window::Create() - After createObject()" );
 
@@ -237,7 +237,7 @@ void RmAppletContext::Create( )
     strcpy( aBuf, RMAPPLET_PACKAGE ); // #100211# - checked
     strcat( aBuf, pClassName );       // #100211# - checked
     createObject( DCA_NAMESPACE(OObjectBroker, dca)::getBroker("dcabroker"), aBuf );
-    delete aBuf;
+    delete[] aBuf;
 
     DBG_TRACE( "Rm: Window::Create() - After createObject()" );
 
@@ -260,7 +260,7 @@ void RmAppletObject::Create(const String& sClassName, const String& sName, const
     strcpy( aBuf, RMAPPLET_PACKAGE ); // #100211# - checked
     strcat( aBuf, pClassName );       // #100211# - checked
     createObject( DCA_NAMESPACE(OObjectBroker, dca)::getBroker("dcabroker"), aBuf );
-    delete aBuf;
+    delete[] aBuf;
 
     DBG_TRACE( "Rm: Window::Create() - After createObject()" );
     DCA_NAMESPACE(OCallMethodMsg, dca) aMsg( this, MSG_APPLET_CREATE );
diff --git a/binfilter/bf_svtools/source/items1/svt_nranges.cxx b/binfilter/bf_svtools/source/items1/svt_nranges.cxx
index 45c84ab20..e370bef90 100644
--- a/binfilter/bf_svtools/source/items1/svt_nranges.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_nranges.cxx
@@ -373,7 +373,7 @@ SfxNumRanges& SfxNumRanges::operator -=
     NUMTYPE nThisSize = Count_Impl(_pRanges);
     NUMTYPE nTargetSize = 1 + (  nThisSize + Count_Impl(rRanges._pRanges) );
     NUMTYPE *pTarget = new NUMTYPE[ nTargetSize ];
-    memset( pTarget, sizeof(NUMTYPE)*nTargetSize, 0 );
+    memset( pTarget, 0, sizeof(NUMTYPE)*nTargetSize );
     memcpy( pTarget, _pRanges, sizeof(NUMTYPE)*nThisSize );
 
     NUMTYPE nPos1 = 0, nPos2 = 0, nTargetPos = 0;
@@ -583,7 +583,7 @@ SfxNumRanges& SfxNumRanges::operator /=
     NUMTYPE nThisSize = Count_Impl(_pRanges);
     NUMTYPE nTargetSize = 1 + (  nThisSize + Count_Impl(rRanges._pRanges) );
     NUMTYPE *pTarget = new NUMTYPE[ nTargetSize ];
-    memset( pTarget, sizeof(NUMTYPE)*nTargetSize, 0 );
+    memset( pTarget, 0, sizeof(NUMTYPE)*nTargetSize );
     memcpy( pTarget, _pRanges, sizeof(NUMTYPE)*nThisSize );
 
     NUMTYPE nPos1 = 0, nPos2 = 0, nTargetPos = 0;
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddeml1.cxx b/binfilter/bf_svtools/source/svdde/svt_ddeml1.cxx
index 999e1387a..7b6f25f49 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddeml1.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddeml1.cxx
@@ -1092,7 +1092,7 @@ ImpService* ImpDdeMgr::PutService( HSZ hszService )
     String aStr( (ULONG)hWndServer );
     aStr += pBuf;
     HSZ hszInstServ = DdeCreateStringHandle( (PSZ)(const char*)pBuf, 850 );
-    delete pBuf;
+    delete[] pBuf;
 
     pPtr->hBaseServName = hszService;
     pPtr->hInstServName = hszInstServ;
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
index a29172201..a77036a14 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
@@ -199,7 +199,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
                             pInst->hDdeInstSvr, (LPBYTE) pPairs,
                             sizeof(HSZPAIR) * (nTopics+1),
                             0, NULL, nCbType, 0);
-            delete pPairs;
+            delete[] pPairs;
             return h;
         }
 
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx b/binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx
index 03a2cfacb..e463b0168 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx
@@ -357,7 +357,7 @@ XPolyPolygon XOutGetCharOutlineGX(USHORT nChar, OutputDevice& rOut,
     /* was wir angefordert haben, muessen wir auch wieder freigeben!
     */
     GXDisposeShape( aOutlineShape );
-    delete pPathData;
+    delete[] pPathData;
 
     rOut.SetFont( aFont );
 
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
index 2a8d0d26c..982f8afbb 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
@@ -849,7 +849,7 @@ typedef const SwTxtFmtColl *Sw3TxtFmtCollPtrConst;
 /*N*/       CloseRec( SWG_OUTLINEEXT );
 /*N*/   }
 /*N*/
-/*N*/   delete ppTxtColls;
+/*N*/   delete[] ppTxtColls;
 /*N*/ #endif
 /*N*/ }
 
diff --git a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
index 94cdf3616..76c788bad 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
@@ -1102,7 +1102,7 @@ String &SwExcelParser::ReadExcString( StringInfoLen eLen, String &aString )
     pIn->Read( pStr, nLaenge );
     pStr[ nLaenge ] = 0;
     aString = String(pStr, eZielChar);
-    delete pStr;
+    delete[] pStr;
 
     return aString;
     }
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wgraf.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wgraf.cxx
index 704087bf8..189bffb5f 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wgraf.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wgraf.cxx
@@ -779,7 +779,7 @@ int SwW4WGraf::GetNextVectRec(OutputDevice& rOut)
             Font aFont(aStr,Size(0,Grad));
             aFont.SetColor(aColor);
             rOut.SetFont(aFont);
-            delete pC;
+            delete[] pC;
         } break;
         case W4WRG_DrText: {
             USHORT i;
@@ -791,7 +791,7 @@ int SwW4WGraf::GetNextVectRec(OutputDevice& rOut)
                 pC[i]=(char)GetHexByte();
             String aStr( pC, RTL_TEXTENCODING_IBM_850 );
             rOut.DrawText(P1,aStr);
-            delete pC;
+            delete[] pC;
         } break;
 
         /*
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
index 4e34df75b..ce703947d 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
@@ -1952,7 +1952,7 @@ void SwW4WParser::Read_ColumnsDefinition()      // (CDS)
                 // falls noetig das Dummy-Array freigeben
                 if(    pActTabDefs
                     && ( pActTabDefs != pTabDefs ) )
-                    delete pActTabDefs;
+                    delete[] pActTabDefs;
             }
             // Durchgang 2: Tabellenspaltendefinitionen anpassen
             else
@@ -2039,7 +2039,7 @@ void SwW4WParser::Read_ColumnsDefinition()      // (CDS)
                         pCurPaM->GetCntntNode(), 0 );
                 }
             }
-            delete pActTabDefs;
+            delete[] pActTabDefs;
         }
     }
 }