--- a/sf_config/config/inc/bldcodeline.hrh	Tue May 11 17:20:40 2010 +0300
+++ b/sf_config/config/inc/bldcodeline.hrh	Tue May 18 17:16:07 2010 +0100
@@ -15,6 +15,7 @@
 *
 */
 
+
 #ifndef __BLDCODELINE_HRH 
 #define __BLDCODELINE_HRH 
 
@@ -58,6 +59,12 @@
 Flag enables ui accelerator toolkit development. 
 */ 
 #define RD_ALF_IN_PLATFORM                                  
+
+/** #ALF_USE_OPENWF_COMPOSITION
+Bug 1391 - UI Acceleration migration to OpenWF
+*/ 
+#define ALF_USE_OPENWF_COMPOSITION
+
  
 /** #RD_ALR_AND_NLR_ENABLERS  
 Enables Application and Network Level Roaming. 
@@ -585,7 +592,7 @@
 /** #RD_IMAGEPREVIEW  
 ImageViewer's ImagePreview API and DLL are available in release. 
 */ 
-#define RD_IMAGEPREVIEW                                     
+#undef RD_IMAGEPREVIEW                                     
  
 /** #RD_IMAGINGCONFIGMANAGER  
 Flag to include/exclude Imaging Configuration Manager component. 
@@ -1239,25 +1246,25 @@
 done behind this flag to secure that existing functionality won't suffer
 regression during implementation. 
 */ 
-#undef RD_UI_TRANSITION_EFFECTS_LAYOUT_SWITCH              
+#define RD_UI_TRANSITION_EFFECTS_LAYOUT_SWITCH              
  
 /** #RD_UI_TRANSITION_EFFECTS_LIST  
 This flag will be used to secure that development of list transition effects
 won't break existing fullscreen and components transition effects. 
 */ 
-#undef RD_UI_TRANSITION_EFFECTS_LIST                       
+#define RD_UI_TRANSITION_EFFECTS_LIST                       
  
 /** #RD_UI_TRANSITION_EFFECTS_PHASE2  
 Feature enables early development of 2nd phase UI transition effects. 
 */ 
-#undef RD_UI_TRANSITION_EFFECTS_PHASE2                     
+#define RD_UI_TRANSITION_EFFECTS_PHASE2                     
  
 /** #RD_UI_TRANSITION_EFFECTS_POPUPS  
 "Development of transition effects in popups (notes, queries, etc) will be done
 behind this flag to secure that existing functionality won't suffer regression
 during implementation." 
 */ 
-#undef RD_UI_TRANSITION_EFFECTS_POPUPS                     
+#define RD_UI_TRANSITION_EFFECTS_POPUPS                     
  
 /** #RD_UI_ZOOM  
 This feature activates the zooming support in Series 60 UI. 
@@ -1414,4 +1421,4 @@
 #define RD_XML_ENGINE_API_CHANGE                            
  
 
-#endif // __BLDCODELINE_HRH 
\ No newline at end of file
+#endif // __BLDCODELINE_HRH