diff -r bd874ee5e5e2 -r 502e5d91ad42 contentpublishingsrv/contentpublishingserver/cpserver/src/cpserveractionmanager.cpp --- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserveractionmanager.cpp Fri Mar 12 15:43:54 2010 +0200 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserveractionmanager.cpp Mon Mar 15 12:41:53 2010 +0200 @@ -155,10 +155,7 @@ param = aList.FindFirst( pos, KListMap, EVariantTypeMap ); if ( param && pos !=KErrNotFound ) { - CLiwDefaultMap* map = CLiwDefaultMap::NewLC( ); - param->Value().Get( *map ); - ExtractUidAndMapL( *map, aTarget ); - CleanupStack::PopAndDestroy( map ); + ExtractUidAndMapL( *param->Value().AsMap(), aTarget ); } else { @@ -170,7 +167,7 @@ // CCPActionManager::ExtractUidAndMapL // --------------- -------------------------------------------------------------- // -void CCPActionManager::ExtractUidAndMapL( const CLiwDefaultMap& aMap, +void CCPActionManager::ExtractUidAndMapL( const CLiwMap& aMap, CLiwGenericParamList& aTarget ) { CP_DEBUG( _L8("CCPActionManager::ExtractUidAndMapL()") ); @@ -178,21 +175,23 @@ variant.PushL( ); if ( aMap.FindL( KActionMap, variant ) ) { - CLiwDefaultMap* map = CLiwDefaultMap::NewLC( ); - variant.Get( *map ); - if ( map->FindL( KDataForActionHandler, variant ) ) - { - TLiwGenericParam param( KDataForActionHandler, variant); - aTarget.AppendL( param ); - } - if ( map->FindL( KPluginUid, variant ) ) - { - TLiwGenericParam param( KPluginUid, variant); - aTarget.AppendL( param ); - } - CleanupStack::PopAndDestroy( map ); + TLiwVariant valueVariant; + valueVariant.PushL( ); + if ( variant.TypeId() == EVariantTypeMap ) + { + if ( variant.AsMap()->FindL( KDataForActionHandler, valueVariant ) ) + { + TLiwGenericParam param( KDataForActionHandler, valueVariant); + aTarget.AppendL( param ); + } + if ( variant.AsMap()->FindL( KPluginUid, valueVariant ) ) + { + TLiwGenericParam param( KPluginUid, valueVariant); + aTarget.AppendL( param ); + } + } + CleanupStack::PopAndDestroy( &valueVariant ); } - CleanupStack::PopAndDestroy( &variant ); }