diff -r 748ec5531811 -r 336bee5c2d35 textrendering/textformatting/tbox/FRMPRINT.CPP --- a/textrendering/textformatting/tbox/FRMPRINT.CPP Tue Aug 31 17:01:26 2010 +0300 +++ b/textrendering/textformatting/tbox/FRMPRINT.CPP Wed Sep 01 12:39:40 2010 +0100 @@ -19,11 +19,6 @@ #include "FRMPRINT.H" #include "FRMCONST.H" -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "FRMPRINTTraces.h" -#endif - #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS #include "FRMCONST_INTERNAL.H" #include "FRMCONST_PARTNER.H" @@ -157,19 +152,7 @@ // Traps leaves // { - if (!iPageList) - { - OstTrace0( TRACE_FATAL, DUP1_CTEXTPAGEREGIONPRINTER_PRINTBANDL, "EFInvalidPageList" ); - } __ASSERT_ALWAYS(iPageList!=NULL,FormPanic(EFInvalidPageList)); - if (aPageNo-iFirstPage>=iPageList->Count()) - { - OstTrace0( TRACE_DUMP, CTEXTPAGEREGIONPRINTER_PRINTBANDL, "EFInvalidPageNumber" ); - } - if (aPageNoCount(),FormPanic(EFInvalidPageNumber)); __ASSERT_DEBUG(aPageNo>=iFirstPage,FormPanic(EFInvalidPageNumber)); @@ -401,8 +384,7 @@ delete iPictureGc; iPictureGc=NULL; - - OstTrace1( TRACE_FATAL, CTEXTPAGEREGIONPRINTER_LEAVEL, "CTextPageRegionPrinter::LeaveL;aErr=%d", aErr ); + User::Leave(aErr); }