voiceui/pbkinfoviewimpl/src/pbkinfoviewsindhandler.cpp
branchRCL_3
changeset 27 01e4abc4f07e
parent 24 bf318c0ae8c0
--- a/voiceui/pbkinfoviewimpl/src/pbkinfoviewsindhandler.cpp	Tue Sep 14 21:21:09 2010 +0300
+++ b/voiceui/pbkinfoviewimpl/src/pbkinfoviewsindhandler.cpp	Wed Oct 13 14:33:27 2010 +0300
@@ -356,17 +356,9 @@
     HBufC* contact = NULL;
     HBufC* type = NULL;
     TRAPD( err, contact = iTagArray[aIndex]->SpeechItem()->PartialTextL( KNameTrainingIndex ) );
-    if ( err != KErrNone && err != KErrNotFound) 
-        {
-        User::Leave( err );
-        }
-    CleanupStack::PushL( contact );
-    TRAPD( err2, type = iTagArray[aIndex]->SpeechItem()->PartialTextL( KExtensionTrainingIndex ) );
-    if ( err2 != KErrNone && err2 != KErrNotFound) 
-        {
-        User::Leave( err2 );
-        }
-    CleanupStack::PushL( type );
+    if ( err != KErrNone && err != KErrNotFound) User::Leave( err ); 
+    TRAPD( err2, iTagArray[aIndex]->SpeechItem()->PartialTextL( KExtensionTrainingIndex ) );
+    if ( err2 != KErrNone && err2 != KErrNotFound) User::Leave( err2 );
 
     // fetch whole tts string 
     const TDesC& text = iTagArray[aIndex]->SpeechItem()->Text();
@@ -449,7 +441,6 @@
         // if there is only one part (contact), play normally
         iTagArray[aIndex]->SpeechItem()->PlayL( this );
         }
-    CleanupStack::PopAndDestroy( 2,contact );
     }
     
 // ----------------------------------------------------------------------------