uifw/EikStd/coctlsrc/aknitemactionmenuregister.cpp
changeset 14 3320e4e6e8bb
parent 0 2f259fa3e83a
--- a/uifw/EikStd/coctlsrc/aknitemactionmenuregister.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/EikStd/coctlsrc/aknitemactionmenuregister.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -338,17 +338,6 @@
         CAknItemActionMenu& aItemActionMenu )
     {
     iRegisterArray->UnregisterItemActionMenu( aItemActionMenu );
-
-    for ( TInt i = 0; i < iUnregisteredMenus.Count(); i++ )
-        {
-        TAknUnregisteredMenuData& data( iUnregisteredMenus[ i ] );
-        if ( data.iMenu == &aItemActionMenu )
-            {
-            delete data.iMenu;
-            iUnregisteredMenus.Remove( i ); 
-            break; 
-            }
-        }
     }
 
 
@@ -377,22 +366,15 @@
         MAknCollectionObserver& aObserver )
     {
     iRegisterArray->UnregisterCollectionObserver( aObserver );
-
     for ( TInt i = 0; i < iUnregisteredObservers.Count(); i++ )
         {
         TAknUnregisteredObserverData& data( iUnregisteredObservers[ i ] );
         if ( &data.iObserver == &aObserver )
             {
             iUnregisteredObservers.Remove( i );
-            return;
+            break;
             }
         }
-
-    for ( TInt i = 0; i < iUnregisteredMenus.Count(); i++ )
-        {
-        TAknUnregisteredMenuData& data( iUnregisteredMenus[ i ] );
-        data.iMenu->RemoveCollectionObserver( aObserver ); 
-        }
     }