FCL/sf/mw/classicui: comparison uifw/eikctl/src/EIKCLBD.CPP

equal deleted inserted replaced

-:aecbbf00d063
+:d48ab3b357f1
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <AknBidiTextUtils.h>
 #include <skinlayout.cdl.h>
 #include <layoutmetadata.cdl.h>
 #include <aknlayoutscalable_avkon.cdl.h>
 #include <aknphysics.h>
+#include <AknIconArray.h>
+#include <avkon.mbg>
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 #include <aknlistloadertfx.h>
 #include <aknlistboxtfxinternal.h>
 // colored tick marks support
 const TInt KColorIconFlag = -1;
 const TInt KColorIconIdx  =  0;
+// Number of icons in marking mode icon array
+const TInt KMarkingModeIconArraySize = 2;
 /**
 * About animation usage:
 * All animation usage is implemented in this class. Animation is eye candy and
 * low priority when it comes to resources -> on resource failures animation
 TBool SyncAndDrawAnim( CBitmapContext& aGc, const TRect& aRect );
 MAknsControlContext* SkinBackgroundContext() const;
 void DeleteAnim();
 void FocusGained();
 void FocusLost();
-void SkinChanged();
+void SkinChangedL();
 void SetControl( CCoeControl* aControl );
 // Implementation of MCoeForegroundObserver
 void HandleGainingForeground();
 void HandleLosingForeground();
 TBool DrawPressedDownEffectL( MAknsSkinInstance* aInstance,
 CWindowGc& aGc,
 const TRect& aOutRect,
 const TRect& aInnerRect ) const;
+void LoadMarkingIconsL();
 public: //for handling column alignment
 struct TColumnExt
 {
 TInt    iColumn; // Must be first entry
 TBool   iLayoutAlign;//is layout alignment or Set by client
 CArrayFix<TColumnExt>* iColumnExtArray; //for column alignment
 TRect iMarginRect;
+CAknIconArray* iMarkingIconArray;
 };
 /**
 * High priority is well argumented because running the active object will
 * result in animation deletion -> results in freeing resources.
 delete cenRep;
 #endif // RD_LIST_STRETCH
 iKineticScrolling = CAknPhysics::FeatureEnabled();
+LoadMarkingIconsL();
 _AKNTRACE_FUNC_EXIT;
 }
 CColumnListBoxDataExtension::~CColumnListBoxDataExtension()
 {
 delete iRowAndSubCellArray;
 delete iSLSubCellArray;
 delete iColorBmp;
 delete iHiliBmp;
 delete  iColumnExtArray;
+if ( iMarkingIconArray )
+{
+iMarkingIconArray->ResetAndDestroy();
+}
+delete iMarkingIconArray;
 }
 MAknsControlContext* CColumnListBoxDataExtension::SkinBackgroundContext() const
 {
 if ( iSkinEnabled )
 {
 NoAnimIfError( iAnimation->Pause() );
 }
 }
-// -----------------------------------------------------------------------------
-// CColumnListBoxDataExtension::SkinChanged
+// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+// CColumnListBoxDataExtension::SkinChangedL
-//
+// -----------------------------------------------------------------------------
-void CColumnListBoxDataExtension::SkinChanged()
+//
+void CColumnListBoxDataExtension::SkinChangedL()
 {
 DeleteAnim();
 TryCreateAnimation();
 CreateColorBitmapsL();
-}
+LoadMarkingIconsL();
+}
 // -----------------------------------------------------------------------------
 // CColumnListBoxDataExtension::SetControl
 // -----------------------------------------------------------------------------
 //
 aInnerRect,
 KAknsIIDQsnFrListPressed,
 KAknsIIDQsnFrListCenterPressed );
 }
+// -----------------------------------------------------------------------------
+// CColumnListBoxDataExtension::LoadMarkingIconsL
+// -----------------------------------------------------------------------------
+//
+void CColumnListBoxDataExtension::LoadMarkingIconsL()
+{
+if ( !iMarkingIconArray )
+{
+iMarkingIconArray = new ( ELeave ) CAknIconArray(
+KMarkingModeIconArraySize );
+}
+else
+{
+iMarkingIconArray->ResetAndDestroy();
+}
+MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+const TDesC& avkonIconFile = AknIconUtils::AvkonIconFileName();
+CGulIcon* icon = AknsUtils::CreateGulIconL( skin,
+KAknsIIDQgnPropCheckboxOn,
+avkonIconFile,
+EMbmAvkonQgn_prop_checkbox_on,
+EMbmAvkonQgn_prop_checkbox_on_mask );
+CleanupStack::PushL( icon );
+iMarkingIconArray->AppendL( icon );
+CleanupStack::Pop( icon );
+icon = AknsUtils::CreateGulIconL( skin,
+KAknsIIDQgnPropCheckboxOff,
+avkonIconFile,
+EMbmAvkonQgn_prop_checkbox_off,
+EMbmAvkonQgn_prop_checkbox_off_mask );
+CleanupStack::PushL( icon );
+iMarkingIconArray->AppendL( icon );
+CleanupStack::Pop( icon );
+}
 EXPORT_C CCoeControl *CColumnListBoxData::Control() const
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 return iExtension->iControl;
 }
 EXPORT_C void CColumnListBoxData::SetControl(CCoeControl *aControl)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 iExtension->SetControl( aControl );
 }
 EXPORT_C MAknsControlContext* CColumnListBoxData::SkinBackgroundContext() const
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 if (iExtension->iSkinEnabled)
 {
 return iExtension->iSkinControlContext;
 }
 return NULL;
 }
 void CColumnListBoxData::SetSkinBackgroundContext(CAknsListBoxBackgroundControlContext *aContext)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 delete iExtension->iSkinControlContext;
 iExtension->iSkinControlContext = aContext;
 }
 void CColumnListBoxData::CreatePictographInterfaceL()
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 if ( !iExtension->iPictoInterface )
 {
 iExtension->iPictoInterface = CAknPictographInterface::NewL(
 *iExtension->iControl, *iExtension );
 }
 }
 EXPORT_C void CColumnListBoxData::SetSkinHighlightFrame(const TAknsItemID *aFrameId, const TAknsItemID *aFrameCenterId)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 iExtension->iSkinHighlightFrameId = aFrameId;
 iExtension->iSkinHighlightFrameCenterId = aFrameCenterId;
 }
 EXPORT_C void CColumnListBoxData::SetSkinEnabledL(TBool aEnabled)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 CListBoxData::SetSkinEnabledL(aEnabled);
 iExtension->iSkinEnabled = aEnabled;
 }
 EXPORT_C void CColumnListBoxData::SetSkinStyle(const TAknsItemID *aId, const TRect &aTileRect)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 if (iExtension->iSkinControlContext)
 {
 iExtension->iSkinControlContext->SetTiledBitmap(*aId);
 iExtension->iSkinControlContext->SetTiledRect(aTileRect);
 }
 }
 EXPORT_C void CColumnListBoxData::SetListEndSkinStyle(const TAknsItemID *aId, const TRect &aTileRect)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 if (iExtension->iSkinControlContext)
 {
 iExtension->iSkinControlContext->SetBottomBitmap(*aId);
 iExtension->iSkinControlContext->SetBottomRect(aTileRect);
 }
 }
 void CColumnListBoxData::CreateMarqueeControlL()
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 if ( !iExtension->iMarquee )
 {
 iExtension->iMarquee = CAknMarqueeControl::NewL();
 }
 iExtension->i2ndLineMarquee->SetRedrawCallBack(callBack);
 }
 void CColumnListBoxData::ResetMarquee()
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 if (iExtension->iMarquee)
 {
 iExtension->iMarquee->Reset();
 }
 }
 }
 TInt CColumnListBoxData::CurrentMarqueeItemIndex()
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 return iExtension->iCurrentItem;
 }
 void CColumnListBoxData::SetCurrentMarqueeItemIndex(TInt aIndex)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 iExtension->iCurrentItem = aIndex;
 }
 //
 // Enables or disables marquee.
 //
 EXPORT_C void CColumnListBoxData::EnableMarqueeL(TBool aEnable)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 // CreateMarqueeControlL does nothing if marquee already exists,
 // so let's just call it just in case.
 CreateMarqueeControlL();
 iExtension->iMarquee->EnableMarquee(aEnable);
 iExtension->i2ndLineMarquee->EnableMarquee(aEnable);
 }
 EXPORT_C void CColumnListBoxData::SetSeparatorLinePosition(TAknSeparatorLinePosition aPosition)
 {
-if (iExtension)
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 iExtension->iSeparatorLinePosition = aPosition;
 }
 EXPORT_C TAknSeparatorLinePosition CColumnListBoxData::SeparatorLinePosition() const
 {
-if (iExtension)
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 return iExtension->iSeparatorLinePosition;
-else
-return ENoLine;
 }
 EXPORT_C CAknLayoutData *CColumnListBoxData::LayoutData() const
 {
 return NULL;
 }
 EXPORT_C CColumnListBoxData::~CColumnListBoxData()
 //
 //    D'tor
 //
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 delete iColumnArray;
 if (IconArray())
 {
 IconArray()->ResetAndDestroy();
-if (iExtension)
+delete iExtension->iIconArray;
-delete iExtension->iIconArray;
 }
 delete iExtension;
 }
 EXPORT_C void CColumnListBoxData::ConstructLD()
 EXPORT_C void CColumnListBoxData::SetColumnWidthPixelL(TInt aColumn,TInt aWidth)
 //
 //    Set a columns width
 //
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 TInt index;
 FindColumnIndexOrAddL(index,aColumn);
 At(index).iWidth=aWidth;
-if ( iExtension && iExtension->iUseLayoutData )
+if ( iExtension->iUseLayoutData )
 {
 iExtension->iUseLayoutData = EFalse;
 CListBoxView* view = static_cast<CEikListBox*>( iExtension->iControl )->View();
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 MAknListBoxTfxInternal* transApi =
 EXPORT_C void CColumnListBoxData::SetColumnBaselinePosL(TInt aColumn,TInt aPos)
 //
 //  Set a columns baseline position
 //
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 TInt index;
 FindColumnIndexOrAddL(index,aColumn);
 At(index).iBaseline=aPos;
 // can not be nicely supported by new drawing system
 // --> revert to Symbian style drawing
-if ( iExtension && iExtension->iUseLayoutData )
+if ( iExtension->iUseLayoutData )
 {
 iExtension->iUseLayoutData = EFalse;
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 CListBoxView* view = static_cast<CEikListBox*>( iExtension->iControl )->View();
 MAknListBoxTfxInternal* transApi =
 EXPORT_C void CColumnListBoxData::SetColumnMarginsL(TInt aColumn,TMargins aMargins)
 //
 //  Set a columns vertical cap
 //
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 TInt index;
 FindColumnIndexOrAddL(index,aColumn);
 At(index).iMargins=aMargins;
 // can not be nicely supported by new drawing system
 // --> revert to Symbian style drawing
-if ( iExtension && iExtension->iUseLayoutData )
+if ( iExtension->iUseLayoutData )
 {
 iExtension->iUseLayoutData = EFalse;
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 CListBoxView* view = static_cast<CEikListBox*>( iExtension->iControl )->View();
 MAknListBoxTfxInternal* transApi =
 EXPORT_C void CColumnListBoxData::SetColumnAlignmentL(TInt aColumn,CGraphicsContext::TTextAlign aAlign)
 //
 //    Set a columns alignment
 //
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 TInt index;
 FindColumnIndexOrAddL(index,aColumn);
 At(index).iAlign=aAlign;
 iExtension->SetColumnLayoutAlignmentL( aColumn);
 }
 EXPORT_C CArrayPtr<CGulIcon>* CColumnListBoxData::IconArray() const
 //
 //    Return the list of icons
 //
 {
-if (iExtension)
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 return iExtension->iIconArray;
-else
-return 0;
 }
 EXPORT_C void CColumnListBoxData::SetIconArray(CArrayPtr<CGulIcon>* aArray)
 //
 //    Passes ownership of the icon list aArray (assumes any previous list has been deleted by the caller)
 //
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
-if (iExtension)
+iExtension->iIconArray=aArray;
-iExtension->iIconArray=aArray;
-else
-{
-aArray->ResetAndDestroy();
-delete aArray;
-}
 }
 EXPORT_C CFont* CColumnListBoxData::Font(const TListItemProperties& /*aItemProperties*/, TInt aColumn) const
 {
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 #endif
 }
 void CColumnListBoxData::DrawHighLight( CWindowGc& aGc, const TRect& aRect, TBool aHighlight, MAknsSkinInstance* aSkin ) const
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 // SERIES60 Highlight drawing.
 if( aHighlight )
 {
 // same as CFormattedCellListBoxData::DrawDefaultHighlight
 CListBoxView* view = static_cast<CEikListBox*>( iExtension->iControl )->View();
 const TDesC* aText,
 const TRect& aRect,
 TBool aHighlight,
 const TColors& aColors ) const
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
+__ASSERT_DEBUG( iExtension->iControl, Panic( EEikPanicNullPointer ));
+CEikListBox* listbox = static_cast<CEikListBox*>( iExtension->iControl );
+if ( listbox && !listbox->View()->ViewRect().Intersects( aRect ) )
+{
+// outside of the clipping rect -> don't process this item
+return;
+}
 TInt lastColumn = Min( LastColumn(), KMaxColumn );
 TInt column=0;
 TPtrC text;
 TPtrC tempText;
 TRgb aTextColor = aHighlight ? aColors.iHighlightedText : aColors.iText;
 MAknsSkinInstance *skin = AknsUtils::SkinInstance();
 MAknsControlContext *cc = AknsDrawUtils::ControlContext( Control() );
-if (!cc)
+if ( !cc )
 {
 cc = SkinBackgroundContext();
 }
 TAknTextLineLayout textLines[KMaxColumn];
 TBool rectClipped[KMaxColumn];
 Mem::FillZ( &rectClipped[0], KMaxColumn * sizeof( TBool ) );
-if ( iExtension->iSubCellsMightIntersect )
-{
-CheckIfSubCellsIntersect( &textLines[0], &rectClipped[0], *aText, aRect );
-}
-CEikListBox* listbox = static_cast<CEikListBox*>( iExtension->iControl );
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 MAknListBoxTfxInternal *transApi = CAknListLoader::TfxApiInternal( &aGc );
 #endif // RD_UI_TRANSITION_EFFECTS_LIST
 if ( !listbox || !listbox->BackgroundDrawingSuppressed() )
 {
 transApi->StopDrawing();
 }
 #endif // RD_UI_TRANSITION_EFFECTS_LIST
 }
+if ( iExtension->iCurrentRow < listbox->BottomItemIndex() )
-DrawHighLight( aGc, aRect, aHighlight, skin );
+{
+AknListUtils::DrawSeparator( aGc, aRect, aColors.iText, skin );
+}
+DrawHighLight( aGc, aRect, aHighlight, skin );
+TRect itemRect( aRect );
+DrawMarkingModeIcons( aItemProperties, aGc, itemRect );
+if ( iExtension->iSubCellsMightIntersect )
+{
+CheckIfSubCellsIntersect( &textLines[0], &rectClipped[0], *aText, itemRect );
+}
 // The column draw loop
 column = 0;
 TInt subCellIndex = 0;
-if ( !iExtension ) { return; }
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 if ( transApi )
 {
 transApi->StartDrawing( MAknListBoxTfxInternal::EListItem );
-CListBoxView* view = static_cast<CEikListBox*>( iExtension->iControl )->View();
+CListBoxView* view = listbox->View();
 aGc.SetClippingRect( view->ViewRect() );
 }
 #endif // RD_UI_TRANSITION_EFFECTS_LIST
 for( column = 0; column <= lastColumn; column++ )
 {
 TextUtils::ColumnText( text, column, aText );
 if ( text == KNullDesC ) { continue; }
-if ( iExtension->FindSLSubCellIndex( subCellIndex, column )!=0 ) { continue; }
+if ( iExtension->FindSLSubCellIndex( subCellIndex, column )!=0 )
+{
+continue;
+}
 CGraphicsContext::TTextAlign align=ColumnAlignment(column);
 TBool isLayoutAlignment = iExtension->ColumnLayoutAlignment(column);
 if ( iExtension->AtSL(subCellIndex).iSubCellType == CColumnListBoxDataExtension::EEikSLText )
 {
 aGc.SetBrushStyle(CGraphicsContext::ENullBrush);
 TRgb textColor( aTextColor );
-if (aHighlight)
+if ( aHighlight )
 {
 textColor = aColors.iHighlightedText;
 aGc.SetBrushColor(aColors.iHighlightedBack);
 }
-if (AknsUtils::AvkonSkinEnabled())
+if ( AknsUtils::AvkonSkinEnabled() )
 {
-if (iExtension->iTextColor != NULL)
+CListBoxView* view = listbox->View();
-{
+TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor;
-textColor = iExtension->iTextColor;
+if ( !useOverrideColor )
-}
+{
+if ( iExtension->iTextColor != NULL )
-if (aHighlight && iExtension->iHighlightedTextColor != NULL)
+{
-{
+textColor = iExtension->iTextColor;
-textColor = iExtension->iHighlightedTextColor;
+}
-}
+if ( aHighlight && iExtension->iHighlightedTextColor != NULL )
+{
+textColor = iExtension->iHighlightedTextColor;
+}
+}
 }
 const CFont* rowAndColFont=RowAndColumnFont(iExtension->iCurrentRow,column);
 const CFont* colFont=Font(aItemProperties, column);
 const CFont* tempFont=(colFont) ? colFont : NULL;
 else
 {
 // check if there are icons affecting this text layout
 TInt gSC = iExtension->AtSL(subCellIndex).iConditionValue; // graphical subcell which might affect this text subcell
-if (gSC > -1)
+if ( gSC > -1 )
 {
 TInt tempIndex;
 while (gSC > -1) // when gSC == -1, we have found our graphical subcell
 {
 if (iExtension->FindSLSubCellIndex(tempIndex,gSC)!=0) break;
 }
 gSC = iExtension->AtSL(tempIndex).iConditionValue;
 }
 }
-if (gSC == -1) // no affecting icons -> use default layout
+if ( gSC == -1 ) // no affecting icons -> use default layout
 {
 textLineLayout = iExtension->AtSL(subCellIndex).iTextLayout;
 }
 }
 if( !isLayoutAlignment )
 {
-switch(align)
+switch( align )
 {
 case CGraphicsContext::ELeft :
 {
 textLineLayout.iJ = ELayoutAlignLeft;
 }
 default:  break;
 };
 }
 TAknLayoutText textLayout;
-textLayout.LayoutText( aRect, textLineLayout, usedFont );
+textLayout.LayoutText( itemRect, textLineLayout, usedFont );
 // *2 == leave some room for marquee
 const TInt maxlen( KMaxColumnDataLength * 2 );
 TBuf<maxlen> convBuf = text.Left(maxlen);
 // Note that this potentially modifies the text so its lenght in pixels
 {
 iExtension->iClippedColumns |= ( 1 << column );
 }
 TBool marqueeDisabled(EFalse);
-if (listbox != NULL &&
+if ( listbox != NULL &&
 listbox->View() != NULL &&
 listbox->View()->ItemDrawer() != NULL)
 {
 marqueeDisabled = listbox->View()->ItemDrawer()->Flags() & CListItemDrawer::EDisableMarquee;
 }
 if ( iExtension->IsMarqueeOn() && doesNotFit && !marqueeDisabled )
 {
 iExtension->iMarquee->UseLogicalToVisualConversion( bidiConv );
-if ( iExtension->iMarquee->DrawText( aGc, aRect, textLineLayout, convBuf, usedFont, textColor ) )
+if ( iExtension->iMarquee->DrawText( aGc, itemRect, textLineLayout, convBuf, usedFont, textColor ) )
 {
 // all the loops have been executed
 textLayout.DrawText( aGc, convBuf, bidiConv, textColor );
 }
 }
 if ( !IconArray() )
 {
 continue;
 }
-if (aHighlight && (index > 0xffff))
+if ( aHighlight && (index > 0xffff) )
 {
 index = index >> 16; // we have different icon for highlight
 }
 index = index & 0xffff; // mask off possible highlight icon
 __ASSERT_DEBUG((index>=0 && index<IconArray()->Count()),Panic(EEikPanicColumnListInvalidBitmapIndex));
 TAknWindowLineLayout graphicLayout = iExtension->AtSL(subCellIndex).iGraphicLayout;
 TAknLayoutRect graphicRect;
-graphicRect.LayoutRect(aRect,graphicLayout);
+graphicRect.LayoutRect( itemRect,graphicLayout );
 TSize graphicSize( graphicRect.Rect().Size() );
-if (index>=0 && IconArray())
+if ( index>=0 && IconArray() )
 {
 CGulIcon* icon=(*IconArray())[index];
 CFbsBitmap* bitmap=icon->Bitmap();
 // Sometimes we get fake bitmap...
 if ( bitmap )
 {
 TSize size( bitmap->SizeInPixels() );
-if (size.iWidth != graphicSize.iWidth &&
+if ( size.iWidth != graphicSize.iWidth &&
 size.iHeight != graphicSize.iHeight )
 {
 AknIconUtils::SetSize( bitmap,
 graphicSize,
 EAspectRatioPreservedAndUnusedSpaceRemoved );
 }
 const TDesC* aText,
 const TRect& aRect,
 TBool aHighlight,
 const TColors& aColors ) const
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 if ( aHighlight )
 {
 iExtension->iClippedColumns = 0;
 aGc.DiscardFont();
 }
 return;
 }
+CEikListBox* listbox = static_cast<CEikListBox*>( iExtension->iControl );
+TRect itemRect( aRect );
 TInt extraVerticalSpace=(aRect.Height()-font->HeightInPixels());
 TInt baseLineOffset=extraVerticalSpace/2+font->AscentInPixels();
-TRect textRect( aRect );
+// SERIES60 Background drawing.
+MAknsSkinInstance *skin = AknsUtils::SkinInstance();
+MAknsControlContext *cc = AknsDrawUtils::ControlContext( Control() );
+if (!cc)
+{
+cc = SkinBackgroundContext();
+}
+#ifdef RD_UI_TRANSITION_EFFECTS_LIST
+MAknListBoxTfxInternal *transApi = CAknListLoader::TfxApiInternal( &aGc );
+#endif // RD_UI_TRANSITION_EFFECTS_LIST
+if ( !listbox || !listbox->BackgroundDrawingSuppressed() )
+{
+#ifdef RD_UI_TRANSITION_EFFECTS_LIST
+if ( transApi )
+{
+transApi->StartDrawing( MAknListBoxTfxInternal::EListView );
+}
+#endif // RD_UI_TRANSITION_EFFECTS_LIST
+aGc.SetBrushStyle(CGraphicsContext::ESolidBrush);
+aGc.SetPenStyle(CGraphicsContext::ESolidPen);
+if ( listbox )
+{
+AknsDrawUtils::Background( skin, cc, listbox, aGc, aRect );
+}
+else
+{
+aGc.Clear(aRect);
+}
+#ifdef RD_UI_TRANSITION_EFFECTS_LIST
+if ( transApi )
+{
+transApi->StopDrawing();
+}
+#endif // RD_UI_TRANSITION_EFFECTS_LIST
+}
+if ( iExtension->iCurrentRow < listbox->BottomItemIndex() )
+{
+AknListUtils::DrawSeparator( aGc, aRect, aColors.iText, skin );
+}
+DrawHighLight( aGc, aRect, aHighlight, skin );
+DrawMarkingModeIcons( aItemProperties, aGc, itemRect );
+TRect textRect( itemRect );
+textRect.iBr.iX = itemRect.iTl.iX;
 TRect textMRect; // textrect with margins.
-textRect.iBr.iX=aRect.iTl.iX;
 TInt column=0;
 TPtrC text;
 TRgb aTextColor = aHighlight ? aColors.iHighlightedText : aColors.iText;
 // Turned the drawing to multipass algorithm, because optionalcolumns drawing will
 // be too difficult to do without - and this is cleaner solution.
 // pass 1, figures out x-coordinates for columns.
-TInt x = aRect.iTl.iX;
+TInt x = itemRect.iTl.iX;
 TBool mirror = AknLayoutUtils::LayoutMirrored();
 if (mirror)
 {
-x = aRect.iBr.iX;
+x = itemRect.iBr.iX;
 }
 TInt maxx = x;
 while(column <= lastColumn)
 {
 // order of instructions is important here, do not change.
 column++;
 }
 // pass 3 drawing
-// SERIES60 Background drawing.
-MAknsSkinInstance *skin = AknsUtils::SkinInstance();
-MAknsControlContext *cc = AknsDrawUtils::ControlContext( Control() );
-if (!cc)
-{
-cc = SkinBackgroundContext();
-}
-// aRect is list item's rect, width of which is smaller than width of the list
-// with a scroll bar. List needs to draw under scroll bar anyway, so we need to
-// modify given rect here.
-TRect r(aRect);
-CEikListBox* listbox = static_cast<CEikListBox*>( iExtension->iControl );
-#ifdef RD_UI_TRANSITION_EFFECTS_LIST
-MAknListBoxTfxInternal *transApi = CAknListLoader::TfxApiInternal( &aGc );
-#endif // RD_UI_TRANSITION_EFFECTS_LIST
-if ( !listbox || !listbox->BackgroundDrawingSuppressed() )
-{
-#ifdef RD_UI_TRANSITION_EFFECTS_LIST
-if ( transApi )
-{
-transApi->StartDrawing( MAknListBoxTfxInternal::EListView );
-}
-#endif // RD_UI_TRANSITION_EFFECTS_LIST
-aGc.SetBrushStyle(CGraphicsContext::ESolidBrush);
-aGc.SetPenStyle(CGraphicsContext::ESolidPen);
-if ( listbox )
-{
-AknsDrawUtils::Background( skin, cc, listbox, aGc, aRect );
-}
-else
-{
-aGc.Clear(aRect);
-}
-#ifdef RD_UI_TRANSITION_EFFECTS_LIST
-if ( transApi )
-{
-transApi->StopDrawing();
-}
-#endif // RD_UI_TRANSITION_EFFECTS_LIST
-}
-// LISTBOX LINES NEED TO BE DRAWN HERE.
-DrawHighLight( aGc, aRect, aHighlight, skin );
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 if ( transApi )
 {
 transApi->StartDrawing( MAknListBoxTfxInternal::EListItem );
 CListBoxView* view = static_cast<CEikListBox*>( iExtension->iControl )->View();
 aGc.SetClippingRect( view->ViewRect() );
 }
 #endif // RD_UI_TRANSITION_EFFECTS_LIST
 // The column draw loop
 column = 0;
 FOREVER
 {
 if (column > lastColumn) break;
 if (aHighlight)
 {
 aGc.SetPenColor(aColors.iHighlightedText);
 aGc.SetBrushColor(aColors.iHighlightedBack);
 }
+CListBoxView* view = listbox->View();
-if (AknsUtils::AvkonSkinEnabled() && iExtension)
+TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor;
+if ( AknsUtils::AvkonSkinEnabled() && !useOverrideColor )
 {
-if (iExtension->iTextColor != NULL)
+if ( iExtension->iTextColor != NULL )
 {
 aGc.SetPenColor(iExtension->iTextColor);
 }
+if ( aHighlight && iExtension->iHighlightedTextColor != NULL )
-if (aHighlight && iExtension->iHighlightedTextColor != NULL)
 {
 aGc.SetPenColor(iExtension->iHighlightedTextColor);
 }
 }
 bmpRect.iTl=textMRect.iTl;
 if (index>=0 && IconArray())
 {
 CGulIcon* icon=(*IconArray())[index];
-if ( iExtension
+if ( iExtension->iSubCellIconSize[column] != TSize(0,0) )
-&& iExtension->iSubCellIconSize[column] != TSize(0,0) )
 {
 TSize wanted( iExtension->iSubCellIconSize[column] );
 TSize got( icon->Bitmap()->SizeInPixels() );
 // correct w or h is enough
 transApi->StopDrawing();
 }
 #endif //RD_UI_TRANSITION_EFFECTS_LIST
 }
+// -----------------------------------------------------------------------------
+// CColumnListBoxData::DrawMarkingModeIcons
+// -----------------------------------------------------------------------------
+//
+void CColumnListBoxData::DrawMarkingModeIcons(
+const TListItemProperties& aProperties,
+CWindowGc& aGc,
+TRect& aItemRect ) const
+{
+CEikListBox* listbox = static_cast<CEikListBox*>( iExtension->iControl );
+TRect textRect( aItemRect );
+if ( listbox->View() && listbox->View()->ItemDrawer() )
+{
+if ( listbox->View()->ItemDrawer()->Flags()
+& CListItemDrawer::EMarkingModeEnabled &&
+!aProperties.IsSelectionHidden() &&
+iExtension->iMarkingIconArray &&
+iExtension->iMarkingIconArray->Count() ==
+KMarkingModeIconArraySize )
+{
+if ( AknLayoutUtils::LayoutMirrored() )
+{
+textRect.iBr.iX -=
+AknLayoutScalable_Avkon::list_single_graphic_pane_t1(
+0 ).LayoutLine().ir;
+}
+else
+{
+textRect.iTl.iX +=
+AknLayoutScalable_Avkon::list_single_graphic_pane_t1(
+0 ).LayoutLine().il;
+}
+TAknLayoutRect layoutRect;
+layoutRect.LayoutRect( aItemRect,
+AknLayoutScalable_Avkon::list_single_graphic_pane_g1( 0 ) );
+// unchecked icon
+CGulIcon* icon = (*iExtension->iMarkingIconArray)[1];
+if ( listbox->View()->ItemIsSelected( iExtension->iCurrentRow ) )
+{
+icon = (*iExtension->iMarkingIconArray)[0];
+}
+CFbsBitmap* bitmap = icon->Bitmap();
+if ( bitmap )
+{
+TSize size( bitmap->SizeInPixels() ); // set size if not already
+TSize targetSize( layoutRect.Rect().Size() );
+if ( size.iWidth != targetSize.iWidth &&
+size.iHeight != targetSize.iHeight )
+{
+AknIconUtils::SetSize(
+bitmap,
+targetSize,
+EAspectRatioPreservedAndUnusedSpaceRemoved );
+}
+aGc.BitBltMasked( layoutRect.Rect().iTl,
+bitmap,
+TRect( layoutRect.Rect().Size() ),
+icon->Mask(),
+EFalse );
+}
+aItemRect = textRect;
+}
+}
+}
 void CColumnListBoxData::AddColumnL(TInt aColumn)
 //
 //    Add a column's worth of data
 //
 EXPORT_C void CColumnListBoxData::SetColumnFontForRowL(TInt aRow,
 TInt aColumn,
 const CFont* aFont)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
-if (!iExtension) return;
 TInt index = 0;
 iExtension->FindRowAndColumnIndexOrAddL(index,aRow,aColumn);
 iExtension->At(index).iFont=aFont;
 }
 EXPORT_C const CFont*
 CColumnListBoxData::RowAndColumnFont(TInt aRow,TInt aColumn) const
 {
-if (!iExtension) return 0;
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 TInt index = 0;
 if (iExtension->FindRowAndColumnIndex(index,aRow,aColumn)!=0)
 return 0;
 return(iExtension->At(index).iFont);
 }
 void CColumnListBoxData::SetCurrentItemIndex(TInt aIndex)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 if( iExtension->iCurrentRow != aIndex )
 {
 iExtension->iAnimFlags.Set( CColumnListBoxDataExtension::EFlagUpdateBg );
 }
 const CGraphicsContext::TTextAlign aAlign,
 const CFont& aFont,
 const TBool aHighlight,
 const TBool aIsTextClipped ) const
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 TBool marqueeDisabled =
 static_cast<CEikListBox*>(
 Control() )->View()->ItemDrawer()->Flags() & CListItemDrawer::EDisableMarquee;
 }
 EXPORT_C void CColumnListBoxData::SetMarqueeParams(const TInt aLoops, const TInt aScrollAmount, const TInt aScrollDelay)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 if ( iExtension->iMarquee )
 {
 iExtension->iMarquee->SetLoops( aLoops );
 iExtension->iMarquee->SetSpeedInPixels( aScrollAmount );
 }
 EXPORT_C void CColumnListBoxData::SetMarqueeParams(const TInt aLoops, const TInt aScrollAmount,
 const TInt aScrollDelay, const TInt aInterval)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 if ( iExtension->iMarquee )
 {
 iExtension->iMarquee->SetInterval( aInterval );
 iExtension->i2ndLineMarquee->SetInterval( aInterval );
 EXPORT_C
 void CColumnListBoxData::SetSubCellIconSize(TInt aIndex, TSize aSize)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
-if (iExtension && aIndex < 6 && aIndex >= 0)
+if ( aIndex < 6 && aIndex >= 0 )
 {
 iExtension->iSubCellIconSize[aIndex] = aSize;
 }
 }
 TSize CColumnListBoxData::GetSubCellIconSize(TInt aIndex)
 {
-if (iExtension && aIndex < 6 && aIndex >= 0)
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
+if ( aIndex < 6 && aIndex >= 0 )
 {
 return iExtension->iSubCellIconSize[aIndex];
 }
 return TSize(0,0);
 }
 // CColumnListBoxData::HighlightAnim
 // -----------------------------------------------------------------------------
 //
 EXPORT_C const CAknsEffectAnim* CColumnListBoxData::HighlightAnim() const
 {
-if( iExtension )
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 return iExtension->iAnimation;
-return NULL;
 }
 // -----------------------------------------------------------------------------
 // AboutToDrawHighlightAnim
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CColumnListBoxData::AboutToDrawHighlightAnim() const
 {
-if( !iExtension )
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
-{
-return;
-}
 if( !iExtension->iAnimation || !iExtension->iControl )
 {
 return;
 }
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CColumnListBoxData::SetHighlightAnimBackgroundDrawer(
 MColumnListBoxAnimBackgroundDrawer* aDrawer )
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
-if( iExtension )
+iExtension->iHighlightBgDrawer = aDrawer;
-{
-iExtension->iHighlightBgDrawer = aDrawer;
-}
 }
 // -----------------------------------------------------------------------------
 // CColumnListBoxData::SetItemCellSize
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CColumnListBoxData::SetItemCellSize( const TSize& aSizeInPixels )
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
-if( iExtension )
-{
+if( iExtension->iAnimSize != aSizeInPixels )
-if( iExtension->iAnimSize != aSizeInPixels )
+{
-{
+iExtension->Play();
-iExtension->Play();
+}
-}
+iExtension->iAnimSize = aSizeInPixels;
-iExtension->iAnimSize = aSizeInPixels;
-}
 }
 // -----------------------------------------------------------------------------
 // CColumnListBoxData::HasHighlightAnim
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TBool CColumnListBoxData::HasHighlightAnim() const
 {
-if( !iExtension )
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
-return EFalse;
 if( !iExtension->iAnimation )
 return EFalse;
 return ETrue;
 }
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TBool CColumnListBoxData::DrawHighlightAnim(
 CBitmapContext& aGc, const TRect& aRect ) const
 {
-if( !iExtension )
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
-return EFalse;
 if( !iExtension->iAnimation )
 return EFalse;
 return iExtension->SyncAndDrawAnim( aGc, aRect );
 }
 // CColumnListBoxData::FocusGained
 // -----------------------------------------------------------------------------
 //
 void CColumnListBoxData::FocusGained()
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 iExtension->FocusGained();
 }
 // -----------------------------------------------------------------------------
 // CColumnListBoxData::FocusLost
 // -----------------------------------------------------------------------------
 //
 void CColumnListBoxData::FocusLost()
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 iExtension->FocusLost();
 }
 void CColumnListBoxData::HandleResourceChange( TInt aType )
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s] aType = %d", "CColumnListBoxData", __FUNCTION__, aType  );
 // Animation is skin dependent, whenever skin changes animation changes
 // too.
 if( KAknsMessageSkinChange == aType )
 {
-iExtension->SkinChanged();
+TRAP_IGNORE( iExtension->SkinChangedL() );
 }
 else if(aType == KEikDynamicLayoutVariantSwitch)
 {
 // What is under highlight may have changed -> we need to update
 // highlight background to animation.
 }
 }
 void CColumnListBoxData::SetESSTextColor(TRgb aTextColor)
 {
-if (iExtension)
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 iExtension->iTextColor = aTextColor;
 }
 void CColumnListBoxData::SetESSHighlightedTextColor(TRgb aHighlightedTextColor)
 {
-if (iExtension)
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 iExtension->iHighlightedTextColor = aHighlightedTextColor;
 }
 EXPORT_C void CColumnListBoxData::SetColumnUnderlined( TBitFlags32 aUnderlinedColumns )
 {
-if ( iExtension )
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
-{
+iExtension->iUnderlineFlagSet = ETrue;
-iExtension->iUnderlineFlagSet = ETrue;
+iExtension->iUnderlineFlags   = aUnderlinedColumns;
-iExtension->iUnderlineFlags   = aUnderlinedColumns;
-}
 }
 void CColumnListBoxData::SetUnderlineStyle( TListItemProperties aProperties,
 CWindowGc& aGc,
 TInt aColumn ) const
 {
-if ( !iExtension )
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
-{
-return;
-}
 if ( !iExtension->iUnderlineFlagSet )
 {
 // underlining is already either on or off and
 // hardcoded off turning will ensure old style
 // behaviour
 // CColumnListBoxData::ResetSLSubCellArray
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CColumnListBoxData::ResetSLSubCellArray()
 {
-if ( !iExtension )
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
-{
-return;
-}
 iExtension->iMarginRect = TRect::EUninitialized;
-if ( iExtension && iExtension->iUseLayoutData )
+if ( iExtension->iUseLayoutData )
 {
 iExtension->iUseLayoutData = EFalse;
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 CListBoxView* view = static_cast<CEikListBox*>( iExtension->iControl )->View();
 MAknListBoxTfxInternal* transApi =
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CColumnListBoxData::SetGraphicSubCellL(TInt aSubCell,
 const TAknWindowLineLayout &aGraphicLayout)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
-if (!iExtension) return;
 TInt index = 0;
 iExtension->FindSLSubCellIndexOrAddL(index,aSubCell);
 iExtension->AtSL(index).iTextLayout=NULL;
 iExtension->AtSL(index).iGraphicLayout=aGraphicLayout;
 iExtension->AtSL(index).iSubCellType=CColumnListBoxDataExtension::EEikSLGraphic;
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CColumnListBoxData::SetTextSubCellL(TInt aSubCell,
 const TAknTextLineLayout &aTextLayout)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
-if (!iExtension) return;
 TInt index = 0;
 iExtension->FindSLSubCellIndexOrAddL(index,aSubCell);
 iExtension->AtSL(index).iTextLayout=aTextLayout;
 iExtension->AtSL(index).iGraphicLayout=NULL;
 iExtension->AtSL(index).iSubCellType=CColumnListBoxDataExtension::EEikSLText;
 //
 EXPORT_C void CColumnListBoxData::SetConditionalSubCellL(TInt aSubCell,
 const TAknTextLineLayout &aTextLayout,
 TInt aAffectedSubCell)
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 // iConditionValue of affected subcell (=text subcell, which has different layouts)
 // contains index of graphical subcell, which existence should be checked first.
 // This graphical subcell has in iConditionValue index of graphical subcell,
 // which existence should be checked second etc. Each graphical subcell can
 // affect only to 1 text subcell (or none).
 // for compabitility - needed at least for text wrapping
 SetOptionalColumnL( aSubCell, ETrue );
-if (!iExtension) return;
 TInt i = 0x01;
 i = i << aSubCell;
 iExtension->iConditionalCells = iExtension->iConditionalCells | i;
 // CColumnListBoxData::UsesScalableLayoutData
 // -----------------------------------------------------------------------------
 //
 TBool CColumnListBoxData::UsesScalableLayoutData() const
 {
-if (iExtension)
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 return iExtension->iUseLayoutData;
-return EFalse;
 }
 // -----------------------------------------------------------------------------
 // CColumnListBoxData::EnableStretching
 // -----------------------------------------------------------------------------
 //
 void CColumnListBoxData::EnableStretching( const TBool aEnabled )
 {
-if ( !iExtension )
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
-{
-return;
-}
 iExtension->iStretchingEnabled = aEnabled;
 }
 #ifdef RD_LIST_STRETCH
 // -----------------------------------------------------------------------------
 // CColumnListBoxData::StretchingEnabled
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TBool CColumnListBoxData::StretchingEnabled() const
 {
-if ( !iExtension )
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
-{
-return EFalse;
-}
 return iExtension->iStretchingEnabled;
 }
 #else
 // -----------------------------------------------------------------------------
 TAknTextLineLayout* aLayouts,
 TBool* aResults,
 const TDesC& aText,
 const TRect& aItemRect ) const
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 _AKNTRACE( "[%s][%s][%d].", "CColumnListBoxData", __FUNCTION__, __LINE__ );
 TInt column = 0;
 TInt column2;
 TInt subCellIndex;
 // CColumnListBoxData::SubCellsMightIntersect
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CColumnListBoxData::SubCellsMightIntersect( const TBool aMightIntersect )
 {
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
 iExtension->iSubCellsMightIntersect = aMightIntersect;
 }
 void CColumnListBoxDataExtension::CreateColorBitmapsL()
 {
 }
 EXPORT_C TUint32 CColumnListBoxData::CurrentItemTextWasClipped() const
 {
-return iExtension ? iExtension->iClippedColumns : 0;
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
+return iExtension->iClippedColumns;
 }
 TBool CColumnListBoxData::KineticScrollingEnabled() const
 {
-if ( iExtension )
+	__ASSERT_DEBUG( iExtension, Panic( EEikPanicNullPointer ) );
-{
+return iExtension->iKineticScrolling;
-return iExtension->iKineticScrolling;
-}
-return EFalse;
 }
 // End of File

branch	RCL_3
changeset 56	d48ab3b357f1
parent 55	aecbbf00d063
child 72	a5e7a4f63858