diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/txtetext.inl --- a/epoc32/include/txtetext.inl Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/txtetext.inl Wed Mar 31 12:33:34 2010 +0100 @@ -1,17 +1,20 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). -// All rights reserved. -// This component and the accompanying materials are made available -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members -// which accompanies this distribution, and is available -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// +/* +* Copyright (c) 1997-2009 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". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + @@ -28,16 +31,6 @@ {return (iFieldSet.IsPtr() && iFieldSet.AsPtr()!=NULL);} - - -const MTextFieldFactory* CPlainText::FieldFactory()const -/** Gets a pointer to the field factory used by the text object. The field factory -may be set up using SetFieldFactory(), or may be specified in the NewL(). - -@return The field factory. NULL if no field factory has been set up. */ - {return (FieldSetPresent()) ? iFieldSet->FieldFactory() : NULL;} - - void CPlainText::ConsumeAdornmentL(RReadStream& aStream) { TStreamId id;