6923 TInt error = file.Size(iSize); |
6923 TInt error = file.Size(iSize); |
6924 if(error == KErrNone) |
6924 if(error == KErrNone) |
6925 attachment->SetSize(iSize); |
6925 attachment->SetSize(iSize); |
6926 file.Close(); |
6926 file.Close(); |
6927 TFileName filename = HtmlFilename(iMsvEntry, GetDefaultAttachmentName()); |
6927 TFileName filename = HtmlFilename(iMsvEntry, GetDefaultAttachmentName()); |
|
6928 if(filename.Length() == 0) |
|
6929 { |
|
6930 User::Leave(KErrArgument); |
|
6931 } |
|
6932 |
6928 attachment->SetAttachmentNameL(filename); |
6933 attachment->SetAttachmentNameL(filename); |
6929 CleanupStack::Pop(attachment); // ownership passed to attachment manager |
6934 CleanupStack::Pop(attachment); // ownership passed to attachment manager |
6930 |
6935 |
6931 attachmentMgr.ModifyAttachmentInfoL(attachment,aStatus); |
6936 attachmentMgr.ModifyAttachmentInfoL(attachment,aStatus); |
6932 return finishedConvertingHTML; // true |
6937 return finishedConvertingHTML; // true |
6937 CMsvOperation*CImHtmlConverter::ChangeHTMLTextInEnrtyL(TRequestStatus& aStatus) |
6942 CMsvOperation*CImHtmlConverter::ChangeHTMLTextInEnrtyL(TRequestStatus& aStatus) |
6938 { |
6943 { |
6939 TMsvEmailEntry emailEntry = iMsvEntry.Entry(); |
6944 TMsvEmailEntry emailEntry = iMsvEntry.Entry(); |
6940 |
6945 |
6941 TFileName filename = HtmlFilename(iMsvEntry, GetDefaultAttachmentName()); |
6946 TFileName filename = HtmlFilename(iMsvEntry, GetDefaultAttachmentName()); |
|
6947 if(filename.Length() == 0) |
|
6948 { |
|
6949 User::Leave(KErrArgument); |
|
6950 } |
|
6951 |
6942 emailEntry.iDetails.Set(filename); |
6952 emailEntry.iDetails.Set(filename); |
6943 emailEntry.iSize = iSize; |
6953 emailEntry.iSize = iSize; |
6944 return iMsvEntry.ChangeL(emailEntry, aStatus); |
6954 return iMsvEntry.ChangeL(emailEntry, aStatus); |
6945 } |
6955 } |
6946 |
6956 |
6947 TFileName CImHtmlConverter::HtmlFilename(CMsvEntry& aEntry, TPtrC aFileName) |
6957 TFileName CImHtmlConverter::HtmlFilename(CMsvEntry& aEntry, TPtrC aFileName) |
6948 { |
6958 { |
6949 TFileName path; |
|
6950 TFileName name; |
6959 TFileName name; |
|
6960 name.Zero(); |
|
6961 |
6951 TMsvEntry entry = aEntry.Entry(); |
6962 TMsvEntry entry = aEntry.Entry(); |
6952 // this is not used at all , need to get rid of this |
6963 // this is not used at all , need to get rid of this |
6953 if (entry.iDetails.Length()) |
6964 if (entry.iDetails.Length()) |
6954 name=entry.iDetails; |
6965 name=entry.iDetails; |
6955 else if (aFileName.Length()) |
6966 else if (aFileName.Length()) |