User: rt Date: 2008-01-29 13:45:42+0000 Modified: dba/reportdesign/source/filter/xml/xmlFixedContent.hxx
Log: INTEGRATION: CWS reportdesign02 (1.2.44); FILE MERGED 2007/12/20 08:42:12 oj 1.2.44.1: #i83193# merge from reportdesign03 File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlFixedContent.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlFixedContent.hxx?r1=1.2&r2=1.3 Delta lines: +9 -7 ------------------- --- xmlFixedContent.hxx 2007-07-09 11:56:17+0000 1.2 +++ xmlFixedContent.hxx 2008-01-29 13:45:39+0000 1.3 @@ -49,9 +49,11 @@ class OXMLCell; class OXMLFixedContent : public OXMLReportElementBase { + ::rtl::OUString m_sPageText; // page count and page number ::rtl::OUString m_sLabel; OXMLCell& m_rCell; - bool m_bInP; + OXMLFixedContent* m_pInP; // if set than we are in text-p element + bool m_bFormattedField; protected: virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, @@ -65,7 +67,7 @@ const ::rtl::OUString& rLName ,OXMLCell& _rCell ,OXMLTable* _pContainer - ,bool _bInP = false); + ,OXMLFixedContent* _pInP = NULL); virtual ~OXMLFixedContent(); // This method is called for all characters that are contained in the --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
