FCL/sf/os/textandloc: comparison textrendering/texthandling/stext/TXTINDEX.CPP

equal deleted inserted replaced

-:748ec5531811
+:336bee5c2d35
 #include "TXTETEXT.H"
 #include "TXTLAYDC.H"
 #include "TXTSTYLE.H"
 #include "TXTINDEX.H"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "TXTINDEXTraces.h"
-#endif
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include "TXTFMLYR_INTERNAL.H"
 #include "TXTSTYLE_INTERNAL.H"
 #endif
 	for (TInt para=0;para<maxPara;para++)
 		{
 		// ASSERT: The basedOn link is valid.
 		CFormatLayer* thisLayer=(*iParaIx)[para].iParaAttribs->iParaFormat;
 		CFormatLayer* base=CONST_CAST(CFormatLayer*,thisLayer->SenseBase());
-		if (base==NULL)
-		    {
-		    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_DBGTESTINVARIANT, "base==NULL" );
-		    }
 		__ASSERT_DEBUG(base!=NULL,User::Invariant());
 		if ((*iParaIx)[para].iParaAttribs->iRefCount>0)
 			numberOfReferencesToSharedList++;
 		TInt paragraphLength=(*iParaIx)[para].iLength;
 		TInt sumOfPhraseLengths=0;
 			if (maxPhrase>1)
 				{
 				const RPhraseAttribsEntry* phrase=&(*iPhraseIx)[currentPhraseElement];
 				CCharFormatLayer* charFormatLayer=phrase->CharFormat();
 				// ASSERT: The basedOn link is valid.
-				if (charFormatLayer->SenseBase()==NULL)
-				    {
-				    OstTrace0( TRACE_DUMP, DUP1_CRICHTEXTINDEX_DBGTESTINVARIANT, "charFormatLayer->SenseBase()==NULL" );
-				    }
 				__ASSERT_DEBUG(charFormatLayer->SenseBase()!=NULL,User::Invariant());
-				if (TInt(charFormatLayer->SenseBase())<=0x1000)
-				    {
-				    OstTrace0( TRACE_DUMP, DUP2_CRICHTEXTINDEX_DBGTESTINVARIANT, "TInt(charFormatLayer->SenseBase())<=0x1000" );
-				    }
 				__ASSERT_DEBUG(TInt(charFormatLayer->SenseBase())>0x1000,User::Invariant());
 				sumOfPhraseLengths+=(*iPhraseIx)[currentPhraseElement].Length();
 				if ((*iPhraseIx)[currentPhraseElement].Length()==0)
 					zeroLengthPhraseCount++;
 				currentPhraseElement++;
 				}
 			else
 				{
 				CCharFormatLayer* charFormatLayer=(*iParaIx)[para].iParaAttribs->iCharFormat;
 				// ASSERT: The basedOn link is valid.
-				if (charFormatLayer->SenseBase()==NULL)
-				    {
-				    OstTrace0( TRACE_DUMP, DUP3_CRICHTEXTINDEX_DBGTESTINVARIANT, "charFormatLayer->SenseBase()==NULL" );
-				    }
 				__ASSERT_DEBUG(charFormatLayer->SenseBase()!=NULL,User::Invariant());
 				sumOfPhraseLengths+=(*iParaIx)[para].iLength;
 				}
 			}
-		if (sumOfPhraseLengths!=paragraphLength)
-		    {
-		    OstTrace0( TRACE_DUMP, DUP4_CRICHTEXTINDEX_DBGTESTINVARIANT, "sumOfPhraseLengths!=paragraphLength" );
-		    }
 		__ASSERT_DEBUG(sumOfPhraseLengths==paragraphLength,User::Invariant());
 		}
 // ASSERT: We have no unexpected phrases left over
-	if (currentPhraseElement!=-1 &&
-currentPhraseElement!=iPhraseIx->Count())
-	    {
-	    OstTrace0( TRACE_DUMP, DUP5_CRICHTEXTINDEX_DBGTESTINVARIANT, "We have no unexpected phrases left over" );
-	    }
 	__ASSERT_DEBUG(currentPhraseElement==-1 ||
 					currentPhraseElement==iPhraseIx->Count(),User::Invariant());
 // ASSERT: There is either zero(0) or one(1) zero length phrase in the whole index
-	if (!((zeroLengthPhraseCount==0) ||
-(zeroLengthPhraseCount==1 && iPendingNewPhrasePos!=EInsertCharFormatReset)))
-	    {
-	    OstTrace0( TRACE_DUMP, DUP6_CRICHTEXTINDEX_DBGTESTINVARIANT, "There is either zero(0) or one(1) zero length phrase in the whole index" );
-	    }
 	__ASSERT_DEBUG( (zeroLengthPhraseCount==0) ||
 					(zeroLengthPhraseCount==1 && iPendingNewPhrasePos!=EInsertCharFormatReset),
 					User::Invariant());
 // ASSERT: the number of paraEntries with paraAttribs of refCount>0 == the sum of refCounts in the shared list.
 //			or is only one less - as is set when SetInsertCharFormat is called on a shared paraAttribs.
 		CParaAttribs* currentSharedPara;
 		TDblQueIter<CParaAttribs> iterator(((CRichTextIndex*)this)->iSharedParaQueHead);
 		while ((currentSharedPara=iterator++)!=NULL)
 			totalReferenceCount+=currentSharedPara->iRefCount;
 		}
-	if ((numberOfReferencesToSharedList!=totalReferenceCount) &&
-(numberOfReferencesToSharedList!=totalReferenceCount-1))
-	    {
-	    OstTrace0( TRACE_DUMP, DUP7_CRICHTEXTINDEX_DBGTESTINVARIANT, "Invariant" );
-	    }
 	__ASSERT_DEBUG((numberOfReferencesToSharedList==totalReferenceCount) ||
 				   (numberOfReferencesToSharedList==totalReferenceCount-1),User::Invariant());
 // ASSERT: iPictureCount corresponds to the number of pictures in the stored in the index.
 	TInt picCount=0;
 	TInt phraseCount=(iPhraseIx) ? iPhraseIx->Count() : 0;
 	for (TInt item=0;item<phraseCount;item++)
 		picCount+=((*iPhraseIx)[item].IsPicturePhrase())
 					? 1
 					: 0;
-	if (iPictureCount!=picCount)
-	    {
-	    OstTrace0( TRACE_DUMP, DUP8_CRICHTEXTINDEX_DBGTESTINVARIANT, "Invariant" );
-	    }
 	__ASSERT_DEBUG(iPictureCount==picCount,User::Invariant());
 #endif
 	}
 //
 	{
 	TInt count;
 	if (iPhraseIx)
 		{// Destroy the phrase index and its contents.
-		if (!iParaIx)
-		    {
-		    OstTrace0( TRACE_FATAL, CRICHTEXTINDEX_CRICHTEXTINDEX, "EPhraseIxPresentWithNoParaIx" );
-		    }
 		__ASSERT_ALWAYS(iParaIx,Panic(EPhraseIxPresentWithNoParaIx));
 		count=iPhraseIx->Count();
 		for (TInt offset=0;offset<count;offset++)
 			(*iPhraseIx)[offset].Discard();
 		}
 	// unless internalize failed after getting shared list & before getting all para data.
 	CParaAttribs* currentSharedPara;
 	TDblQueIter<CParaAttribs> iterator(iSharedParaQueHead);
 	while ((currentSharedPara=iterator++)!=NULL)
 		currentSharedPara->Release(currentSharedPara->iRefCount);
-	if (!iSharedParaQueHead.IsEmpty())
-	    {
-	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXTINDEX_CRICHTEXTINDEX, "ERichTextIndexIntegrityErr" );
-	    }
 	__ASSERT_ALWAYS(iSharedParaQueHead.IsEmpty(),Panic(ERichTextIndexIntegrityErr));
 	}
 TInt CRichTextIndex::CharPosOfParagraph(TInt& aLength,TInt aParaOffset)const
 		}
 	for (TInt paraItem=1;paraItem<paragraphCount;paraItem++)
 		{// For each para inserted between the fist and last
 		TParaAttribsEntry& para=(*iParaIx)[pastePos.iParaElement+paraItem];
 		TInt length=ParaLengthFromBuffer(buf)+1;
-		if (length==KErrNotFound)
-		    {
-		    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_INSERTL, "EInsertEmbeddedParaErr" );
-		    }
 		__ASSERT_DEBUG(length!=KErrNotFound,Panic(EInsertEmbeddedParaErr));
 		para.iLength=length;
 		buf.Set(buf.Right(buf.Length()-length));
 		}
 	// For final paragrph
 		if (current.iPhrase)
 			{
 			current.iPhrase->AdjustLength(-1);  // collapse phrase by right amount
 			if (insertPendingPos!=EInsertCharFormatReset)
 				{
-				if (current.iPhrase->Length()!=0)
-				    {
-				    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_SPLITPARAGRAPHATPASTEPOSL, "Invariant" );
-				    }
 				__ASSERT_DEBUG(current.iPhrase->Length()==0,User::Invariant());
 				iPendingNewPhrasePos=insertPendingPos;
 				}
 			else if (current.iPhrase->Length()==0)
 				{
 				RemoveFromPhraseIx(iPos.iPhraseElement,1);
 				current.iParaAttribs->iPhraseCount--;
-				if (current.iParaAttribs->PhraseCount()<=1)
-				    {
-				    OstTrace0( TRACE_DUMP, DUP1_CRICHTEXTINDEX_SPLITPARAGRAPHATPASTEPOSL, "Invariant" );
-				    }
 				__ASSERT_DEBUG(current.iParaAttribs->PhraseCount()>1,User::Invariant());
 				}
 			}
-		OstTrace1( TRACE_DUMP, DUP2_CRICHTEXTINDEX_SPLITPARAGRAPHATPASTEPOSL, "Leave code=%d", ret );
 		User::Leave(ret);
 		}
 	if (insertPendingPos != EInsertCharFormatReset)
 		ConsolidateAt(insertPendingPos, insertCharFormatDeleted?
 			EPositionOnly : EFollowingPhrase);
 	{
 	__TEST_INVARIANT;
 	RebalanceIndex();
 // ASSERT: A valid picture header, referencing a valid picture has been inserted.
-	if (!aPicHdr.iPicture.IsPtr() || aPicHdr.iPicture.AsPtr()==NULL)
-	    {
-	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXTINDEX_INSERTL, "EInsertNullPicHdrData" );
-	    }
 	__ASSERT_ALWAYS(aPicHdr.iPicture.IsPtr() && aPicHdr.iPicture.AsPtr()!=NULL,Panic(EInsertNullPicHdrData));
 // ASSERT: The current insert pos hasn't been changed without cancelling SetInsertCharFormat.
-	if ((iPendingNewPhrasePos!=EInsertCharFormatReset) && (aPos!=iPendingNewPhrasePos))
-	    {
-	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXTINDEX_INSERTL, "ESetInsertCharFormatIntegrityErr" );
-	    }
 	__ASSERT_ALWAYS((iPendingNewPhrasePos==EInsertCharFormatReset) || (aPos==iPendingNewPhrasePos),
 					Panic(ESetInsertCharFormatIntegrityErr));
 	if (iPendingNewPhrasePos!=EInsertCharFormatReset)
 		CancelInsertCharFormat();  // Cancel this state before inserting picture. Rebalances the index.
 	ScanToPosition(aPos,EScanToPositionMatchLeft);
 		CleanupStack::PushL(TCleanupItem(ReleaseOnCleanup,reclaimed));
 		current.iParaEntry->iParaAttribs=reclaimed;  // Use this reclaimed para attribs (the new CParaAttribs instance)
 		}
 	GetCurrentRecords(current);
 //	ASSERT: The reclaim succeeded.  We must always end up with a PhraseIx-not constant char format.
-	if (current.iPhrase==NULL)
-	    {
-	    OstTrace0( TRACE_DUMP, DUP3_CRICHTEXTINDEX_INSERTL, "EReclaimShareError" );
-	    }
 	__ASSERT_DEBUG(current.iPhrase!=NULL,Panic(EReclaimShareError));
 	TRAPD(ret1,
 	SplitPhraseL(aPos));  // Phrase may not be split if at boundary.
 if (ret1!=KErrNone)
 	__TEST_INVARIANT;  // Do not need to RebalanceIndex(); part of defined behaviour for delete.
 	CancelInsertCharFormat();
 	ScanToPosition(aPos,EScanToPositionAbsolute,&iLastUsed);
-	if (iPos.iParaElementOffset!=0)
-	    {
-	    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_DELETEPARAGRAPH, "EDeleteParagraphInvalidStartValue" );
-	    }
 	__ASSERT_DEBUG(iPos.iParaElementOffset==0,Panic(EDeleteParagraphInvalidStartValue));
 	TIndexDeleteInfo info;
 	info.iDeleteType=TIndexDeleteInfo::EDeleteParagraph;
 	info.iDeletePos=iPos;
 	TCurrentIndexRecords current;
 	GetCurrentRecords(current);
 	TInt startParaLength=current.iParaEntry->iLength;
 	TInt lengthRemainingInPara=startParaLength-iPos.iParaElementOffset;
-	if (aLength>=lengthRemainingInPara)
-	    {
-	    OstTrace0( TRACE_FATAL, CRICHTEXTINDEX_DELETEFROMPARAGRAPH, "EDeleteFromParagraphInvalidRange" );
-	    }
 	__ASSERT_ALWAYS(aLength<lengthRemainingInPara,Panic(EDeleteFromParagraphInvalidRange));
 	}
 #endif
 	TIndexDeleteInfo info;
 movement etc. Split the current phrase at aPos (if necessary) and insert a zero
 length phrase, ready to accept the pending content of the specified format.
 */
 void CRichTextIndex::SetInsertCharFormatL(const TCharFormatX& aFormat,const TCharFormatXMask& aMask,TInt aPos)
 	{
-	if (InsertCharFormatIsActive() && aPos!=iPendingNewPhrasePos)
-	    {
-	    OstTrace0( TRACE_FATAL, CRICHTEXTINDEX_SETINSERTCHARFORMATL, "ESetInsertCharFormatIntegrityErr" );
-	    }
 	__ASSERT_ALWAYS(!InsertCharFormatIsActive() || aPos==iPendingNewPhrasePos,
 					Panic(ESetInsertCharFormatIntegrityErr));
 	if (InsertCharFormatIsActive())
 		UpdateInsertCharFormatL(aFormat, aMask);
 	else
 	}
 void CRichTextIndex::NewInsertCharFormatL(const TCharFormatX& aFormat,
 	const TCharFormatXMask& aMask, TInt aPos)
 	{
-	if (InsertCharFormatIsActive())
-	    {
-	    OstTrace0( TRACE_FATAL, CRICHTEXTINDEX_NEWINSERTCHARFORMATL, "ESetInsertCharFormatIntegrityErr" );
-	    }
 	__ASSERT_ALWAYS(!InsertCharFormatIsActive(),
 		Panic(ESetInsertCharFormatIntegrityErr));
 	ScanToPosition(aPos,EScanToPositionMatchLeft);
 	TCurrentIndexRecords current;
 	GetCurrentRecords(current);
 		else
 			{// Restore the original phrase index.
 			if (PhraseSplit())
 				MergePhrases(aPos);
 			}
-		OstTrace0( TRACE_FATAL, DUP1_CRICHTEXTINDEX_NEWINSERTCHARFORMATL, "LeaveNoMemory" );
 		User::LeaveNoMemory();
 		}
 	iPendingNewPhrasePos=aPos;
 	}
 	CleanupStack::PopAndDestroy(newLayer);
 	}
 CCharFormatLayer* CRichTextIndex::GetCurrentInsertCharFormat()
 	{
-	if (!InsertCharFormatIsActive())
-	    {
-	    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_GETCURRENTINSERTCHARFORMAT, "ESetInsertCharFormatIntegrityErr" );
-	    }
 	__ASSERT_DEBUG(InsertCharFormatIsActive(),
 		Panic(ESetInsertCharFormatIntegrityErr));
 	ScanToPosition(iPendingNewPhrasePos,EScanToPositionMatchLeft);
 	TCurrentIndexRecords current;
 	GetCurrentRecords(current);
-	if ((*iPhraseIx)[iPos.iPhraseElement].Length() != 0)
-	    {
-	    OstTrace0( TRACE_DUMP, DUP1_CRICHTEXTINDEX_GETCURRENTINSERTCHARFORMAT, "ESetInsertCharFormatIntegrityErr" );
-	    }
 	__ASSERT_DEBUG((*iPhraseIx)[iPos.iPhraseElement].Length() == 0,
 		Panic(ESetInsertCharFormatIntegrityErr));
 	return (*iPhraseIx)[iPos.iPhraseElement].CharFormat();
 	}
 //
 	{
 	if (iRollbackParaAttribsHandle)
 		{
 		// ASSERT: The specified para attribs is indeed in the share list.
-		if (!iRollbackParaAttribsHandle->IsShared())
-		    {
-		    OstTrace0( TRACE_FATAL, CRICHTEXTINDEX_REBALANCEINDEX, "EParaAttribsNotInSharedList" );
-		    }
 		__ASSERT_ALWAYS(iRollbackParaAttribsHandle->IsShared(),Panic(EParaAttribsNotInSharedList));
 		iRollbackParaAttribsHandle->Release();
 		iRollbackParaAttribsHandle=NULL;
 		}
 	}
 @pre The insert character format must be active
 @return ETrue if a zero-length phrase was deleted.
 */
 TBool CRichTextIndex::DeleteInsertCharFormat()
 	{
-	if (!InsertCharFormatIsActive())
-	    {
-	    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_DELETEINSERTCHARFORMAT, "Invariant" );
-	    }
 	__ASSERT_DEBUG(InsertCharFormatIsActive(), User::Invariant());
 	ScanToPosition(iPendingNewPhrasePos,EScanToPositionMatchLeft);
 	TCurrentIndexRecords current;
 	GetCurrentRecords(current);
 	if (current.iPhrase && current.iPhrase->Length() == 0)
 	}
 void CRichTextIndex::SplitPhraseL(TInt aPhrase,TInt anOffset,RPhraseAttribsEntry& aPhraseAttribs,CParaAttribs& aParaAttribs)
 	{
-	if (anOffset<=0 || anOffset>=aPhraseAttribs.Length())
-	    {
-	    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_SPLITPHRASEL, "Invariant" );
-	    }
 	__ASSERT_DEBUG(anOffset>0 && anOffset<aPhraseAttribs.Length(),User::Invariant());
 //
 	CCharFormatLayer* charLayer=CCharFormatLayer::NewCopyBaseL(aPhraseAttribs.CharFormat());
 	CleanupStack::PushL(charLayer);
 	iPhraseIx->InsertL(aPhrase+1,RPhraseAttribsEntry(charLayer,aPhraseAttribs.Length()-anOffset));
 //
 // aParaEntry is not shared and can be (phrase count 1), aPhrase is the single phrase element
 //
 	{
 	CParaAttribs* paraAttribs=aParaEntry.iParaAttribs;
-	if (paraAttribs->iPhraseCount!=1)
-	    {
-	    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_SHARE, "Invariant" );
-	    }
 	__ASSERT_DEBUG(paraAttribs->iPhraseCount==1,User::Invariant());
 	RPhraseAttribsEntry& phraseAttribs=iPhraseIx->At(aPhrase);
-	if (phraseAttribs.IsPicturePhrase())
-	    {
-	    OstTrace0( TRACE_DUMP, DUP1_CRICHTEXTINDEX_SHARE, "Invariant" );
-	    }
 	__ASSERT_DEBUG(!phraseAttribs.IsPicturePhrase(),User::Invariant());
 	CParaAttribs* share=GetParaAttribs(paraAttribs,*phraseAttribs.CharFormat());
 	if (share!=paraAttribs)
 		{	// re-use an existing share, so release the current attribs
 	if (paraAttribs->IsShared())
 		return;
 	TInt phrase=iPos.iPhraseElement;
 	TInt base=iPos.iParaBasePhraseElement;
-	if (phrase<base || phrase>=base+paraAttribs->iPhraseCount)
-	    {
-	    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_APPLYCHARFORMATROLLBACK, "Invariant" );
-	    }
 	__ASSERT_DEBUG(phrase>=base && phrase<base+paraAttribs->iPhraseCount,User::Invariant());
 	if (phrase<base+paraAttribs->iPhraseCount-1)	// merge to the right
 		MergePhrases(phrase+1,iPhraseIx->At(phrase+1),*paraAttribs);
 	if (phrase>base)								// merge to the left
 		MergePhrases(phrase,iPhraseIx->At(phrase),*paraAttribs);
 void CRichTextIndex::ApplyCharFormatL(const TCharFormatX& aFormat,const TCharFormatXMask& aMask,TInt aPos,TInt aLength,TBool aRemoveSpecific)
 // Applies the specified character formatting to the characters contained within the range
 // aPos to aPos+(aLength-1).
 //
 	{
-	if (aLength<0)
-	    {
-	    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_APPLYCHARFORMATL, "Invariant" );
-	    }
 	__ASSERT_DEBUG(aLength>=0,User::Invariant());
 	__TEST_INVARIANT;
 	ScanToPosition(aPos,EScanToPositionAbsolute);
 	TInt paraOffset=iPos.iParaElementOffset;
 // STEP 2.	Walk through all affected phrases in this paragraph
 //			For each one, we may need to split it, and then apply the new format
 		do
 			{
-			if (phrase>=iPos.iParaBasePhraseElement+paraAttribs->iPhraseCount)
-			    {
-			    OstTrace0( TRACE_DUMP, DUP1_CRICHTEXTINDEX_APPLYCHARFORMATL, "Invariant" );
-			    }
 			__ASSERT_DEBUG(phrase<iPos.iParaBasePhraseElement+paraAttribs->iPhraseCount,User::Invariant());
 //
 			RPhraseAttribsEntry* phraseAttribs=&iPhraseIx->At(phrase);
 			TInt len=phraseAttribs->Length();
 				SplitPhraseL(phrase,charsToFormat,*phraseAttribs,*paraAttribs);
 				len=charsToFormat;
 				phraseAttribs=&iPhraseIx->At(phrase);		// SplitPhraseL modifies the index array, we must do this!
 				}
-			if (phraseAttribs->Length()!=len)
-			    {
-			    OstTrace0( TRACE_DUMP, DUP2_CRICHTEXTINDEX_APPLYCHARFORMATL, "Invariant" );
-			    }
 			__ASSERT_DEBUG(phraseAttribs->Length()==len,User::Invariant());
 // STEP 2.3	Change the format of the current phrase layer
 			TCharFormatX format=aFormat;
 				iPos.iPhraseElement=++phrase;
 			charsToFormat-=len;
 			} while (charsToFormat);
-		if (phrase!=iPos.iParaBasePhraseElement+paraAttribs->iPhraseCount && aLength!=0)
-		    {
-		    OstTrace0( TRACE_DUMP, DUP3_CRICHTEXTINDEX_APPLYCHARFORMATL, "Invariant" );
-		    }
 		__ASSERT_DEBUG(phrase==iPos.iParaBasePhraseElement+paraAttribs->iPhraseCount || aLength==0,User::Invariant());
 // STEP 3	Reduce the paragraph attributes back to canonical form
 // STEP 3.1	Check for merging at the end of the changes
 		iPos.iParaElement++;
 		paraOffset=0;
 		iPos.iParaBasePhraseElement=phrase;
 #ifdef _DEBUG
 		ScanToPosition(aPos,EScanToPositionAbsolute);
-		if (iPos.iDocPos!=aPos)
-		    {
-		    OstTrace0( TRACE_DUMP, DUP4_CRICHTEXTINDEX_APPLYCHARFORMATL, "Invariant" );
-		    }
 		__ASSERT_DEBUG(iPos.iDocPos==aPos,User::Invariant());
-		if (iPos.iPhraseElement!=phrase)
-		    {
-		    OstTrace0( TRACE_DUMP, DUP5_CRICHTEXTINDEX_APPLYCHARFORMATL, "Invariant" );
-		    }
 		__ASSERT_DEBUG(iPos.iPhraseElement==phrase,User::Invariant());
-		if (iPos.iParaElementOffset!=paraOffset)
-		    {
-		    OstTrace0( TRACE_DUMP, DUP6_CRICHTEXTINDEX_APPLYCHARFORMATL, "Invariant" );
-		    }
 		__ASSERT_DEBUG(iPos.iParaElementOffset==paraOffset,User::Invariant());
-		if (iPos.iPhraseElementOffset!=phraseOffset)
-		    {
-		    OstTrace0( TRACE_DUMP, DUP7_CRICHTEXTINDEX_APPLYCHARFORMATL, "Invariant" );
-		    }
 		__ASSERT_DEBUG(iPos.iPhraseElementOffset==phraseOffset,User::Invariant());
 		__TEST_INVARIANT;
 #endif
 		}
 	if (handle)
 		return handle;
 	else
 		{// No match, so piece together new shared paraAttribs and add to shared para list
 		sourceParaAttribs->iRefCount=1;
-		if (sourcePhrase->IsPicturePhrase())
-		    {
-		    OstTrace0( TRACE_FATAL, CRICHTEXTINDEX_GETPARAATTRIBS, "EReleasCharFormatLayerOwnershipCalledOnPicturePhrase" );
-		    }
 		__ASSERT_ALWAYS(!sourcePhrase->IsPicturePhrase(),Panic(EReleasCharFormatLayerOwnershipCalledOnPicturePhrase));
 		sourceParaAttribs->iCharFormat=sourcePhrase->ReleaseCharFormatLayerOwnership();
 		sourcePhrase->Discard();
 		iPhraseIx->Delete(aLogicalPosition.iPhraseElement);  // remove the deleted phrase from the phrase index.
 		iSharedParaQueHead.AddLast(*sourceParaAttribs);
 		else
 			iPos.iPhraseElementOffset=paraElementOffset-startOfPhrase;
 		}
 	else
 		{
-		if (iPos.iParaBasePhraseElement!=phraseElement)
-		    {
-		    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_SCANTOPOSITION, "EDebug" );
-		    }
 		__ASSERT_DEBUG(iPos.iParaBasePhraseElement==phraseElement,Panic(EDebug));
 		}
 	iPos.iPhraseElement=phraseElement;
 	iPos.iDocPos=aCharPos;
 	if (aLastUsed)
 	ScanToPosition(aSplitPos,EScanToPositionAbsolute);
 	if (iPos.iPhraseElementOffset==0)
 		return;  // aSplitPos on a phrase boundary; urgo no split.
 	TCurrentIndexRecords current; GetCurrentRecords(current);
 // ASSERT: This function set can only be called on CParaAttribs that specific char format.
-	if (current.iPhrase==NULL)
-	    {
-	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXTINDEX_SPLITPHRASEL, "ESplitPhraseCalledOnSharedPara" );
-	    }
 	__ASSERT_ALWAYS(current.iPhrase!=NULL,Panic(ESplitPhraseCalledOnSharedPara));
 	DoSplitPhraseL(*current.iPhrase,iPos.iPhraseElementOffset,current.iParaAttribs);
 	}
 // Splits the specified phrase, creating a new phrase of the same character format.
 // This new phrase is inserted into the phrase index immediately following the current one.
 //
 	{
 // ASSERT: Cannot split a picture phrase.
-	if (aCurrentPhrase.IsPicturePhrase())
-	    {
-	    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_DOSPLITPHRASEL, "ESplitPhraseCalledOnPicturePhrase" );
-	    }
 	__ASSERT_DEBUG(!aCurrentPhrase.IsPicturePhrase(),Panic(ESplitPhraseCalledOnPicturePhrase));
 	CCharFormatLayer* layer=CCharFormatLayer::NewCopyBaseL(aCurrentPhrase.CharFormat());
 	CleanupStack::PushL(layer);
 	RPhraseAttribsEntry newPhrase(layer,aCurrentPhrase.Length()-aPhraseOffset);
 	iPhraseIx->InsertL(iPos.iPhraseElement+1,newPhrase);
 	TInt phraseCount=PhraseCount();
 	if (phraseCount>0)
 		return ETrue;
 	//
 	TInt sharedParaCount=SharedParaCount(this);
-	if (sharedParaCount<1 && (sharedParaCount!=0 || phraseCount<=0))
-	    {
-	    OstTrace0( TRACE_FATAL, CRICHTEXTINDEX_HASMARKUPDATA, "ERichTextIndexIntegrityErr" );
-	    }
 	__ASSERT_ALWAYS(sharedParaCount>=1 || (sharedParaCount==0 && phraseCount>0),Panic(ERichTextIndexIntegrityErr));
 	if (sharedParaCount>1)
 		return ETrue;
 	const CParaAttribs* paraAttribs=iSharedParaQueHead.First();
 	if (!paraAttribs->iParaFormat->IsEmpty())
 		const CParaAttribs* sParaAttribs=sParaEntry.iParaAttribs;
 		CParaAttribs* tParaAttribs;
 		if (sParaAttribs->IsShared())
 			{
 			tParaAttribs=map->Item(sParaAttribs);
-			if (tParaAttribs==NULL)
-			    {
-			    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_APPENDPARAINDEXL, "ESharedFormatsMapIntegrityError" );
-			    }
 			__ASSERT_DEBUG(tParaAttribs!=NULL,Panic(ESharedFormatsMapIntegrityError));
 			tParaAttribs->iRefCount++;
 			}
 		else
 			{// Have to build up the specific para attribs
 	{
 	TDblQueIter<CParaAttribs> iterator(MUTABLE_CAST(TDblQue<CParaAttribs>&,aSource->iSharedParaQueHead));
 	CParaAttribs* currentSharedPara;
 	while ((currentSharedPara=iterator++)!=NULL)
 		{
-		if (!currentSharedPara->IsShared())
-		    {
-		    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_APPENDSHAREDFORMATSL, "Invariant" );
-		    }
 		__ASSERT_DEBUG(currentSharedPara->IsShared(),User::Invariant());
 		CParaFormatLayer* sPl=currentSharedPara->iParaFormat;
 		CCharFormatLayer* sCl=currentSharedPara->iCharFormat;
 		sPl->SetBase(aGlobalLayerInfo.iAggParaFormatLayer);  // alter the original so that the following GetParaAttribsL() call will
 	// transfer pictures now
 	for (TInt kk=pictureMap->Count();--kk>=0;)
 		{
 		TInt jj=pictureMap->At(kk);
 		TPictureHeader* sHeader=(*aSource->iPhraseIx)[jj].PictureHeaderPtr();
-		if (!sHeader)
-		    {
-		    OstTrace0( TRACE_DUMP, CRICHTEXTINDEX_APPENDPHRASEINDEXL, "Invariant" );
-		    }
 		__ASSERT_DEBUG(sHeader,User::Invariant());
 		if (sHeader->iPicture.IsPtr())
 			{	// transfer picture to us
 			TPictureHeader* tHeader=(*iPhraseIx)[jj+originalPhraseCount].PictureHeaderPtr();
-			if (!tHeader)
-			    {
-			    OstTrace0( TRACE_DUMP, DUP1_CRICHTEXTINDEX_APPENDPHRASEINDEXL, "Invariant" );
-			    }
 			__ASSERT_DEBUG(tHeader,User::Invariant());
 			tHeader->iPicture=sHeader->iPicture.AsPtr();
 			sHeader->iPicture=NULL;
 			}
 		}
 // Class invariants.
 //
 	{
 #ifdef _DEBUG
 // ASSERT: iLength is +ve (applying to character formatting, or	is set to indicate a picture phrase.
-	if (iLength<0 && !IsPicturePhrase())
-	    {
-	    OstTrace0( TRACE_DUMP, RPHRASEATTRIBSENTRY_DBGTESTINVARIANT, "Invariant" );
-	    }
 	__ASSERT_DEBUG(iLength>=0 || IsPicturePhrase(),User::Invariant());
 #endif
 	}
 // Adjusts the length of the phrase by the signed value aIncrement.
 //
 	{
 // ASSERT: The length of a picture phrase may only be altered by deleting it, in which case
 //			the only adjustment made will be an increment of -1 (EPictureIndicator).
-	if (IsPicturePhrase() && (!IsPicturePhrase() || aIncrement!=EPictureIndicator)
-&& (!IsPicturePhrase() || aIncrement!=0) )
-	    {
-	    OstTrace0( TRACE_DUMP, RPHRASEATTRIBSENTRY_ADJUSTLENGTH, "EModifiedPicturePhraseLength" );
-	    }
 	__ASSERT_DEBUG(!IsPicturePhrase() || (IsPicturePhrase() && aIncrement==EPictureIndicator)
 									  || (IsPicturePhrase() && aIncrement==0)
 									  ,Panic(EModifiedPicturePhraseLength));
 	TInt len=iLength;
 	iLength=(len==EPictureIndicator)

branch	RCL_3
changeset 55	336bee5c2d35
parent 54	748ec5531811