--- a/textrendering/texthandling/stext/TXTRTSTR.CPP	Tue Aug 31 17:01:26 2010 +0300
+++ b/textrendering/texthandling/stext/TXTRTSTR.CPP	Wed Sep 01 12:39:40 2010 +0100
@@ -26,11 +26,6 @@
 #include "TXTRTPFL.H"
 #include "ParseLst.h"
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "TXTRTSTRTraces.h"
-#endif
-
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include "TXTETEXT_INTERNAL.H"
 #include "TXTRICH_INTERNAL.H"
@@ -407,20 +402,8 @@
 
 	__TEST_INVARIANT;
 	TInt documentLength = DocumentLength();
-	if (aPos < 0 || aPos > documentLength)
-	    {
-	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_DETACHFROMSTOREL, "ECharPosBeyondDocument" );
-	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= documentLength,Panic(ECharPosBeyondDocument));
-	if (aLength < 0)
-	    {
-	    OstTrace0( TRACE_FATAL, CRICHTEXT_DETACHFROMSTOREL, "ECopyToStreamNegativeLength" );
-	    }
 	__ASSERT_ALWAYS(aLength >= 0,Panic(ECopyToStreamNegativeLength));
-	if (aPos + aLength > documentLength)
-	    {
-	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_DETACHFROMSTOREL, "ECharPosBeyondDocument" );
-	    }
 	__ASSERT_ALWAYS(aPos + aLength <= documentLength,Panic(ECharPosBeyondDocument));
 	
 	if (aLength > 0 && IndexPresent())
@@ -453,10 +436,6 @@
 the picture is stored in. */
 	{
 	__TEST_INVARIANT;
-	if (!aPictureFactory && aStoreResolver)
-	    {
-	    OstTrace0( TRACE_FATAL, CRICHTEXT_SETPICTUREFACTORY, "EInvalidPictureFactorySettings" );
-	    }
 	__ASSERT_ALWAYS(!(!aPictureFactory && aStoreResolver),Panic(EInvalidPictureFactorySettings));
 
 	iPictureFactory=aPictureFactory;
@@ -473,10 +452,6 @@
 picture header. */
 	{
 	__TEST_INVARIANT;
-	if (aPos<0 || aPos>DocumentLength())
-	    {
-	    OstTrace0( TRACE_FATAL, CRICHTEXT_PICTUREHEADER, "ECharPosBeyondDocument" );
-	    }
 	__ASSERT_ALWAYS(aPos>=0 && aPos<=DocumentLength(),Panic(ECharPosBeyondDocument));
 
 	return (IndexPresent())
@@ -495,10 +470,6 @@
 @see CRichText::PictureHandleL() */
 	{
 	__TEST_INVARIANT;
-	if (aPos<0 || aPos>DocumentLength())
-	    {
-	    OstTrace0( TRACE_FATAL, CRICHTEXT_DROPPICTUREOWNERSHIP, "ECharPosBeyondDocument" );
-	    }
 	__ASSERT_ALWAYS(aPos>=0 && aPos<=DocumentLength(),Panic(ECharPosBeyondDocument));
 
 	TPictureHeader* p = IndexPresent()? iIndex->PictureHeaderPtr(aPos) : 0;