diff -r fcdfafb36fe7 -r aecbbf00d063 applicationinterworkingfw/ServiceHandler/src/AiwMenu.cpp --- a/applicationinterworkingfw/ServiceHandler/src/AiwMenu.cpp Thu Aug 19 10:11:06 2010 +0300 +++ b/applicationinterworkingfw/ServiceHandler/src/AiwMenu.cpp Tue Aug 31 15:28:30 2010 +0300 @@ -26,7 +26,7 @@ // This is needed for resource reading. const TInt KCCMask(0x00000fff); -const TInt KNominalTextLength = 40; + EXPORT_C CAiwMenuPane::CAiwMenuPane(CEikMenuPane& aMenuPane, TInt aBaseCmdId) : iMenuPane(&aMenuPane), iBaseCmdId(aBaseCmdId) @@ -98,8 +98,7 @@ data.iCommandId = aReader.ReadInt32(); data.iCascadeId = aReader.ReadInt32(); data.iFlags = aReader.ReadInt32(); - TPtrC text( aReader.ReadTPtrC() ); - data.iText.Copy( text.Ptr(), Min( KNominalTextLength, text.Length() ) ); + data.iText.Copy(aReader.ReadTPtrC()); // Extra text (additional submenu text) must be handled separately // because SData doesn't offer space for it. @@ -225,7 +224,7 @@ data.iCommandId = AIW_SUBMENU_TITLE; data.iCascadeId = 0; data.iFlags = 0; - data.iText.Copy(aTitle.Ptr(),Min(KNominalTextLength,aTitle.Length())); + data.iText.Copy(aTitle); iMenuPane->InsertMenuItemL(data, aIndex); }