charconvfw/numbergrouping/Src/NumberGrouping.cpp
branchRCL_3
changeset 15 9a2be90ac9a2
parent 12 5390220f13c1
child 25 1799ab513ec3
--- a/charconvfw/numbergrouping/Src/NumberGrouping.cpp	Thu Apr 01 00:28:03 2010 +0300
+++ b/charconvfw/numbergrouping/Src/NumberGrouping.cpp	Wed Apr 14 17:50:37 2010 +0300
@@ -17,6 +17,7 @@
 
 #include "NumberGrouping.h"
 #include "RegularExpression.h"
+#include "cleanuputil.h"
 
 #include <barsread.h>
 #include <eikenv.h>
@@ -484,7 +485,7 @@
     iRegExp = NULL;
 
     RPointerArray<TDesC> parrGroupingPatternsList;
-    CleanupClosePushL(parrGroupingPatternsList);
+    CleanupResetAndDestroyPushL(parrGroupingPatternsList);
 
     TInt maxExtraCharacters(0);
 
@@ -547,12 +548,7 @@
 
     iRegExp = CRegularExpression::NewL(&parrGroupingPatternsList);
 
-    TInt nCount = parrGroupingPatternsList.Count();
-
-    for(TInt j = 0; j < nCount; ++j)
-        delete parrGroupingPatternsList[j];
-    parrGroupingPatternsList.Close();
-    CleanupStack::Pop();  // patterns list
+    CleanupStack::PopAndDestroy(&parrGroupingPatternsList);  // patterns list
     }
 
 void CPNGNumberGrouping::doNumberGroupingL() const