# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1274198930 -3600
# Node ID 0ba1f0ab80bed71a4a535d18f5e9b1ad6b04d684
# Parent  1799ab513ec3e3cf464ba9bfec3c38aac280bd17# Parent  7ea2c3c4948076b0dc3130f511ed7b23170689a9
Re-merge fixes for bugs 1860 and 1543.

diff -r 7ea2c3c49480 -r 0ba1f0ab80be charconvfw/numbergrouping/Src/NumberGrouping.cpp
--- a/charconvfw/numbergrouping/Src/NumberGrouping.cpp	Fri Apr 30 13:21:39 2010 +0100
+++ b/charconvfw/numbergrouping/Src/NumberGrouping.cpp	Tue May 18 17:08:50 2010 +0100
@@ -698,7 +698,7 @@
     RPointerArray<TDesC>& aGroupingPatternsList,
     TInt& aMaxExtraCharacters )
     {
-
+    CleanupResetAndDestroyPushL(aGroupingPatternsList);
     TPNGGroupingInfo* groupingInfo = new (ELeave) TPNGGroupingInfo;
     CleanupStack::PushL( groupingInfo );
 
@@ -762,7 +762,11 @@
         User::Leave(err);
         }
     else
+        {
         CleanupStack::Pop( groupingInfo ); // Success. This object now not owned by the cleanupstack
+        }        
+    
+    CleanupStack::Pop(&aGroupingPatternsList);
     }
 
 void CPNGNumberGrouping::ParseForAfterPositions(
diff -r 7ea2c3c49480 -r 0ba1f0ab80be fontservices/fontstore/inc/openfontlinkedtypefaceextension.h
--- a/fontservices/fontstore/inc/openfontlinkedtypefaceextension.h	Fri Apr 30 13:21:39 2010 +0100
+++ b/fontservices/fontstore/inc/openfontlinkedtypefaceextension.h	Tue May 18 17:08:50 2010 +0100
@@ -20,6 +20,8 @@
 #ifndef OPENFONTLINKEDTYPEFACEEXTENSION_H
 #define OPENFONTLINKEDTYPEFACEEXTENSION_H
 
+class COpenFontLinkedTypefaceSpecification;
+
 /**
 Interface for handling, creating and modifying linked typefaces.
 
diff -r 7ea2c3c49480 -r 0ba1f0ab80be fontservices/fontstore/inc/openfontlinkedtypefacespecification.h
--- a/fontservices/fontstore/inc/openfontlinkedtypefacespecification.h	Fri Apr 30 13:21:39 2010 +0100
+++ b/fontservices/fontstore/inc/openfontlinkedtypefacespecification.h	Tue May 18 17:08:50 2010 +0100
@@ -20,6 +20,10 @@
 #ifndef OPENFONTLINKEDTYPEFACESPECIFICATION_H_
 #define OPENFONTLINKEDTYPEFACESPECIFICATION_H_
 
+class COpenFontLinkedTypefaceElementSpec;
+class CLinkedTypefaceGroup;
+class TLinkedTypefaceSpecificationArgs;
+
 /**
 This class contains the specification of a linked typeface passed from font store to a rasterizer. It is made up of groups and typefaces.
 A group (CLinkedTypefaceGroup) contains a number of attributes that can apply to similar typefaces
diff -r 7ea2c3c49480 -r 0ba1f0ab80be textrendering/textformatting/test/tbandformat/src/helper/bandvalidator.cpp
--- a/textrendering/textformatting/test/tbandformat/src/helper/bandvalidator.cpp	Fri Apr 30 13:21:39 2010 +0100
+++ b/textrendering/textformatting/test/tbandformat/src/helper/bandvalidator.cpp	Tue May 18 17:08:50 2010 +0100
@@ -154,6 +154,7 @@
 	
 TBool CBandValidator::GetVisibleLineInfosL(const CTextView& aView, RArray<TTmLineInfo>& aVisibleLines)
 	{
+    CleanupClosePushL(aVisibleLines);
 	const CTextLayout* layout = aView.Layout();
 	__ASSERT_ALWAYS(layout, User::Invariant());
 	const CTmTextLayout& tmLayout = layout->TagmaTextLayout();
@@ -163,6 +164,7 @@
 	TTmLineInfo startLine;	
 	if(!(tmLayout.LineNumberToLine(firstLineNumber, startLine)))
 		{
+        CleanupStack::Pop(&aVisibleLines);
 		return EFalse;
 		}
 //get last visible line
@@ -179,11 +181,13 @@
 			//it is, so just get the last formatted line
 			if(!(tmLayout.LineNumberToLine((tmLayout.Lines())-1, endLine)))
 				{
+                CleanupStack::Pop(&aVisibleLines);
 				return EFalse;
 				}
 			}
 		else
 			{
+            CleanupStack::Pop(&aVisibleLines);
 			return EFalse;
 			}
 		}
@@ -196,11 +200,14 @@
 		TTmLineInfo lineInfo;
 		if(!(tmLayout.LineNumberToLine(lineNumber, lineInfo)))
 			{
+            CleanupStack::Pop(&aVisibleLines);
 			return EFalse;
 			}
 		User::LeaveIfError(aVisibleLines.Append(lineInfo));
 		lineNumber++;
 		}
+	
+	CleanupStack::Pop(&aVisibleLines);
 	return ETrue;	
 	}