CWS-TOOLING: integrate CWS cmcfixes66ooo/DEV300_m65

14 files changed, 28 insertions, 28 deletions

diff --git a/binfilter/bf_sc/source/core/data/sc_column.cxx b/binfilter/bf_sc/source/core/data/sc_column.cxx
index 9b170f85b..09240b6ab 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 7a2ccffb8..93ac222b3 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 71945c6ae..91e693dc9 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 ed5364c98..09aa876a5 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 9eb179be3..3ec3e5d90 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 5a65810b9..72a4723d6 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 71c650c78..6b648a584 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 791f0d857..1988e5338 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 28c4d0b03..c29163a31 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 1204c395a..2b419a62d 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 2566a7e43..d33aa55ab 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 e3f8fddcf..071b1d4bb 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 c32470a07..729a002c2 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;
         }
     }
 }
diff --git a/xmerge/source/activesync/XMergeFilter.cpp b/xmerge/source/activesync/XMergeFilter.cpp
index 43a7ddbaf..cb821fbfe 100644
--- a/xmerge/source/activesync/XMergeFilter.cpp
+++ b/xmerge/source/activesync/XMergeFilter.cpp
@@ -343,11 +343,6 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
     DWORD dwClassName            = _MAX_PATH;
     DWORD dwKeyName              = _MAX_PATH;
 
-    // Locations shouldn't be greater than _MAX_PATH
-    TCHAR*  szJavaHome = new TCHAR[_MAX_PATH + 1];
-    DWORD dwSize = _MAX_PATH + 1;
-
-
     /*
      * Java leaves registry keys at HKLM\SOFTWARE\JavaSoft.
      *
@@ -357,6 +352,10 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
     if (lRet != ERROR_SUCCESS)
         return NULL;
 
+    // Locations shouldn't be greater than _MAX_PATH
+    TCHAR*  szJavaHome = new TCHAR[_MAX_PATH + 1];
+    DWORD dwSize = _MAX_PATH + 1;
+
     /* use current version */
     lRet = ::RegQueryValueEx(hKey, _T("CurrentVersion"), 0, NULL, (LPBYTE)szCurrentJava, &dwSize);
     
@@ -376,6 +375,7 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
     if (lRet != ERROR_SUCCESS)
     {
         RegCloseKey(hKey);
+        delete [] szJavaHome;
         return NULL;
     }
 
@@ -387,7 +387,7 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
     {
         RegCloseKey(hDataKey);
         RegCloseKey(hKey);
-        delete szJavaHome;
+        delete [] szJavaHome;
         return NULL;
     }
 
@@ -400,7 +400,7 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
 
     if (((dwAttrs & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) || dwAttrs == INVALID_FILE_SIZE)
     {
-        delete szJavaHome;
+        delete [] szJavaHome;
         return NULL;
     }