equal
deleted
inserted
replaced
15 * |
15 * |
16 */ |
16 */ |
17 |
17 |
18 #include "NumberGrouping.h" |
18 #include "NumberGrouping.h" |
19 #include "RegularExpression.h" |
19 #include "RegularExpression.h" |
|
20 #include "cleanuputil.h" |
20 |
21 |
21 #include <barsread.h> |
22 #include <barsread.h> |
22 #include <eikenv.h> |
23 #include <eikenv.h> |
23 #include <centralrepository.h> |
24 #include <centralrepository.h> |
24 #include <NumberGroupingCRKeys.h> |
25 #include <NumberGroupingCRKeys.h> |
482 doClearGroupingItemsList(); |
483 doClearGroupingItemsList(); |
483 delete iRegExp; |
484 delete iRegExp; |
484 iRegExp = NULL; |
485 iRegExp = NULL; |
485 |
486 |
486 RPointerArray<TDesC> parrGroupingPatternsList; |
487 RPointerArray<TDesC> parrGroupingPatternsList; |
487 CleanupClosePushL(parrGroupingPatternsList); |
488 CleanupResetAndDestroyPushL(parrGroupingPatternsList); |
488 |
489 |
489 TInt maxExtraCharacters(0); |
490 TInt maxExtraCharacters(0); |
490 |
491 |
491 RFs fs; |
492 RFs fs; |
492 CleanupClosePushL(fs); |
493 CleanupClosePushL(fs); |
545 |
546 |
546 iExtension->iMaxExtraCharacters = maxExtraCharacters; // Latch the high water mark of extra characters |
547 iExtension->iMaxExtraCharacters = maxExtraCharacters; // Latch the high water mark of extra characters |
547 |
548 |
548 iRegExp = CRegularExpression::NewL(&parrGroupingPatternsList); |
549 iRegExp = CRegularExpression::NewL(&parrGroupingPatternsList); |
549 |
550 |
550 TInt nCount = parrGroupingPatternsList.Count(); |
551 CleanupStack::PopAndDestroy(&parrGroupingPatternsList); // patterns list |
551 |
|
552 for(TInt j = 0; j < nCount; ++j) |
|
553 delete parrGroupingPatternsList[j]; |
|
554 parrGroupingPatternsList.Close(); |
|
555 CleanupStack::Pop(); // patterns list |
|
556 } |
552 } |
557 |
553 |
558 void CPNGNumberGrouping::doNumberGroupingL() const |
554 void CPNGNumberGrouping::doNumberGroupingL() const |
559 { |
555 { |
560 TInt lengthToGroup = LengthToGroup(); |
556 TInt lengthToGroup = LengthToGroup(); |