--- a/phoneuis/BubbleManager/Src/BMMainPaneControl.cpp Wed Sep 15 12:12:21 2010 +0300
+++ b/phoneuis/BubbleManager/Src/BMMainPaneControl.cpp Wed Oct 13 14:31:22 2010 +0300
@@ -410,8 +410,8 @@
iScaledImage = NULL;
// create a bitmap for scaled size
- TRAPD( err, iScaledImage = new (ELeave) CFbsBitmap );
- if ( err != KErrNone )
+ iScaledImage = new CFbsBitmap();
+ if ( !iScaledImage )
{
// no scaling in error cases
iScaler->SetState( CTelBubbleImageScaler::EScalingIdle );
@@ -421,8 +421,8 @@
TSize size = aSourceBitmap->SizeInPixels();
TRect scaledRect( 0, 0, size.iWidth * SCALE_FACTOR, size.iHeight * SCALE_FACTOR );
- TRAP( err, iScaledImage->Create( scaledRect.Size(), aSourceBitmap->DisplayMode() ) );
- if ( err != KErrNone )
+ TInt error = iScaledImage->Create( scaledRect.Size(), aSourceBitmap->DisplayMode() );
+ if ( error != KErrNone )
{
delete iScaledImage;
iScaledImage = NULL;