--- a/fontsupport/fontprovider/Src/FontProvider.cpp Wed Sep 15 13:20:01 2010 +0300
+++ b/fontsupport/fontprovider/Src/FontProvider.cpp Wed Oct 13 15:41:22 2010 +0300
@@ -1546,7 +1546,7 @@
DoGetFontSpecFromMetrics(aDevice, aFontId, aMetrics, fontSpec, foundIndex, needsExactMatch, fallbackNeeded);
CFbsFont* font;
- aDevice.GetNearestFontInPixels((CFont*&)font,fontSpec);
+ User::LeaveIfError(aDevice.GetNearestFontInPixels((CFont*&)font,fontSpec));
// Fill in other Font metrics
SetFontProviderSuppliedMetrics( font, &(productFontTable[foundIndex]), aInfo );
@@ -1881,7 +1881,7 @@
}
}
- store->SetFontNameAliasL(_L("Series 60 Sans"),_L("Nokia Sans S60"));
+
CleanupStack::PopAndDestroy( store );
return;