diff -r 7be2816dbabd -r 137ebc85284b menufw/hierarchynavigator/hnpresentationmodel/src/hnextbmpiconholder.cpp --- a/menufw/hierarchynavigator/hnpresentationmodel/src/hnextbmpiconholder.cpp Tue May 11 16:02:39 2010 +0300 +++ b/menufw/hierarchynavigator/hnpresentationmodel/src/hnextbmpiconholder.cpp Tue May 25 12:29:32 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: +* Description: * */ @@ -28,10 +28,10 @@ CLiwBitmapBuffer* aBmpBuffer, CLiwBitmapBuffer* aMaskBuffer ) { __ASSERT_DEBUG( aGulIcon && aBmpBuffer, User::Invariant() ); - + if ( aGulIcon ) { - __ASSERT_DEBUG( aGulIcon->BitmapsOwnedExternally(), User::Invariant() ); + __ASSERT_DEBUG( aGulIcon->BitmapsOwnedExternally(), User::Invariant() ); CHnIconHolder::SetGulIcon( aGulIcon ); aGulIcon->SetBitmapsOwnedExternally( ETrue ); if ( aBmpBuffer ) @@ -56,9 +56,27 @@ if ( iBmpBuffer ) { iBmpBuffer->DecRef(); - } + } if ( iMaskBuffer ) { iMaskBuffer->DecRef(); } } + +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +void CHnExtBmpIconHolder::CleanBmpBuffer() + { + if ( iBmpBuffer ) + { + iBmpBuffer->DecRef(); + iBmpBuffer = NULL; + } + if ( iMaskBuffer ) + { + iMaskBuffer->DecRef(); + iMaskBuffer = NULL; + } + }