equal
deleted
inserted
replaced
119 { |
119 { |
120 // First check DRM issues. |
120 // First check DRM issues. |
121 res = iDRMHelper->CanSetAutomated( |
121 res = iDRMHelper->CanSetAutomated( |
122 aSelectedFiles->MdcaPoint( index ), |
122 aSelectedFiles->MdcaPoint( index ), |
123 canBeAutomated ); |
123 canBeAutomated ); |
124 if ( !res && !canBeAutomated ) |
124 if ( res == KErrNone && !canBeAutomated ) |
125 { |
125 { |
126 ShowErrorNoteL( R_PSLN_SLIDE_SET_DRM_ERROR ); |
126 ShowErrorNoteL( R_PSLN_SLIDE_SET_DRM_ERROR ); |
|
127 return EFalse; |
127 } |
128 } |
128 else if( res == KErrUnderflow ) |
129 else if ( res != KErrNone ) |
129 { |
130 { |
130 ShowErrorNoteL( R_PSLN_SLIDE_SET_IMAGE_CORRUPTED ); |
131 if ( res == KErrUnderflow ) |
131 } |
|
132 else if ( ( res != KErrNone ) || !canBeAutomated ) |
|
133 { |
|
134 if ( iDRMHelper ) |
|
135 { |
132 { |
136 iDRMHelper->HandleErrorL( |
133 // Do not show error note for corrupted image and let it pass. |
137 res, |
134 canBeAutomated = ETrue; |
|
135 } |
|
136 else |
|
137 { |
|
138 iDRMHelper->HandleErrorL( res, |
138 aSelectedFiles->MdcaPoint( index ) ); |
139 aSelectedFiles->MdcaPoint( index ) ); |
|
140 return EFalse; |
139 } |
141 } |
140 } |
142 } |
141 else |
143 else |
142 { |
144 { |
143 // Empty. |
145 // Empty. |