equal
deleted
inserted
replaced
239 } |
239 } |
240 |
240 |
241 if ( icon != NULL ) // Syntax correct but icon not found |
241 if ( icon != NULL ) // Syntax correct but icon not found |
242 { |
242 { |
243 aObserver->PublishPtr( *this, aContentId, icon , aContentId ); |
243 aObserver->PublishPtr( *this, aContentId, icon , aContentId ); |
244 CleanupStack::PushL( icon ); |
244 iIconArray.Append(icon); |
245 iIconArray.AppendL( icon ); |
|
246 CleanupStack::Pop( icon ); |
|
247 } |
245 } |
248 else |
246 else |
249 { |
247 { |
250 err = KErrNotFound; |
248 err = KErrNotFound; |
251 aObserver->Clean( *this, aContentId, aContentId ); |
249 aObserver->Clean( *this, aContentId, aContentId ); |
285 CFbsBitmap* bitmap = new (ELeave) CFbsBitmap(); |
283 CFbsBitmap* bitmap = new (ELeave) CFbsBitmap(); |
286 if( KErrNone == bitmap->Duplicate( aHandle) ) |
284 if( KErrNone == bitmap->Duplicate( aHandle) ) |
287 { |
285 { |
288 // Take the ownership |
286 // Take the ownership |
289 CGulIcon* icon = CGulIcon::NewL(bitmap); |
287 CGulIcon* icon = CGulIcon::NewL(bitmap); |
290 CleanupStack::PushL( icon ); |
|
291 if( aMaskHandle != KErrBadHandle ) |
288 if( aMaskHandle != KErrBadHandle ) |
292 { |
289 { |
293 CFbsBitmap* mask = new (ELeave) CFbsBitmap(); |
290 CFbsBitmap* mask = new (ELeave) CFbsBitmap(); |
294 if (KErrNone == mask->Duplicate( aMaskHandle) ) |
291 if (KErrNone == mask->Duplicate( aMaskHandle) ) |
295 { |
292 { |
296 icon->SetMask( mask ); |
293 icon->SetMask( mask ); |
297 } |
294 } |
298 } |
295 } |
299 aObserver->PublishPtr( *this, aContentId, icon , aContentId ); |
296 aObserver->PublishPtr( *this, aContentId, icon , aContentId ); |
300 iIconArray.AppendL( icon ); |
297 iIconArray.Append(icon); |
301 CleanupStack::Pop( icon ); |
|
302 } |
298 } |
303 else |
299 else |
304 { |
300 { |
305 delete bitmap; |
301 delete bitmap; |
306 bitmap = NULL; |
302 bitmap = NULL; |