pimappservices/calendar/shared/src/agmsimpleentry.cpp
branchRCL_3
changeset 30 d68a4b5d5885
parent 0 f979ecb2b13e
child 65 12af337248b1
equal deleted inserted replaced
27:55d60436f00b 30:d68a4b5d5885
    65 /** The destructor frees all resources owned by the object, prior to its destruction.
    65 /** The destructor frees all resources owned by the object, prior to its destruction.
    66 
    66 
    67 @internalComponent
    67 @internalComponent
    68 */
    68 */
    69 	{
    69 	{
    70 	delete iRptDef;
    70     if (iRptDef)
       
    71         {
       
    72         delete iRptDef;
       
    73         iRptDef = NULL;
       
    74         }
    71 	}
    75 	}
    72 
    76 
    73 
    77 
    74 EXPORT_C TBool CAgnSimpleEntry::HasAlarm() const
    78 EXPORT_C TBool CAgnSimpleEntry::HasAlarm() const
    75 /** Tests whether the entry is alarmed.
    79 /** Tests whether the entry is alarmed.
   392 		if (repeat)
   396 		if (repeat)
   393 			{
   397 			{
   394 			// Ensure that the start date actually falls on a repeating instance. For example,
   398 			// Ensure that the start date actually falls on a repeating instance. For example,
   395 			// if the repeat rule is every Wednesday, and the DtStart is a Monday, it should be 
   399 			// if the repeat rule is every Wednesday, and the DtStart is a Monday, it should be 
   396 			// nudged forwards to the Wednesday of that week.
   400 			// nudged forwards to the Wednesday of that week.
   397 
   401 			TTime startTimeUtc;
   398 			TTime startTimeUtc = EntryTime().UtcL();
   402 			if (Type() == CCalEntry::ETodo)
       
   403 				{
       
   404 				startTimeUtc = StartTime().UtcL();
       
   405 				}
       
   406 			else
       
   407 				{
       
   408 			    startTimeUtc = EntryTime().UtcL();
       
   409 				}
   399 
   410 
   400 			startTimeUtc -= TTimeIntervalMicroSeconds(1);
   411 			startTimeUtc -= TTimeIntervalMicroSeconds(1);
   401 			TTime firstInstanceUtc;
   412 			TTime firstInstanceUtc;
   402 			
   413 			
   403 			TBool isStillRpt = ETrue;
   414 			TBool isStillRpt = ETrue;
   426 	{
   437 	{
   427 	TBool isStillRpt = ETrue;
   438 	TBool isStillRpt = ETrue;
   428 	TTime startTime = aNewEntryTimeLocal;
   439 	TTime startTime = aNewEntryTimeLocal;
   429 	if (Type() == CCalEntry::ETodo)
   440 	if (Type() == CCalEntry::ETodo)
   430 		{
   441 		{
   431 		startTime = DurationMinusL(startTime);
   442 		//startTime = DurationMinusL(startTime);
   432 		}
   443 		}
   433 	TAgnCalendarTime startAgnTime;
   444 	TAgnCalendarTime startAgnTime;
   434 	TAgnCalendarTime endAgnTime;
   445 	TAgnCalendarTime endAgnTime;
   435 	if (TimeMode() == MAgnCalendarTimeMode::EFloating)
   446 	if (TimeMode() == MAgnCalendarTimeMode::EFloating)
   436 		{
   447 		{