--- a/charconvfw/numbergrouping/Src/NumberGrouping.cpp	Fri Apr 16 16:55:07 2010 +0300
+++ b/charconvfw/numbergrouping/Src/NumberGrouping.cpp	Mon May 03 14:13:26 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