idlehomescreen/xmluicontroller/src/contentrenderer.cpp
branchRCL_3
changeset 35 3321d3e205b6
parent 34 5456b4e8b3a8
--- a/idlehomescreen/xmluicontroller/src/contentrenderer.cpp	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/xmluicontroller/src/contentrenderer.cpp	Tue Sep 14 20:58:58 2010 +0300
@@ -442,7 +442,7 @@
         
         TBool layoutChanged( EFalse );
         
-        TRAPD( error, tr->CommitL( layoutChanged, propertyHashMap ) );
+        TRAPD( error, tr->CommitL( iFactory->PolicyArray(), propertyHashMap ) );
 
         if( error == KErrNone )
             {
@@ -464,7 +464,8 @@
             );
                 
         
-        iFactory->ReleaseTransaction( tr );  
+        iFactory->ReleaseTransaction( tr );
+        iFactory->ResetPolicyArray();
         
         return error;
         }
@@ -1014,10 +1015,10 @@
                 }
             
             iPolicyEvaluator->EvaluateContentPolicyL( 
-                    *target, element->PolicyArray() );
+                    *target, iFactory->PolicyArray() );
                                                      
             iPolicyEvaluator->EvaluateVisibilityPolicyL( 
-                    *target, element->PolicyArray() );
+                    *target, iFactory->PolicyArray() );
                                                          
             ProcessTransactionElementL( element );
             }
@@ -1131,10 +1132,10 @@
                         *target, aFile, priority );
                                                           
             iPolicyEvaluator->EvaluateContentPolicyL( 
-                    *target, element->PolicyArray() );
+                    *target, iFactory->PolicyArray() );
                                                       
             iPolicyEvaluator->EvaluateVisibilityPolicyL( 
-                    *target, element->PolicyArray() );
+                    *target, iFactory->PolicyArray() );
                                                                      
             ProcessTransactionElementL( element );
             }
@@ -1214,10 +1215,10 @@
                 *target, aIndex );
 
     iPolicyEvaluator->EvaluateEmptyContentPolicyL( 
-            *target, element->PolicyArray() );
+            *target, iFactory->PolicyArray() );
                                                    
     iPolicyEvaluator->EvaluateVisibilityPolicyL( 
-            *target, element->PolicyArray() );
+            *target, iFactory->PolicyArray() );
                                                    
     ProcessTransactionElementL( element );
       
@@ -1275,7 +1276,7 @@
         RPropertyHashMap propertyHashMap;
         CleanupClosePushL( propertyHashMap );
         
-        aElement->CommitL( layoutChanged, propertyHashMap );
+        aElement->CommitL( iFactory->PolicyArray(), propertyHashMap );
         SetPropertyArraysL( propertyHashMap );
         
         CleanupStack::PopAndDestroy( &propertyHashMap );
@@ -1444,22 +1445,22 @@
     if ( aResource )
         {
         iPolicyEvaluator->EvaluateResourcePolicyL( 
-            *target, *aResource, element->PolicyArray() );
+            *target, *aResource, iFactory->PolicyArray() );
 
         iPolicyEvaluator->EvaluateContentPolicyL( 
-            *target, element->PolicyArray() );
+            *target, iFactory->PolicyArray() );
                                                   
         iPolicyEvaluator->EvaluateVisibilityPolicyL( 
-            *target, element->PolicyArray() );                                                     
+            *target, iFactory->PolicyArray() );                                                     
         }
 
     else
         {
         iPolicyEvaluator->EvaluateContentPolicyL( 
-            *target, element->PolicyArray() );
+            *target, iFactory->PolicyArray() );
                                                   
         iPolicyEvaluator->EvaluateVisibilityPolicyL( 
-            *target, element->PolicyArray() );                                                    
+            *target, iFactory->PolicyArray() );                                                    
         }
 
     ProcessTransactionElementL( element );
@@ -1522,21 +1523,21 @@
     if ( aResource )
         {
         iPolicyEvaluator->EvaluateResourcePolicyL( 
-            *target, *aResource, element->PolicyArray() );
+            *target, *aResource, iFactory->PolicyArray() );
                                                    
         iPolicyEvaluator->EvaluateContentPolicyL( 
-            *target, element->PolicyArray() );
+            *target, iFactory->PolicyArray() );
                                                   
         iPolicyEvaluator->EvaluateVisibilityPolicyL( 
-            *target, element->PolicyArray() );                                                     
+            *target, iFactory->PolicyArray() );                                                     
         }
     else
         {
         iPolicyEvaluator->EvaluateContentPolicyL( 
-            *target, element->PolicyArray() );
+            *target, iFactory->PolicyArray() );
                                                   
         iPolicyEvaluator->EvaluateVisibilityPolicyL( 
-            *target, element->PolicyArray() );                                                     
+            *target, iFactory->PolicyArray() );                                                     
         }
 
     ProcessTransactionElementL( element );