diff -r a3a1ae9acec6 -r da5135c61bad meetingrequest/mrgui/bwins/ESMRGUIU.def
--- a/meetingrequest/mrgui/bwins/ESMRGUIU.def	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mrgui/bwins/ESMRGUIU.def	Wed Mar 31 21:08:33 2010 +0300
@@ -1,71 +1,9 @@
 EXPORTS
-	?Text@CESMRAlarm@@QAEPAVHBufC16@@XZ @ 1 NONAME ; class HBufC16 * CESMRAlarm::Text(void)
-	?GetFieldRowLayoutRect@NMRLayoutManager@@YA?AVTAknLayoutRect@@ABVTRect@@H@Z @ 2 NONAME ; class TAknLayoutRect NMRLayoutManager::GetFieldRowLayoutRect(class TRect const &, int)
-	?GetLayoutText@NMRLayoutManager@@YA?AVTAknLayoutText@@ABVTRect@@W4TMRTextLayout@1@@Z @ 3 NONAME ; class TAknLayoutText NMRLayoutManager::GetLayoutText(class TRect const &, enum NMRLayoutManager::TMRTextLayout)
-	?ConflictPopupPosition@CESMRLayoutManager@@SA?AVTPoint@@XZ @ 4 NONAME ; class TPoint CESMRLayoutManager::ConflictPopupPosition(void)
-	??1CESMRUiFactory@@UAE@XZ @ 5 NONAME ; CESMRUiFactory::~CESMRUiFactory(void)
-	?ExecuteDlgLD@CESMRResponseDialog@@QAEHXZ @ 6 NONAME ; int CESMRResponseDialog::ExecuteDlgLD(void)
-	?GetContactManager@CESMRContactManagerHandler@@QAEAAVCVPbkContactManager@@XZ @ 7 NONAME ; class CVPbkContactManager & CESMRContactManagerHandler::GetContactManager(void)
-	?SetCommandObserver@CESMRContactMenuHandler@@QAEXPAVMEikCommandObserver@@@Z @ 8 NONAME ; void CESMRContactMenuHandler::SetCommandObserver(class MEikCommandObserver *)
-	?SetBitmapFallback@CESMRLayoutManager@@SAXABVTAknsItemID@@AAH1@Z @ 9 NONAME ; void CESMRLayoutManager::SetBitmapFallback(class TAknsItemID const &, int &, int &)
-	?AddObserverL@CESMRContactManagerHandler@@QAEXPAVMESMRContactManagerObserver@@@Z @ 10 NONAME ; void CESMRContactManagerHandler::AddObserverL(class MESMRContactManagerObserver *)
-	?NewL@CESMRUiFactory@@SAPAV1@XZ @ 11 NONAME ; class CESMRUiFactory * CESMRUiFactory::NewL(void)
-	?NewL@CESMRViewerDialog@@SAPAV1@PAVCESMRPolicy@@AAVMESMRCalEntry@@AAVMAgnEntryUiCallback@@@Z @ 12 NONAME ; class CESMRViewerDialog * CESMRViewerDialog::NewL(class CESMRPolicy *, class MESMRCalEntry &, class MAgnEntryUiCallback &)
-	?IsReady@CESMRContactManagerHandler@@QAEHXZ @ 13 NONAME ; int CESMRContactManagerHandler::IsReady(void)
-	?SendAsVCalendarL@CESMRSendUI@@QAEXHAAVCCalEntry@@@Z @ 14 NONAME ; void CESMRSendUI::SendAsVCalendarL(int, class CCalEntry &)
-	??0CESMRRecurrence@@QAE@XZ @ 15 NONAME ; CESMRRecurrence::CESMRRecurrence(void)
-	?LoadTextL@CESMRAlarm@@QAEXPAVCCoeEnv@@@Z @ 16 NONAME ; void CESMRAlarm::LoadTextL(class CCoeEnv *)
-	?IsMirrored@CESMRLayoutManager@@SAHXZ @ 17 NONAME ; int CESMRLayoutManager::IsMirrored(void)
-	??1RESMRStatic@@QAE@XZ @ 18 NONAME ; RESMRStatic::~RESMRStatic(void)
-	??1CMRImage@@UAE@XZ @ 19 NONAME ; CMRImage::~CMRImage(void)
-	?ExecuteL@CESMRGlobalNote@@SAXW4TESMGlobalNoteType@1@@Z @ 20 NONAME ; void CESMRGlobalNote::ExecuteL(enum CESMRGlobalNote::TESMGlobalNoteType)
-	?NewL@CMRImage@@SAPAV1@ABVTAknsItemID@@W4TScaleMode@@@Z @ 21 NONAME ; class CMRImage * CMRImage::NewL(class TAknsItemID const &, enum TScaleMode)
-	?ExecuteL@CESMRConfirmationQuery@@SAHW4TESMRConfirmationQueryType@1@@Z @ 22 NONAME ; int CESMRConfirmationQuery::ExecuteL(enum CESMRConfirmationQuery::TESMRConfirmationQueryType)
-	?RecurrenceText@CESMRRecurrence@@QAEAAVHBufC16@@XZ @ 23 NONAME ; class HBufC16 & CESMRRecurrence::RecurrenceText(void)
-	?NewL@CESMRGlobalNote@@SAPAV1@W4TESMGlobalNoteType@1@@Z @ 24 NONAME ; class CESMRGlobalNote * CESMRGlobalNote::NewL(enum CESMRGlobalNote::TESMGlobalNoteType)
-	?Id@CESMRAlarm@@QAEHXZ @ 25 NONAME ; int CESMRAlarm::Id(void)
-	?ExecuteLD@CESMRListQuery@@QAEHXZ @ 26 NONAME ; int CESMRListQuery::ExecuteLD(void)
-	?GetFieldLayoutRect@NMRLayoutManager@@YA?AVTAknLayoutRect@@ABVTRect@@H@Z @ 27 NONAME ; class TAknLayoutRect NMRLayoutManager::GetFieldLayoutRect(class TRect const &, int)
-	?SetValueL@CESMRContactMenuHandler@@QAEXABVTDesC16@@W4TValueType@1@@Z @ 28 NONAME ; void CESMRContactMenuHandler::SetValueL(class TDesC16 const &, enum CESMRContactMenuHandler::TValueType)
-	?GetBitmapStruct@NMRBitmapManager@@YA?AVTMRBitmapStruct@1@W4TMRBitmapId@1@@Z @ 29 NONAME ; class NMRBitmapManager::TMRBitmapStruct NMRBitmapManager::GetBitmapStruct(enum NMRBitmapManager::TMRBitmapId)
-	?ExecuteL@CESMRListQuery@@SAHW4TESMRListQueryType@1@@Z @ 30 NONAME ; int CESMRListQuery::ExecuteL(enum CESMRListQuery::TESMRListQueryType)
-	?Close@RESMRStatic@@QAEXXZ @ 31 NONAME ; void RESMRStatic::Close(void)
-	?ShowActionMenuL@CESMRContactMenuHandler@@QAEXXZ @ 32 NONAME ; void CESMRContactMenuHandler::ShowActionMenuL(void)
-	?ContactMenuHandlerL@RESMRStatic@@QAEAAVCESMRContactMenuHandler@@XZ @ 33 NONAME ; class CESMRContactMenuHandler & RESMRStatic::ContactMenuHandlerL(void)
-	?SetAttachmentInfoL@CESMRContactMenuHandler@@QAEXPAVCESMRAttachmentInfo@@@Z @ 34 NONAME ; void CESMRContactMenuHandler::SetAttachmentInfoL(class CESMRAttachmentInfo *)
-	??1CESMRRecurrence@@UAE@XZ @ 35 NONAME ; CESMRRecurrence::~CESMRRecurrence(void)
-	??0RESMRStatic@@QAE@XZ @ 36 NONAME ; RESMRStatic::RESMRStatic(void)
-	?DisplaySendCascadeMenuL@CESMRSendUI@@QAEXAAVCEikMenuPane@@@Z @ 37 NONAME ; void CESMRSendUI::DisplaySendCascadeMenuL(class CEikMenuPane &)
-	?NewL@CESMRSendUI@@SAPAV1@H@Z @ 38 NONAME ; class CESMRSendUI * CESMRSendUI::NewL(int)
-	??1CMRLabel@@UAE@XZ @ 39 NONAME ; CMRLabel::~CMRLabel(void)
-	?CurrentFieldIndex@RESMRStatic@@QAEHXZ @ 40 NONAME ; int RESMRStatic::CurrentFieldIndex(void)
-	?GetSkinBasedBitmap@NMRBitmapManager@@YAHW4TMRBitmapId@1@AAPAVCFbsBitmap@@1VTSize@@@Z @ 41 NONAME ; int NMRBitmapManager::GetSkinBasedBitmap(enum NMRBitmapManager::TMRBitmapId, class CFbsBitmap * &, class CFbsBitmap * &, class TSize)
-	?RemoveObserver@CESMRContactManagerHandler@@QAEXPAVMESMRContactManagerObserver@@@Z @ 42 NONAME ; void CESMRContactManagerHandler::RemoveObserver(class MESMRContactManagerObserver *)
-	?ConstructFromResourceL@CESMRAlarm@@QAEXAAVTResourceReader@@@Z @ 43 NONAME ; void CESMRAlarm::ConstructFromResourceL(class TResourceReader &)
-	?RecurrenceValue@CESMRRecurrence@@QAE?AW4TESMRRecurrenceValue@@XZ @ 44 NONAME ; enum TESMRRecurrenceValue CESMRRecurrence::RecurrenceValue(void)
-	?RelativeTimeInMinutes@CESMRAlarm@@QAE?AVTTimeIntervalMinutes@@XZ @ 45 NONAME ; class TTimeIntervalMinutes CESMRAlarm::RelativeTimeInMinutes(void)
-	?CanSendL@CESMRSendUI@@QAEHH@Z @ 46 NONAME ; int CESMRSendUI::CanSendL(int)
-	?DisplaySendMenuItemL@CESMRSendUI@@QAEXAAVCEikMenuPane@@H@Z @ 47 NONAME ; void CESMRSendUI::DisplaySendMenuItemL(class CEikMenuPane &, int)
-	?NewL@CESMREditorDialog@@SAPAV1@PAVCESMRPolicy@@AAVMESMRCalEntry@@AAVMAgnEntryUiCallback@@@Z @ 48 NONAME ; class CESMREditorDialog * CESMREditorDialog::NewL(class CESMRPolicy *, class MESMRCalEntry &, class MAgnEntryUiCallback &)
-	?NewL@CMRImage@@SAPAV1@W4TMRBitmapId@NMRBitmapManager@@W4TScaleMode@@@Z @ 49 NONAME ; class CMRImage * CMRImage::NewL(enum NMRBitmapManager::TMRBitmapId, enum TScaleMode)
-	?ContactManagerHandlerL@RESMRStatic@@QAEAAVCESMRContactManagerHandler@@XZ @ 50 NONAME ; class CESMRContactManagerHandler & RESMRStatic::ContactManagerHandlerL(void)
-	?ExecuteEditBeforeSendL@CESMRListQuery@@SAHW4TESMRAttendeeStatus@@@Z @ 51 NONAME ; int CESMRListQuery::ExecuteEditBeforeSendL(enum TESMRAttendeeStatus)
-	?GetLayoutRect@NMRLayoutManager@@YA?AVTAknLayoutRect@@ABVTRect@@W4TMRLayout@1@@Z @ 52 NONAME ; class TAknLayoutRect NMRLayoutManager::GetLayoutRect(class TRect const &, enum NMRLayoutManager::TMRLayout)
-	?Reset@CESMRContactMenuHandler@@QAEXXZ @ 53 NONAME ; void CESMRContactMenuHandler::Reset(void)
-	?ExecuteL@CESMRGUIListQuery@@SAHW4TESMRListQueryType@1@@Z @ 54 NONAME ; int CESMRGUIListQuery::ExecuteL(enum CESMRGUIListQuery::TESMRListQueryType)
-	?ConnectL@RESMRStatic@@QAEXXZ @ 55 NONAME ; void RESMRStatic::ConnectL(void)
-	?ExecuteEditBeforeSendWithSendOptOnlyL@CESMRListQuery@@SAHW4TESMRAttendeeStatus@@@Z @ 56 NONAME ; int CESMRListQuery::ExecuteEditBeforeSendWithSendOptOnlyL(enum TESMRAttendeeStatus)
-	?NewL@CESMRListQuery@@SAPAV1@W4TESMRListQueryType@1@@Z @ 57 NONAME ; class CESMRListQuery * CESMRListQuery::NewL(enum CESMRListQuery::TESMRListQueryType)
-	?GetTextComponentLayout@NMRLayoutManager@@YA?AVTAknTextComponentLayout@@W4TMRTextLayout@1@@Z @ 58 NONAME ; class TAknTextComponentLayout NMRLayoutManager::GetTextComponentLayout(enum NMRLayoutManager::TMRTextLayout)
-	?CreateUIL@CESMRUiFactory@@UAEPAVMESMRUiBase@@PAVCESMRPolicy@@AAVMESMRCalEntry@@AAVMAgnEntryUiCallback@@@Z @ 59 NONAME ; class MESMRUiBase * CESMRUiFactory::CreateUIL(class CESMRPolicy *, class MESMRCalEntry &, class MAgnEntryUiCallback &)
-	?ConstructFromResourceL@CESMRRecurrence@@QAEXPAVCCoeEnv@@AAVTResourceReader@@@Z @ 60 NONAME ; void CESMRRecurrence::ConstructFromResourceL(class CCoeEnv *, class TResourceReader &)
-	?GetWindowComponentLayout@NMRLayoutManager@@YA?AVTAknWindowComponentLayout@@W4TMRLayout@1@@Z @ 61 NONAME ; class TAknWindowComponentLayout NMRLayoutManager::GetWindowComponentLayout(enum NMRLayoutManager::TMRLayout)
-	?Relative@CESMRAlarm@@QAEHXZ @ 62 NONAME ; int CESMRAlarm::Relative(void)
-	??0CESMRAlarm@@QAE@XZ @ 63 NONAME ; CESMRAlarm::CESMRAlarm(void)
-	?SetCurrentFieldIndex@RESMRStatic@@QAEXH@Z @ 64 NONAME ; void RESMRStatic::SetCurrentFieldIndex(int)
-	??1CESMRSendUI@@UAE@XZ @ 65 NONAME ; CESMRSendUI::~CESMRSendUI(void)
-	?NewL@CMRLabel@@SAPAV1@XZ @ 66 NONAME ; class CMRLabel * CMRLabel::NewL(void)
-	?NewL@CESMRResponseDialog@@SAPAV1@AAPAVHBufC16@@@Z @ 67 NONAME ; class CESMRResponseDialog * CESMRResponseDialog::NewL(class HBufC16 * &)
-	??1CESMRAlarm@@UAE@XZ @ 68 NONAME ; CESMRAlarm::~CESMRAlarm(void)
-	?MailBoxL@RESMRStatic@@QAEAAVCFSMailBox@@ABVTDesC16@@@Z @ 69 NONAME ; class CFSMailBox & RESMRStatic::MailBoxL(class TDesC16 const &)
+	?NewL@CESMREditorDialog@@SAPAV1@AAVMMRInfoProvider@@AAVMAgnEntryUiCallback@@@Z @ 1 NONAME ; class CESMREditorDialog * CESMREditorDialog::NewL(class MMRInfoProvider &, class MAgnEntryUiCallback &)
+	?ExecuteDlgLD@CESMRResponseDialog@@QAEHXZ @ 2 NONAME ; int CESMRResponseDialog::ExecuteDlgLD(void)
+	?NewL@CESMRUiFactory@@SAPAV1@XZ @ 3 NONAME ; class CESMRUiFactory * CESMRUiFactory::NewL(void)
+	?NewL@CESMRViewerDialog@@SAPAV1@AAVMMRInfoProvider@@AAVMAgnEntryUiCallback@@@Z @ 4 NONAME ; class CESMRViewerDialog * CESMRViewerDialog::NewL(class MMRInfoProvider &, class MAgnEntryUiCallback &)
+	?NewL@CESMRResponseDialog@@SAPAV1@AAPAVHBufC16@@@Z @ 5 NONAME ; class CESMRResponseDialog * CESMRResponseDialog::NewL(class HBufC16 * &)
+	?CreateUIL@CESMRUiFactory@@UAEPAVMESMRUiBase@@AAVMMRInfoProvider@@AAVMAgnEntryUiCallback@@@Z @ 6 NONAME ; class MESMRUiBase * CESMRUiFactory::CreateUIL(class MMRInfoProvider &, class MAgnEntryUiCallback &)
+	??1CESMRUiFactory@@UAE@XZ @ 7 NONAME ; CESMRUiFactory::~CESMRUiFactory(void)