From f631376c7d500730763222ac383eb7c4a23b7b03 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 19 Feb 2008 12:12:37 +0000 Subject: INTEGRATION: CWS notes2 (1.35.56); FILE MERGED 2008/01/09 12:54:19 mba 1.35.56.3: TextImportHelper is not reentrant 2007/12/15 16:12:04 mod 1.35.56.2: RESYNC: (1.35-1.36); FILE MERGED 2007/11/29 11:07:28 mba 1.35.56.1: #i84074#: load and save annotations with rich text formatting --- xmloff/inc/txtfldi.hxx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'xmloff/inc') diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 25fba52aff35..7ceeb8092c6a 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -4,9 +4,9 @@ * * $RCSfile: txtfldi.hxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: ihi $ $Date: 2007-11-26 15:24:42 $ + * last change: $Author: rt $ $Date: 2008-02-19 13:12:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1378,11 +1378,20 @@ class XMLAnnotationImportContext : public XMLTextFieldImportContext const ::rtl::OUString sPropertyAuthor; const ::rtl::OUString sPropertyContent; const ::rtl::OUString sPropertyDate; + const ::rtl::OUString sPropertyTextRange; ::rtl::OUStringBuffer aAuthorBuffer; ::rtl::OUStringBuffer aTextBuffer; ::rtl::OUStringBuffer aDateBuffer; + com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > mxField; + com::sun::star::uno::Reference < com::sun::star::text::XTextCursor > mxCursor; + com::sun::star::uno::Reference < com::sun::star::text::XTextCursor > mxOldCursor; + + /// old list item and block (#91964#) + SvXMLImportContextRef mxOldListBlock; + SvXMLImportContextRef mxOldListItem; + public: TYPEINFO(); @@ -1408,6 +1417,7 @@ protected: const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + virtual void EndElement(); }; -- cgit