[Libreoffice-commits] .: writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |    7 -------
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |    2 --
 2 files changed, 9 deletions(-)

New commits:
commit cdd636907675d538ca10d479afc538ce3800e729
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Wed Mar 30 14:07:32 2011 +0200

    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

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 1196854..765385b 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 3d05a2b..357081b 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;