equal
deleted
inserted
replaced
198 FUNC_LOG; |
198 FUNC_LOG; |
199 delete iEntry; |
199 delete iEntry; |
200 delete iForwardEntry; |
200 delete iForwardEntry; |
201 delete iOrginalEntry; |
201 delete iOrginalEntry; |
202 delete iParameterEntry; |
202 delete iParameterEntry; |
|
203 delete iBackupEntry; |
203 } |
204 } |
204 |
205 |
205 // --------------------------------------------------------------------------- |
206 // --------------------------------------------------------------------------- |
206 // CESMRMeetingRequestEntry::NewL |
207 // CESMRMeetingRequestEntry::NewL |
207 // --------------------------------------------------------------------------- |
208 // --------------------------------------------------------------------------- |
240 |
241 |
241 iParameterEntry = ESMRHelper::CopyEntryL( |
242 iParameterEntry = ESMRHelper::CopyEntryL( |
242 aEntry, |
243 aEntry, |
243 aEntry.MethodL(), |
244 aEntry.MethodL(), |
244 ESMRHelper::ECopyFull ); |
245 ESMRHelper::ECopyFull ); |
245 |
246 iBackupEntry=ESMRHelper::CopyEntryL( |
|
247 aEntry, |
|
248 aEntry.MethodL(), |
|
249 ESMRHelper::ECopyFull ); |
246 iEntry = ESMRHelper::CopyEntryL( |
250 iEntry = ESMRHelper::CopyEntryL( |
247 aEntry, |
251 aEntry, |
248 aEntry.MethodL(), |
252 aEntry.MethodL(), |
249 ESMRHelper::ECopyFull ); |
253 ESMRHelper::ECopyFull ); |
250 |
254 |
448 // Lets look recurrence using instance |
452 // Lets look recurrence using instance |
449 |
453 |
450 // Ownership is transferred |
454 // Ownership is transferred |
451 CCalInstance* instance = NULL; |
455 CCalInstance* instance = NULL; |
452 TRAPD(err, instance = InstanceL() ); |
456 TRAPD(err, instance = InstanceL() ); |
453 if ( KErrNotFound != err ) |
457 if ( KErrNotFound != err&&err!=KErrNone ) |
454 { |
458 { |
455 User::LeaveIfError( err ); |
459 User::LeaveIfError( err ); |
456 } |
460 } |
457 |
461 |
458 if ( instance ) |
462 if ( instance ) |
605 if ( instance ) |
609 if ( instance ) |
606 { |
610 { |
607 CleanupStack::PushL( instance ); |
611 CleanupStack::PushL( instance ); |
608 |
612 |
609 CCalEntry::TMethod entryMethod( iEntry->MethodL() ); |
613 CCalEntry::TMethod entryMethod( iEntry->MethodL() ); |
610 |
614 CCalEntry* iBackupEntry=ESMRHelper::CopyEntryL( |
|
615 *iEntry, |
|
616 entryMethod, |
|
617 ESMRHelper::ECopyFull); |
611 delete iEntry; |
618 delete iEntry; |
612 iEntry = NULL; |
619 iEntry = NULL; |
613 |
620 |
614 delete iForwardEntry; |
621 delete iForwardEntry; |
615 iForwardEntry = NULL; |
622 iForwardEntry = NULL; |
647 |
654 |
648 CESMRFsMailboxUtils* fsMbUtils = |
655 CESMRFsMailboxUtils* fsMbUtils = |
649 CESMRFsMailboxUtils::NewL( iMRMailboxUtils ); |
656 CESMRFsMailboxUtils::NewL( iMRMailboxUtils ); |
650 CleanupStack::PushL( fsMbUtils ); |
657 CleanupStack::PushL( fsMbUtils ); |
651 |
658 |
652 fsMbUtils->SetPhoneOwnerL( *iEntry ); |
659 fsMbUtils->SetPhoneOwnerL( *iBackupEntry ); |
653 CleanupStack::PopAndDestroy( fsMbUtils ); |
660 CleanupStack::PopAndDestroy( fsMbUtils ); |
654 fsMbUtils = NULL; |
661 fsMbUtils = NULL; |
655 |
662 |
656 // Adjust parent entry's start and end time to entry |
663 // Adjust parent entry's start and end time to entry |
657 TCalTime start; |
664 TCalTime start; |
677 iOrginalEntry->SetMethodL( entryMethod ); |
684 iOrginalEntry->SetMethodL( entryMethod ); |
678 } |
685 } |
679 |
686 |
680 iEntry->SetDescriptionL( description ); |
687 iEntry->SetDescriptionL( description ); |
681 iOrginalEntry->SetDescriptionL( description ); |
688 iOrginalEntry->SetDescriptionL( description ); |
|
689 iEntry=ESMRHelper::CopyEntryL(*iBackupEntry,iBackupEntry->MethodL(),ESMRHelper::ECopyFull); |
682 |
690 |
683 CleanupStack::PopAndDestroy(); // entries |
691 CleanupStack::PopAndDestroy(); // entries |
684 CleanupStack::PopAndDestroy( instance ); |
692 CleanupStack::PopAndDestroy( instance ); |
685 |
693 |
686 if ( EESMRRoleOrganizer == RoleL() && IsStoredL() ) |
694 if ( EESMRRoleOrganizer == RoleL() && IsStoredL() ) |