fontservices/fontstore/tfs/T_IsolatedFontStore.cpp
branchRCL_3
changeset 55 336bee5c2d35
parent 54 748ec5531811
--- a/fontservices/fontstore/tfs/T_IsolatedFontStore.cpp	Tue Aug 31 17:01:26 2010 +0300
+++ b/fontservices/fontstore/tfs/T_IsolatedFontStore.cpp	Wed Sep 01 12:39:40 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1995-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -19,21 +19,15 @@
 #include <graphics/openfontrasterizer.h>
 #include <graphics/openfontconstants.h>
 
-CTIsolatedFontStore::CTIsolatedFontStore():iIsHeapOwner(ETrue)
+CTIsolatedFontStore::CTIsolatedFontStore()
 	{
 	}
 
-CTIsolatedFontStore::CTIsolatedFontStore(RHeap* aHeap):iIsHeapOwner(EFalse),iHeap(aHeap)
-    {
-    }
-
 CTIsolatedFontStore::~CTIsolatedFontStore()
 	{
 	delete iFs;
-	if (iIsHeapOwner && iHeap)
-	    {
-	    iHeap->Close();
-	    }
+	if (iHeap)
+		iHeap->Close();
 	REComSession::FinalClose();
 	}
 
@@ -52,27 +46,9 @@
 	return self;
 	}
 
-CTIsolatedFontStore* CTIsolatedFontStore::NewLC(RHeap * aHeap)
-    {
-    CTIsolatedFontStore* self = new (ELeave)CTIsolatedFontStore(aHeap);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-    }
-
-CTIsolatedFontStore* CTIsolatedFontStore::NewL(RHeap * aHeap)
-    {
-    CTIsolatedFontStore* self=CTIsolatedFontStore::NewLC(aHeap);
-    CleanupStack::Pop(); // self;
-    return self;
-    }
-
 void CTIsolatedFontStore::ConstructL()
 	{
-    if(iIsHeapOwner)
-        {
-        iHeap = UserHeap::ChunkHeap(NULL,0x10000,0x10000);
-        }	
+	iHeap = UserHeap::ChunkHeap(NULL,0x10000,0x10000);
 	iFs = CFontStore::NewL(iHeap);
 	}