From 821521f757569c96ded6004bb2cb0d003481b55b Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 7 Feb 2013 22:27:14 -0500 Subject: First cut on the re-work. Lots of things are still broken. Change-Id: Iec54d5f04cef1e17375d7414a71bec64431905d5 --- sc/source/filter/xml/xmlcelli.hxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sc/source/filter/xml/xmlcelli.hxx') diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 2f7b3e6816f1..cd0ce080f6d2 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -40,7 +40,8 @@ class ScXMLTableRowCellContext : public SvXMLImportContext boost::optional maStringValue; /// office:string-value attribute boost::optional maContentValidationName; - ::boost::optional< rtl::OUString > pOUTextContent; + std::vector maParagraphs; + boost::scoped_ptr< ScXMLAnnotationData > mxAnnotationData; ScMyImpDetectiveObjVec* pDetectiveObjVec; ScMyImpCellRangeSource* pCellRangeSource; @@ -106,7 +107,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - inline void SetString(const rtl::OUString& rOUTempText) { pOUTextContent.reset(rOUTempText); } + void PushParagraph(const OUString& rPara); void SetCursorOnTextImport(const rtl::OUString& rOUTempText); void SetAnnotation( const ScAddress& rPosition ); -- cgit