--- a/mobilemessaging/unieditor/application/src/UniEditorLaunchOperation.cpp Wed Sep 01 12:31:54 2010 +0100
+++ b/mobilemessaging/unieditor/application/src/UniEditorLaunchOperation.cpp Tue Sep 14 21:11:56 2010 +0300
@@ -402,13 +402,9 @@
//
void CUniEditorLaunchOperation::DoPrepareHeaderL()
{
- if(!iHeader)
- {
- // Header is always drawn and populated
- iHeader = CUniEditorHeader::NewL( iDocument.Mtm(), iDocument, iView, iFs );
- }
- if(!iOptimizedFlow)
- CompleteSelf( KErrNone );
+ // Header is always drawn and populated
+ iHeader = CUniEditorHeader::NewL( iDocument.Mtm(), iDocument, iView, iFs );
+ CompleteSelf( KErrNone );
}
// ---------------------------------------------------------
@@ -417,28 +413,21 @@
//
void CUniEditorLaunchOperation::DoPrepareBodyL()
{
- if(!iSlideLoader)
- {
- iSlideLoader = CUniSlideLoader::NewL(
- iControlObserver,
- *iDocument.DataModel(),
- iView,
- EUniControlEditorMode );
- }
-
+ iSlideLoader = CUniSlideLoader::NewL(
+ iControlObserver,
+ *iDocument.DataModel(),
+ iView,
+ EUniControlEditorMode );
+
if ( iDocument.DataModel()->SmilType() == EMmsSmil )
{
- if(!iOptimizedFlow)
+ if ( !iDocument.DataModel()->SmilModel().SlideCount() )
{
- if ( !iDocument.DataModel()->SmilModel().SlideCount() )
- {
- iDocument.DataModel()->SmilModel().AddSlideL();
- }
+ iDocument.DataModel()->SmilModel().AddSlideL();
+ }
- iSlideLoader->LoadSlideL( *this, 0 );
-
- SetPending();
- }
+ iSlideLoader->LoadSlideL( *this, 0 );
+ SetPending();
}
else
{
@@ -630,8 +619,6 @@
iOptimizedFlow = iSendUiOperation->IsOptimizedFlagSet();
if(iOptimizedFlow)
{
- DoPrepareHeaderL();
- DoPrepareBodyL();
iObserver.EditorOperationEvent(
EUniEditorOperationLaunch,
EUniEditorOperationComplete );