equal
deleted
inserted
replaced
580 } |
580 } |
581 |
581 |
582 if ( icon != NULL ) // Syntax correct but icon not found |
582 if ( icon != NULL ) // Syntax correct but icon not found |
583 { |
583 { |
584 aObserver->PublishPtr( *this, aContentId, icon , aContentId ); |
584 aObserver->PublishPtr( *this, aContentId, icon , aContentId ); |
585 CleanupStack::PushL( icon ); |
585 iIconArray.Append(icon); |
586 iIconArray.AppendL( icon ); |
|
587 CleanupStack::Pop( icon ); |
|
588 } |
586 } |
589 else |
587 else |
590 { |
588 { |
591 err = KErrNotFound; |
589 err = KErrNotFound; |
592 aObserver->Clean( *this, aContentId, aContentId ); |
590 aObserver->Clean( *this, aContentId, aContentId ); |
626 CFbsBitmap* bitmap = new (ELeave) CFbsBitmap(); |
624 CFbsBitmap* bitmap = new (ELeave) CFbsBitmap(); |
627 if( KErrNone == bitmap->Duplicate( aHandle) ) |
625 if( KErrNone == bitmap->Duplicate( aHandle) ) |
628 { |
626 { |
629 // Take the ownership |
627 // Take the ownership |
630 CGulIcon* icon = CGulIcon::NewL(bitmap); |
628 CGulIcon* icon = CGulIcon::NewL(bitmap); |
631 CleanupStack::PushL( icon ); |
|
632 if( aMaskHandle != KErrBadHandle ) |
629 if( aMaskHandle != KErrBadHandle ) |
633 { |
630 { |
634 CFbsBitmap* mask = new (ELeave) CFbsBitmap(); |
631 CFbsBitmap* mask = new (ELeave) CFbsBitmap(); |
635 if (KErrNone == mask->Duplicate( aMaskHandle) ) |
632 if (KErrNone == mask->Duplicate( aMaskHandle) ) |
636 { |
633 { |
637 icon->SetMask( mask ); |
634 icon->SetMask( mask ); |
638 } |
635 } |
639 } |
636 } |
640 aObserver->PublishPtr( *this, aContentId, icon , aContentId ); |
637 aObserver->PublishPtr( *this, aContentId, icon , aContentId ); |
641 iIconArray.AppendL( icon ); |
638 iIconArray.Append(icon); |
642 CleanupStack::Pop( icon ); |
|
643 } |
639 } |
644 else |
640 else |
645 { |
641 { |
646 delete bitmap; |
642 delete bitmap; |
647 bitmap = NULL; |
643 bitmap = NULL; |