--- a/uifw/AvKon/src/AknLayoutConfig.cpp Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/AvKon/src/AknLayoutConfig.cpp Tue Aug 31 15:28:30 2010 +0300
@@ -341,8 +341,6 @@
RArray<SAknScreenModeInfo>& aScreenInfoArray,
RArray<SHardwareStateInfo>& aHardwareStateArray)
{
- ::CleanupClosePushL(aScreenInfoArray);
- ::CleanupClosePushL(aHardwareStateArray);
// get state screen map
#if defined(__WINS__)
TInt screenMapResource = R_AKNPRIV_HARDWARE_STATE_SCREEN_MAP_EMUL;
@@ -389,14 +387,11 @@
}
CleanupStack::PopAndDestroy(); // reader's HBufC
- CleanupStack::Pop(&aHardwareStateArray);
- CleanupStack::Pop(&aScreenInfoArray);
}
void CAknLayoutConfig::GetKeyMapFromAknPrivL(CResourceFile* aResFile,
RArray<SHardwareStateInfo>& aHardwareStateArray)
{
- ::CleanupClosePushL(aHardwareStateArray);
// get the state key map
#if defined(__WINS__)
TInt hwMapResource = R_AKNPRIV_HARDWARE_STATE_KEY_MAP_EMUL;
@@ -421,7 +416,6 @@
}
CleanupStack::PopAndDestroy(); // reader's HBufC
- CleanupStack::Pop(&aHardwareStateArray);
}
TAknPrivSoftkeyLocation CAknLayoutConfig::GetLandscapeSoftkeyLocationFromAknPrivL(CResourceFile* aResFile)
@@ -450,7 +444,6 @@
RArray<SAknScreenModeInfo>& aScreenInfoArray,
TAknPrivSoftkeyLocation aLandscapeSoftkeyLocation)
{
- ::CleanupClosePushL(aScreenInfoArray);
CEikonEnv* eikonEnv = CEikonEnv::Static();
CWsScreenDevice* dev = eikonEnv->ScreenDevice();
@@ -482,7 +475,6 @@
screenMode.iDisplayMode = dev->GetScreenModeDisplayMode(ii);
aScreenInfoArray.AppendL(screenMode);
}
- CleanupStack::Pop(&aScreenInfoArray);
}
//