--- a/textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutrootctrl.cpp	Thu Aug 19 10:15:25 2010 +0300
+++ b/textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutrootctrl.cpp	Tue Aug 31 15:31:50 2010 +0300
@@ -815,13 +815,7 @@
 
 	if(!AbleToDraw())
         return;
-    
-    if(UiLayout()->NotDrawToLayoutDevice())
-	    {
-	    HandleResourceChange(KPenInputOwnDeviceResourceChange);
-	    }
-	    
-	Clear();	
+	
     CControlGroup::Draw();
 
     if(!iShadowRect.IsEmpty())        
@@ -871,7 +865,7 @@
 
     if ( AknsUtils::AvkonSkinEnabled() )
         {
-        AknsUtils::GetCachedColor( UiLayout()->SkinInstance(),
+        AknsUtils::GetCachedColor( AknsUtils::SkinInstance(),
                                penCor, KAknsIIDQsnTextColors, clrIndex );
         }
 
@@ -1010,9 +1004,7 @@
         {
         if(aCtrl->OrderPos() <= iPopCtrlList[i]->OrderPos())
             {
-            CFepUiBaseCtrl* temp = iPopCtrlList[i - 1];
             iPopCtrlList[i - 1] = iPopCtrlList[i];
-            iPopCtrlList[i] = temp;
             }
         else
             {
@@ -1150,10 +1142,7 @@
             {
             if(aCtrl->OrderPos() >= iPopCtrlList[i]->OrderPos())
                 {
-                CFepUiBaseCtrl* temp = iPopCtrlList[i + 1];
-                iPopCtrlList[i + 1] = iPopCtrlList[i];
-                iPopCtrlList[i] = temp;   
-
+                iPopCtrlList[i+1] = iPopCtrlList[i];
                 }
             else
                 {