diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-30 14:07:32 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-30 14:11:29 +0200 |
| commit | cdd636907675d538ca10d479afc538ce3800e729 (patch) | |
| tree | ddec6e84a150901bfa65fd86a2f3d52034e1393b /writerfilter/source/ooxml | |
| parent | d4b05a8ff887696d58b9157c4f8d91b58cb9f0dd (diff) | |
docx import: don't add all characters from the parser to paragraphs
When the content XML file in the docx archive is formatted with white
spaces and lien breaks, those are imported as characters in the
paragraph... which makes no sense.
The stream handler was rerouting all parsed characters to the dmapper,
making the characters action defined in model.xml useless. Removing the
overridden characters from OOXMLFastContextHandlerStream fixed the bug
Diffstat (limited to 'writerfilter/source/ooxml')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 7 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 11968546f..765385baf 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1220,13 +1220,6 @@ void OOXMLFastContextHandlerStream::handleHyperlink() getPropertySetAttrs()->resolve(aHyperlinkHandler); } -void OOXMLFastContextHandlerStream::lcl_characters -(const ::rtl::OUString & rChars) -throw (uno::RuntimeException, xml::sax::SAXException) -{ - text(rChars); -} - /* class OOXMLFastContextHandlerProperties */ diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 3d05a2b7c..357081b0f 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -310,8 +310,6 @@ public: protected: virtual void resolvePropertySetAttrs(); - virtual void lcl_characters(const ::rtl::OUString & aChars) - throw (uno::RuntimeException, xml::sax::SAXException); private: mutable OOXMLPropertySet::Pointer_t mpPropertySetAttrs; |