--- a/menufw/hierarchynavigator/hnmetadatamodel/src/hnmdmodel.cpp	Wed Sep 15 12:00:00 2010 +0300
+++ b/menufw/hierarchynavigator/hnmetadatamodel/src/hnmdmodel.cpp	Wed Oct 13 14:18:30 2010 +0300
@@ -64,7 +64,6 @@
     iMode = EMdModeNormal;
     iRepositoryWidgetTypeObserver = CHnRepositoryWidgetTypeObserver::NewL( &iCmnPtrs, KMatrixRepositoryUid );
     iRepositoryShowFolderObserver = CHnRepositoryShowFolderObserver::NewL( &iCmnPtrs, KCRUidMenu, KMenuShowFolder );
-    iRepositoryOpenItemObserver = CHnRepositoryOpenItemObserver::NewL( &iCmnPtrs, KCRUidMenu, KMenuOpenItem );
     MMPERF(("CHnMetaDataModel::ConstructL - rep. observer ready"));
     }
 
@@ -112,7 +111,6 @@
     {
     delete iRepositoryWidgetTypeObserver;
     delete iRepositoryShowFolderObserver;
-    delete iRepositoryOpenItemObserver;
     iLoadedSuites.ResetAndDestroy();
     delete iXmlModelProvider;
     delete iLocalization;
@@ -249,9 +247,9 @@
 // ---------------------------------------------------------------------------
 //
 EXPORT_C TBool CHnMdModel::IsForegroundQueued() const
-    {
-    return iForegroundQueued;
-    }
+	{
+	return iForegroundQueued;
+	}
 
 // ---------------------------------------------------------------------------
 //
@@ -266,13 +264,13 @@
 
     if ( IsForegroundQueued() && ( !iForegroundTriggeringSuite ||
             iForegroundTriggeringSuite == aJustEvaluatedSuite ) )
-        {
-        CLiwGenericParamList* pl = CLiwGenericParamList::NewL();
-        CleanupStack::PushL( pl );
-        iCmnPtrs.iModelEventObserver->HandleModelEventL( KAppGainForeground, *pl );
-        CleanupStack::PopAndDestroy( pl );
-        QueueForeground( ENever );
-        }
+    	{
+    	CLiwGenericParamList* pl = CLiwGenericParamList::NewL();
+    	CleanupStack::PushL( pl );
+    	iCmnPtrs.iModelEventObserver->HandleModelEventL( KAppGainForeground, *pl );
+    	CleanupStack::PopAndDestroy( pl );
+    	QueueForeground( ENever );
+    	}
     }
 
 // ---------------------------------------------------------------------------
@@ -318,11 +316,11 @@
     {
     TInt err( KErrNone );
 
-    RXmlEngDocument xmlDoc;
-    // Xml model provider takes ownership of xmlDoc.
-    TRAP( err, iXmlModelProvider->GetModelL( aGenre, xmlDoc ) );
+	RXmlEngDocument xmlDoc;
+	// Xml model provider takes ownership of xmlDoc.
+	TRAP( err, iXmlModelProvider->GetModelL( aGenre, xmlDoc ) );
 
-    TXmlEngElement element;
+	TXmlEngElement element;
     if ( !err )
         {
         element = xmlDoc.DocumentElement().AsElement();
@@ -344,10 +342,10 @@
         TInt pos( 0 );
         newSuite->GetSuiteParameters().FindFirst( pos, KSuiteName8);
         if ( pos == KErrNotFound )
-            {
-            newSuite->GetSuiteParameters().AppendL(
-                TLiwGenericParam(KSuiteName8, TLiwVariant( aGenre ) ) );
-            }
+        	{
+        	newSuite->GetSuiteParameters().AppendL(
+        			TLiwGenericParam(KSuiteName8, TLiwVariant( aGenre ) ) );
+        	}
 
         iCmnPtrs.iContainer->PushNewSuiteModelL( newSuite->SuiteName() );
         iCmnPtrs.iContainer->GetLastSuiteModel()->GetItemsOrder()->
@@ -357,9 +355,9 @@
         iLoadedSuites.AppendL( newSuite );
         }
     else
-        {
-        MMPERF(("CHnMdModel::LoadSuiteL - Error TRAPPED!"));
-        }
+    	{
+    	MMPERF(("CHnMdModel::LoadSuiteL - Error TRAPPED!"));
+    	}
 
     return err;
     }
@@ -397,8 +395,8 @@
 // ---------------------------------------------------------------------------
 //
 TInt CHnMdModel::LoadedSuitesCount()
-    {
-    return iLoadedSuites.Count();
-    }
+	{
+	return iLoadedSuites.Count();
+	}