--- a/fontservices/fontstore/src/FNTSTD.H Tue Feb 02 02:02:46 2010 +0200
+++ b/fontservices/fontstore/src/FNTSTD.H Sat Feb 20 00:37:46 2010 +0200
@@ -41,6 +41,8 @@
EFntNoFontFound,
EFntRemovingAlreadyDeletedLinkedFont,
EFntOverFlow,
+ EFntMetricsNotOnHeap,
+ EFntPointerNotByteAligned,
};
/**
@@ -53,7 +55,6 @@
class COpenFontSessionCacheListItem;
class COpenFont;
-#ifdef FNTSTORE_SUPPORT_FMM
class COpenFontSessionCacheList
/**
@internalComponent
@@ -76,30 +77,6 @@
iStartOffset(0)
{
}
-#else
-class COpenFontSessionCacheList
-/**
-@internalComponent
-*/
- {
- friend class COpenFont;
-
- public:
- inline COpenFontSessionCacheList();
- void Delete(RHeap* aHeap);
- void DeleteCache(RHeap* aHeap,TInt aSessionHandle);
-
- private:
- void DeleteFontGlyphs(RHeap* aHeap,const COpenFont* aFont);
-
- COpenFontSessionCacheListItem* iStart;
- };
-
-inline COpenFontSessionCacheList::COpenFontSessionCacheList():
- iStart(NULL)
- {
- }
-#endif // FNTSTORE_SUPPORT_FMM
/**
@internalComponent