--- a/fontservices/fontstore/src/OPENFONT.CPP Sat Feb 20 00:37:46 2010 +0200
+++ b/fontservices/fontstore/src/OPENFONT.CPP Fri Mar 12 15:51:09 2010 +0200
@@ -520,8 +520,6 @@
{
//Delete the shaper
delete iShaper;
-
- File()->GetFontStore()->CleanupCacheOnOpenFontRemoval(this);
COpenFontGlyphCache* glyphCache = GetGlyphCache();
if (glyphCache != NULL)
@@ -822,54 +820,6 @@
delete iShaper;
}
-TInt COpenFont::GetFontTable(TUint32 aTag, TAny*& aTableContent, TInt& aLength)
- {
- // get the extension API for GetTrueTypeTable() if available
- TAny* ext = NULL;
- ExtendedInterface(KUidOpenFontTrueTypeExtension, ext);
- MOpenFontTrueTypeExtension* extensionInterface =
- reinterpret_cast<MOpenFontTrueTypeExtension*>(ext);
-
- TInt ret = KErrNone;
- if (extensionInterface == NULL)
- {
- ret = KErrNotSupported;
- }
- else
- {
- TUint32 tag = aTag;
- TInt len = 0;
- aTableContent = extensionInterface->GetTrueTypeTable(ret, tag, &len);
- if (KErrNone == ret)
- {
- aLength = len;
- }
- }
- return ret;
- }
-
-TInt COpenFont::GetGlyphOutline(TUint aCode,
- TBool aHinted, TAny*& aOutline, TInt &aLength)
- {
- // get the extension API for GetTrueTypeTable() if available
- TAny* ext = NULL;
- ExtendedInterface(KUidOpenFontGlyphOutlineExtension, ext);
- MOpenFontGlyphOutlineExtension *extensionInterface =
- reinterpret_cast<MOpenFontGlyphOutlineExtension*>(ext);
-
- TInt ret = KErrNone;
- if (extensionInterface == NULL)
- {
- ret = KErrNotSupported;
- }
- else
- {
- ret = extensionInterface->GetGlyphOutline(aCode, ETrue,
- aHinted, aOutline, aLength);
- }
- return ret;
- }
-
/** Given the passed pointer aAny, return an offset from it to the "this" pointer
of this COpenFont object.
@param aAny A pointer to an object that exists on the shared heap, i.e. the same heap
@@ -1698,11 +1648,6 @@
*/
EXPORT_C COpenFontFile::~COpenFontFile()
{
- CFontStore *fs = GetFontStore();
- if (fs != NULL)
- {
- fs->CleanupCacheOnOpenFontFileRemoval(this);
- }
delete iData;
}