diff -r ce1c7ad1f18b -r bcb43dc84c44 photosgallery/viewframework/views/metadatadialog/src/glximgvwrmetadatacontainer.cpp --- a/photosgallery/viewframework/views/metadatadialog/src/glximgvwrmetadatacontainer.cpp Mon Mar 15 12:40:30 2010 +0200 +++ b/photosgallery/viewframework/views/metadatadialog/src/glximgvwrmetadatacontainer.cpp Wed Mar 31 21:31:03 2010 +0300 @@ -63,7 +63,6 @@ const TInt KMarqueeScrollAmount = 20; const TInt KMarqueeScrollDelay = 1000000; const TInt KMarqueeScrollInterval = 200000; -_LIT( KGlxTextSetter, ""); // ============================ MEMBER FUNCTIONS =============================== @@ -158,7 +157,7 @@ { TRACER("CGlxImgVwrMetadataContainer::CreateSettingItemL"); CAknSettingItem* settingItem = NULL; // No need to push onto cleanup stack - iTextSetter.Copy(KGlxTextSetter); + iTextSetter.Zero(); //Creating a empty Settings list box which will be populated with metadata in handleattributeavailable switch(aResourceId) @@ -305,6 +304,7 @@ for(TInt index = 0; index <= EImgVwrlicenseItem; index++) { HBufC* string = NULL; + iTextSetter.Zero(); if(index == EImgVwrSizeItem) { @@ -344,7 +344,7 @@ } if(string) { - iTextSetter.Copy(KGlxTextSetter); + iTextSetter.Zero(); iTextSetter.Append(*string); } CleanupStack::PushL( string ); @@ -374,8 +374,8 @@ // HandleCommandCompleteL // ---------------------------------------------------------------------------- // -void CGlxImgVwrMetadataContainer::HandleCommandCompleteL(TAny* aSessionId, - CMPXCommand* /*aCommandResult*/, TInt aError, MGlxMediaList* aList) +void CGlxImgVwrMetadataContainer::HandleCommandCompleteL(TAny* /*aSessionId*/, + CMPXCommand* /*aCommandResult*/, TInt /*aError*/, MGlxMediaList* /*aList*/) { TRACER("CGlxImgVwrMetadataContainer::HandleCommandCompleteL()"); } @@ -574,7 +574,7 @@ //get the settings item based on the attribute and set the text. if ( string ) { - iTextSetter.Copy(KGlxTextSetter); + iTextSetter.Zero(); iTextSetter.Append(*string); if(attribute == KMPXMediaGeneralSize) { @@ -665,6 +665,7 @@ if(0 != (titleText.Compare(*textBuf))) { //Modify the MDS and setting list only if the entry is different from previous Item value + iTextSetter.Zero(); iTextSetter.Copy(*textBuf); EditItemL(aItem,EFalse); if( iItemMediaList->Count() > 0 )