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

equal deleted inserted replaced

-:6be019398652
+:601ab138ba0b
 #include "TXTSTD.H"
 #include "TXTRTPFL.H"
 #include "ParseLst.h"
 #include "TXTCLIPBOARD.H"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "TXTRICHTraces.h"
+#endif
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include "TXTETEXT_INTERNAL.H"
 #include "TXTRICH_INTERNAL.H"
 #endif
 // Provides class invariants.  Explanations below:
 //
 	{
 #ifdef _DEBUG
 // ASSERT: The global format layers are never null.
+	if (iGlobalParaFormatLayer == NULL)
+	    {
+	    OstTrace0( TRACE_DUMP, CRICHTEXT_DBGTESTINVARIANT, "Invariant" );
+	    }
 	__ASSERT_DEBUG(iGlobalParaFormatLayer != NULL, User::Invariant());
+	if (iGlobalCharFormatLayer == NULL)
+	    {
+	    OstTrace0( TRACE_DUMP, DUP1_CRICHTEXT_DBGTESTINVARIANT, "Invariant" );
+	    }
 	__ASSERT_DEBUG(iGlobalCharFormatLayer != NULL, User::Invariant());
 	if (IndexPresent())
 		{
 // ASSERT: The sum of para lengths == the length as described by the document storage.
 		TInt cumulativeParaLength = 0;
 		for (TInt offset = 0; offset < maxPara; offset++)
 			{
 			TParaAttribsEntry entry = (*iIndex->iParaIx)[offset];
 			cumulativeParaLength += entry.iLength;
 			}
+		if (cumulativeParaLength != (DocumentLength() + 1))
+		    {
+		    OstTrace0( TRACE_DUMP, DUP2_CRICHTEXT_DBGTESTINVARIANT, "Invariant" );
+		    }
 		__ASSERT_DEBUG(cumulativeParaLength == (DocumentLength() + 1), User::Invariant());
 		}
 		// Change here for defect INC005336.
 		// This defect is present when the assertion below fails.
+if ((iParserData != NULL) &&
+(iParserData->HaveRange()) &&
+(iParserData->EndParse() > DocumentLength()))
+{
+OstTrace0( TRACE_DUMP, DUP3_CRICHTEXT_DBGTESTINVARIANT, "Invariant" );
+}
 		__ASSERT_DEBUG( (iParserData == NULL) || \
 			(!iParserData->HaveRange()) || \
 			(iParserData->EndParse() <= DocumentLength()), User::Invariant());
 #endif
 	}
 or multiple paragraphs, and thus affects the granularity of aggregate objects
 used internally for storing paragraph attributes. Default = EMultiPara.
 @return The rich text object. */
 	{
 	// Create new rich text containing just a single end-of-document character.
+	if (aGlobalParaLayer == NULL)
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_NEWL, "ENullFormatLayerHandle" );
+	    }
 	__ASSERT_ALWAYS(aGlobalParaLayer != NULL, Panic(ENullFormatLayerHandle));
+	if (aGlobalCharLayer == NULL)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_NEWL, "ENullFormatLayerHandle" );
+	    }
 	__ASSERT_ALWAYS(aGlobalCharLayer != NULL, Panic(ENullFormatLayerHandle));
 	CRichText* self = new(ELeave) CRichText(aGlobalParaLayer, aGlobalCharLayer);
 	CleanupStack::PushL(self);
 	self->ConstructL(aStorage, aDefaultTextGranularity, aParaType);
 @param aParaType This argument indicates whether you are using a single paragraph
 or multiple paragraphs, and thus affects the granularity of aggregate objects
 used internally for storing paragraph attributes. Default = EMultiPara.
 @return The new rich text object. */
 	{
+	if (aGlobalParaLayer == NULL)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_NEWL, "ENullFormatLayerHandle" );
+	    }
 	__ASSERT_ALWAYS(aGlobalParaLayer != NULL, Panic(ENullFormatLayerHandle));
+	if (aGlobalCharLayer == NULL)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP3_CRICHTEXT_NEWL, "ENullFormatLayerHandle" );
+	    }
 	__ASSERT_ALWAYS(aGlobalCharLayer != NULL, Panic(ENullFormatLayerHandle));
 	CRichText* self = new(ELeave) CRichText(aGlobalParaLayer, aGlobalCharLayer, CONST_CAST(CStyleList*, &aStyleList));
 	CleanupStack::PushL(self);
 	self->ConstructL(aStorage, aDefaultTextGranularity, aParaType);
 if the text object supports fields.
 @param aStorage The type of in-memory buffer to use. Defaults to ESegmentedStorage
 which should rarely need to be changed.
 @return The new rich text object. */
 	{
+	if (aGlobalParaLayer == NULL)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP4_CRICHTEXT_NEWL, "ENullFormatLayerHandle" );
+	    }
 	__ASSERT_ALWAYS(aGlobalParaLayer != NULL, Panic(ENullFormatLayerHandle));
+	if (aGlobalCharLayer == NULL)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP5_CRICHTEXT_NEWL, "ENullFormatLayerHandle" );
+	    }
 	__ASSERT_ALWAYS(aGlobalCharLayer != NULL, Panic(ENullFormatLayerHandle));
 	CRichText* self = new(ELeave) CRichText(aGlobalParaLayer, aGlobalCharLayer);
 	CleanupStack::PushL(self);
 	self->ConstructL(aStore, aStreamId, NULL, NULL, aFieldFactory, aStorage);
 which should rarely need to be changed.
 @return The new rich text object. */
 	{
 	// Restore a new rich text from the specified stream, that uses the specified global layers, and the
 	// specified picture header factory and store, if this rich text supports pictures.
+	if (!aPictureFactory && aStoreResolver)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP6_CRICHTEXT_NEWL, "EInvalidPictureFactorySettings" );
+	    }
 	__ASSERT_ALWAYS(!(!aPictureFactory && aStoreResolver), Panic(EInvalidPictureFactorySettings));
+	if (aGlobalParaLayer == NULL)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP7_CRICHTEXT_NEWL, "ENullFormatLayerHandle" );
+	    }
 	__ASSERT_ALWAYS(aGlobalParaLayer != NULL, Panic(ENullFormatLayerHandle));
+	if (aGlobalCharLayer == NULL)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP8_CRICHTEXT_NEWL, "ENullFormatLayerHandle" );
+	    }
 	__ASSERT_ALWAYS(aGlobalCharLayer != NULL, Panic(ENullFormatLayerHandle));
 	CRichText* self = new(ELeave) CRichText(aGlobalParaLayer, aGlobalCharLayer);
 	CleanupStack::PushL(self);
 	self->ConstructL(aStore, aStreamId, aPictureFactory, aStoreResolver, aFieldFactory, aStorage);
 TStreamId CRichText::DoCopyToStoreL(CStreamStore& aStore,TInt aPos,TInt aLength,TStreamId aPlainTextId,TBool aCopyStyles) const
 	{
 	__TEST_INVARIANT;
 	TInt documentLength = DocumentLength();
+	if (aPos < 0 || aPos > documentLength)
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_DOCOPYTOSTOREL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= documentLength,Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_DOCOPYTOSTOREL, "ECopyToClipboardNegativeLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0,Panic(ECopyToClipboardNegativeLength));
+	if (aPos + aLength > documentLength)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_DOCOPYTOSTOREL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + aLength <= documentLength,Panic(ECharPosBeyondDocument));
 	if (aLength == 0)
 		return KNullStreamId;
 // instance at character position aPos.  Returns the number of characters pasted.
 // May be 0.
 //
 	{
 	__TEST_INVARIANT;
+	if (aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_DOPASTERTFROMSTOREL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	TUid type = KClipboardUidTypeRichTextWithStyles;
 	TStreamId id = aDictionary.At(type);
 	if (id == KNullStreamId)
 	{
 	if (!IndexPresent())
 		CreateAndGenerateMarkupComponentL();  // create the index if it does not already exist
 	TStreamId id = aDictionary.At(KClipboardUidTypePlainText);
 // ASSERT: We have rich text, so the plain text stream must exist.
+	if (id == KNullStreamId)
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_PASTERICHTEXTFROMSTOREL, "EClipboardIntegrity" );
+	    }
 	__ASSERT_ALWAYS(id != KNullStreamId,Panic(EClipboardIntegrity));
 	TInt consumed = CPlainText::DoPasteFromStoreL(aStore, id, aPos);
 	TRAPD(ret, CompletePasteRichTextFromStoreL(aStore, aRichTextStreamId, aPos, aStylePasteMode));
 	if (ret != KErrNone)
 		{
 		CPlainText::Delete(aPos,consumed);
+		OstTrace1( TRACE_FATAL, DUP1_CRICHTEXT_PASTERICHTEXTFROMSTOREL, "Leave code=%d", ret );
 		User::Leave(ret);
 		}
 	return consumed;
 	}
 @param aChar The character to insert. Must not be a picture character or a
 panic occurs.
 @param aBuf The descriptor to insert. */
 	{
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_INSERTL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (aChar == EPictureCharacter)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_INSERTL, "ENonOverloadedInsertCalledWithPictureCharacter" );
+	    }
 	__ASSERT_ALWAYS(aChar!= EPictureCharacter, Panic(ENonOverloadedInsertCalledWithPictureCharacter));
 	if (aChar < 0x10000)
 		{
 		TBuf<1> content;
 // Updates the index accordingly, and accounts for all embedded paragraph delimiters
 // in the passed buffer aBuf.
 //
 	{
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_RTINSERTL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	int length = aBuf.Length();
 	CPlainText::InsertL(aPos, aBuf);
 	if (IndexPresent())
 be valid, or a panic occurs.
 @param aHeader A picture header. This holds a pointer to the picture to insert,
 and information about the picture. */
 	{
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_INSERTL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	CleanupStack::PushL(aHeader.iPicture);
 	if (!IndexPresent())
 	// Deletes aRange number of characters from the text component
 	// and the corresponding index data.
 	// Delete commences at, and includes, character position aPos.
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_DELETEL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_DELETEL, "EDebugDeleteZeroLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0, Panic(EDebugDeleteZeroLength));
+	if (aPos + (aLength - 1) > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_DELETEL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + (aLength - 1) <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	TBool requireMerge = EFalse;
 	if (!IndexPresent())
 		CPlainText::Delete(aPos,aLength);
 	__TEST_INVARIANT;
 	// Store the length of the text before we commence with deletions.
 	TInt initialDocLen=DocumentLength();
+	if (aPos < 0 || aPos > initialDocLen)
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_DELETEPARAGRAPH, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= initialDocLen, Panic(ECharPosBeyondDocument));
+	if (aPos + aLength > initialDocLen + 1)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_DELETEPARAGRAPH, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + aLength <= initialDocLen + 1, Panic(ECharPosBeyondDocument));
 	if (aLength <= 0)
 		return;
 	{
 	// Removes aLength characters from *within* a single paragraph only.
 	// Guaranteed not to leave if this pre-condition holds true.
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_DELETEFROMPARAGRAPH, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (aPos + (aLength - 1) > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_DELETEFROMPARAGRAPH, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + (aLength - 1) <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	if (aLength <= 0)
 		return;
 	// Returns the paragraph offset for the specified character position aPos.
 	// aPos is in turn modified to hold the character position of the first character
 	// of this paragraph.  If aPos is already on a paragraph boundary then do nothing.
 	//
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_PARAGRAPHNUMBERFORPOS, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	if (IndexPresent())
 		return iIndex->ParagraphNumberForPos(aPos);
 	else
 	reinterpret_cast<CRichTextIndex*>(aCRichTextIndex)->CancelInsertCharFormat();
 	}
 void CRichText::SetExtendedInsertCharFormatL(const TCharFormatX& aFormat, const TCharFormatXMask& aMask, TInt aPos)
 	{
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_SETEXTENDEDINSERTCHARFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	CreateAndGenerateMarkupComponentL();
 	CRichTextIndex* index = iIndex.AsPtr();
 	if (index->InsertCharFormatIsActive())
 		{
 	// If aPos is on a phrase boundary, and the whole phrase or more is deleted then
 	// remember temporarily the phrase format.  This is applied to any content that is
 	// immediately inserted.
 	//
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_DELSETINSERTCHARFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_DELSETINSERTCHARFORMATL, "EDebugDeleteZeroLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0, Panic(EDebugDeleteZeroLength));
+	if (aPos + (aLength - 1) > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_DELSETINSERTCHARFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + (aLength - 1) <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	TBool parasMerged = EFalse;
 	if (!IndexPresent())
 		CPlainText::DeleteL(aPos, aLength);
 	{
 	// Applies the specified format attributes to the paragraphs covering
 	// character position aPos to aPos+aLength-1.
 	//
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_APPLYPARAFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_APPLYPARAFORMATL, "EApplyParaFormatNegativeLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0,Panic(EApplyParaFormatNegativeLength));
+	if (aPos + (aLength - 1) > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_APPLYPARAFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + (aLength - 1) <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	CreateAndGenerateMarkupComponentL();
 	iIndex->ApplyParaFormatL(aFormat, aMask, aPos, aLength);
 	SetHasChanged(ETrue);
 	//
 	__ETEXT_WATCH(APPLY_CHAR_FORMAT);
 	__TEST_INVARIANT;
 	TInt document_length = DocumentLength();
+	if (aPos < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_APPLYCHARFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0,Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_APPLYCHARFORMATL, "EApplyCharFormatNegativeLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0,Panic(EApplyCharFormatNegativeLength));
+	if (aPos + aLength - 1 > document_length)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_APPLYCHARFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + aLength - 1 <= document_length,Panic(ECharPosBeyondDocument));
 	//If some characters are highlighted AND current position + highlighted txt = document length
 	// Fix for INC097216. Compensate for the changes introduced to Form in defect fix INC087637,
 	// which now considers the height of the EOD character; meaning that this character now
 // This method is used internally only. It does not format the EOD character.
 void CRichText::ApplyExtendedCharFormatL(const TCharFormatX& aFormat,const TCharFormatXMask& aMask,TInt aPos,TInt aLength)
 	{
 	TInt document_length = DocumentLength();
+	if (aPos < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_APPLYEXTENDEDCHARFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0,Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_APPLYEXTENDEDCHARFORMATL, "EApplyCharFormatNegativeLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0,Panic(EApplyCharFormatNegativeLength));
+	if (aPos + aLength - 1 > document_length)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_APPLYEXTENDEDCHARFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + aLength - 1 <= document_length,Panic(ECharPosBeyondDocument));
 	DoApplyExtendedCharFormatL(aFormat, aMask, aPos, aLength);
 	}
 	{
 	// Applies the specified paragraph style to the paragraphs covering
 	// character positions aPos to aPos+aLength-1.
 	//
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_APPLYPARAGRAPHSTYLEL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_APPLYPARAGRAPHSTYLEL, "EApplyParaStyleNegativeLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0, Panic(EApplyParaStyleNegativeLength));
+	if (aPos + (aLength - 1) > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_APPLYPARAGRAPHSTYLEL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + (aLength - 1) <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (!StyleListPresent())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP3_CRICHTEXT_APPLYPARAGRAPHSTYLEL, "ERichTextNotSetForUsingStyles" );
+	    }
 	__ASSERT_ALWAYS(StyleListPresent(), Panic(ERichTextNotSetForUsingStyles));
 	CreateAndGenerateMarkupComponentL();
 	iIndex->ApplyParagraphStyleL(aStyle, aPos, aLength, iGlobalCharFormatLayer, aMode);
 	SetHasChanged(ETrue);
 @param aFrom The paragraph style to remove. */
 	{
 	// Update the rich text index following the change of an applied paragraph style.
 	//
 	__TEST_INVARIANT;
+	if (!StyleListPresent())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_NOTIFYSTYLECHANGEDL, "ERichTextNotSetForUsingStyles" );
+	    }
 	__ASSERT_ALWAYS(StyleListPresent(), Panic(ERichTextNotSetForUsingStyles));
 	CreateAndGenerateMarkupComponentL();
 	iIndex->NotifyStyleChangedL(aTo, aFrom, *iGlobalParaFormatLayer, *iGlobalCharFormatLayer);
 	SetHasChanged(ETrue);
 @return Pointer to the paragraph style which applies to the paragraph containing
 document position aPos. Its type (returned by CParaFormatLayer::Type())
 indicates whether this object is a style, or just a paragraph format layer. */
 	{
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_PARAGRAPHSTYLE, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_PARAGRAPHSTYLE, "EParagraphStyleNegativeLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0,Panic(EParagraphStyleNegativeLength));
+	if (aPos + (aLength - 1) > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_PARAGRAPHSTYLE, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + (aLength - 1) <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	if (IndexPresent())
 		return iIndex->ParagraphStyle(aStyleChangesOverRange, aPos, aLength);
 	else
 	//
 	__ETEXT_WATCH(REMOVE_PARA_FORMAT);
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_REMOVESPECIFICPARAFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_REMOVESPECIFICPARAFORMATL, "ERemoveSpecificParaFormatNegativeLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0, Panic(ERemoveSpecificParaFormatNegativeLength));
+	if (aPos + (aLength - 1) > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_REMOVESPECIFICPARAFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + (aLength - 1) <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	if (IndexPresent())
 		{
 		iIndex->RemoveSpecificParaFormatL(aPos, aLength);
 function has no effect. */
 	{
 	__TEST_INVARIANT;
 	TInt document_length = DocumentLength();
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_REMOVESPECIFICCHARFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_REMOVESPECIFICCHARFORMATL, "ERemoveSpecificParaFormatNegativeLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0, Panic(ERemoveSpecificParaFormatNegativeLength));
+	if (aPos + (aLength - 1) > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_REMOVESPECIFICCHARFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + (aLength - 1) <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	// in correspondance to INC097216, character format removing considers the height of end of document
 // character
 if (aPos + aLength == document_length)
 void CRichText::GetTextAndExtendedFormat(TPtrC& aText,TCharFormatX& aFormat,TInt aPos) const
 	{
 	__TEST_INVARIANT;
 	TInt documentLength = DocumentLength();
+	if (aPos < 0 || aPos > documentLength)
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_GETTEXTANDEXTENDEDFORMAT, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= documentLength, Panic(ECharPosBeyondDocument));
 	if (!IndexPresent())
 		{
 		aText.Set(Read(aPos));
 		iGlobalCharFormatLayer->SenseEffective(aFormat);
 @param aPos Document position of the picture. Must be a valid position.
 @return KErrNotFound if there is no picture at the specified document position,
 KErrNone if there is. */
 	{
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_GETPICTURESIZEINTWIPS, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	if (IndexPresent())
 		return iIndex->GetPictureSizeInTwips(aSize, aPos);
 	else
 and the second argument is MLayDoc::EForceLoadFalse. */
 	{
 	__ETEXT_WATCH(PICTURE_HANDLE);
 	__TEST_INVARIANT;
+	if (aPos<0 || aPos>DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_PICTUREHANDLEL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos>=0 && aPos<=DocumentLength(),Panic(ECharPosBeyondDocument));
 	if (IndexPresent())
 		return iIndex->PictureHandleL(aPos, aForceLoad);
 	else
 @param aPos Any document position within the paragraph of interest. */
 	{
 	__ETEXT_WATCH(GET_PARAGRAPH_FORMAT)
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_GETPARAGRAPHFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	if (!IndexPresent())
 		CGlobalText::GetParagraphFormatL(aFormat, aPos);
 	else
 //
 	{
 	__ETEXT_WATCH(GET_PARAGRAPH_FORMAT)
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_GETSPECIFICPARAGRAPHFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	aFormat->Reset();
 	aMask.ClearAll();
 	if (IndexPresent())
 	// aFormat takes the values of all attributes, and the mask aMask indicates those values that change
 	// over the selected region, and are therefore *indeterminate*.
 	// Application: seeding paragraph formatting dialogs.
 	//
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_GETPARAFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_GETPARAFORMATL, "EGetParaFormatNegativeLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0, Panic(EGetParaFormatNegativeLength));
+	if (aPos + aLength > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_GETPARAFORMATL, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + aLength <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	if (IndexPresent())
 		iIndex->GetParaFormatL(aFormat, aVaries, aPos, aLength, aMode);
 	else
 void CRichText::GetExtendedCharFormat(TCharFormatX& aFormat, TCharFormatXMask& aVaries, TInt aPos, TInt aLength) const
 	{
 	__TEST_INVARIANT;
 	int document_length = DocumentLength();
+	if (aPos < 0 || aPos > document_length)
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_GETEXTENDEDCHARFORMAT, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= document_length, Panic(ECharPosBeyondDocument));
+	if (aLength < 0)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP1_CRICHTEXT_GETEXTENDEDCHARFORMAT, "EGetCharFormatNegativeLength" );
+	    }
 	__ASSERT_ALWAYS(aLength >= 0, Panic(EGetCharFormatNegativeLength));
+	if (aPos + aLength - 1 > document_length)
+	    {
+	    OstTrace0( TRACE_FATAL, DUP2_CRICHTEXT_GETEXTENDEDCHARFORMAT, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos + aLength - 1 <= document_length, Panic(ECharPosBeyondDocument));
 	if (IndexPresent())
 		iIndex->GetCharFormat(aFormat, aVaries, aPos, aLength);
 	else
 	{
 	__ETEXT_WATCH(GET_SPECIFIC_CHARS);
 	__TEST_INVARIANT;
+	if (aPos < 0 || aPos > DocumentLength())
+	    {
+	    OstTrace0( TRACE_FATAL, CRICHTEXT_GETSPECIFICCHARFORMATLEFTRIGHT, "ECharPosBeyondDocument" );
+	    }
 	__ASSERT_ALWAYS(aPos >= 0 && aPos <= DocumentLength(), Panic(ECharPosBeyondDocument));
 	if (IndexPresent())
 		{
 		TCharFormatX format;
 		consumed += viewLength;
 		}
 	if (IndexPresent())
 		{
+		if (!aSource.IndexPresent())
+		    {
+		    OstTrace0( TRACE_DUMP, DUP1_CRICHTEXT_DOAPPENDTAKINGSOLEPICTUREOWNERSHIPL, "Invariant" );
+		    }
 		__ASSERT_DEBUG(aSource.IndexPresent(), User::Invariant());       // PrepareAppend should have sorted this
 		TGlobalLayerInfoAppend info(GlobalParaFormatLayer(), GlobalCharFormatLayer(), aSource.GlobalParaFormatLayer(), aSource.GlobalCharFormatLayer());
 		iIndex->AppendTakingSolePictureOwnershipL(aSource.iIndex, info);
 		}

changeset 44	601ab138ba0b
parent 37	6be019398652
child 49	4d76f1414957