--- a/skins/AknSkins/src/AknsScalabilityUtils.cpp Thu Aug 19 10:53:51 2010 +0300
+++ b/skins/AknSkins/src/AknsScalabilityUtils.cpp Tue Aug 31 16:13:36 2010 +0300
@@ -110,7 +110,7 @@
// (commented in the header).
// -----------------------------------------------------------------------------
//
-TBool AknsScalabilityUtils::DrawPartialCachedImageL(
+TBool AknsScalabilityUtils::DrawPartialCachedImage(
MAknsSkinInstance* /*aSkin*/, CBitmapContext& aGc, const TRect& aTrgLayoutRect,
const TRect& aTrgDrawRect, CAknsImageItemData* aImgData,
const TAknsItemID& /*aIID*/, const TAknsImageAttributeData* aAttr,
@@ -863,7 +863,7 @@
return static_cast<CAknsEffectQueueItemData *>(itemData);
}
-CFbsBitmap *AknsScalabilityUtils::LoadBitmapFromSkinIdL(MAknsSkinInstance* aInstance, const TAknsItemID &aID, const TSize &size)
+CFbsBitmap *AknsScalabilityUtils::LoadBitmapFromSkinId(MAknsSkinInstance* aInstance, const TAknsItemID &aID, const TSize &size)
{
CAknsAppSkinInstance* appSkinInstance =
static_cast<CAknsAppSkinInstance*>(aInstance);
@@ -1036,7 +1036,7 @@
aMorphingOut = morphing;
return existingData;
}
-/* if(aSkin->iLocalItemDefArray.Count() == 0) //not in preview
+ if(aSkin->iLocalItemDefArray.Count() == 0) //not in preview
{
if ( hasData && IsScalableItem( thisIid ) )
{
@@ -1050,7 +1050,7 @@
attributes.iAttributes = EAknsImageAttributeNBC;
data->SetAttributesL(attributes);
- CFbsBitmap *bmp = LoadBitmapFromSkinIdL(aSkin, thisIid, aLayoutSize);
+ CFbsBitmap *bmp = LoadBitmapFromSkinId(aSkin, thisIid, aLayoutSize);
data->SetBitmap( bmp );
data->SetMask(NULL);
@@ -1060,7 +1060,7 @@
return CachedLayoutBitmap(aSkin, thisIid, rect.Size(),
aLayoutSize, aLayoutType, morphing, aLocalItem);
}
- }*/
+ }
// Otherwise, start rendering
CAknsMaskedBitmapItemData* thisData = CAknsMaskedBitmapItemData::NewL();