equal
deleted
inserted
replaced
580 } |
580 } |
581 |
581 |
582 CMdEProperty* oldProperty = iPropertyArray[f]; |
582 CMdEProperty* oldProperty = iPropertyArray[f]; |
583 iPropertyArray[f] = &aProperty; |
583 iPropertyArray[f] = &aProperty; |
584 delete oldProperty; |
584 delete oldProperty; |
|
585 oldProperty = NULL; |
585 } |
586 } |
586 else if (err < KErrNone) |
587 else if (err < KErrNone) |
587 { |
588 { |
588 User::Leave(err); |
589 User::Leave(err); |
589 } |
590 } |
741 } |
742 } |
742 |
743 |
743 CMdEProperty* oldProperty = iPropertyArray[f]; |
744 CMdEProperty* oldProperty = iPropertyArray[f]; |
744 iPropertyArray[f] = aObject.iPropertyArray[i]; |
745 iPropertyArray[f] = aObject.iPropertyArray[i]; |
745 delete oldProperty; |
746 delete oldProperty; |
|
747 oldProperty = NULL; |
746 } |
748 } |
747 else if (err < KErrNone) |
749 else if (err < KErrNone) |
748 { |
750 { |
749 // restore this objects to original state |
751 // restore this objects to original state |
750 iPropertyArray.Reset(); |
752 iPropertyArray.Reset(); |
815 { |
817 { |
816 CMdEProperty* prop = iPropertyArray[i]; |
818 CMdEProperty* prop = iPropertyArray[i]; |
817 if ( prop->Removed() ) |
819 if ( prop->Removed() ) |
818 { |
820 { |
819 delete prop; |
821 delete prop; |
|
822 prop = NULL; |
820 iPropertyArray.Remove( i ); |
823 iPropertyArray.Remove( i ); |
821 continue; |
824 continue; |
822 } |
825 } |
823 if (aClearFlags) |
826 if (aClearFlags) |
824 { |
827 { |
1053 } |
1056 } |
1054 |
1057 |
1055 CMdEProperty* oldProperty = newObject->iPropertyArray[f]; |
1058 CMdEProperty* oldProperty = newObject->iPropertyArray[f]; |
1056 newObject->iPropertyArray[f] = property; |
1059 newObject->iPropertyArray[f] = property; |
1057 delete oldProperty; |
1060 delete oldProperty; |
|
1061 oldProperty = NULL; |
1058 } |
1062 } |
1059 else if (err < KErrNone) |
1063 else if (err < KErrNone) |
1060 { |
1064 { |
1061 User::Leave(err); |
1065 User::Leave(err); |
1062 } |
1066 } |