diff options
author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 11:45:48 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 11:45:48 +0000 |
commit | 8b5db2d1f9aff345a4dbef5a0de5ac67bb94bd27 (patch) | |
tree | 915001c002cb2d13a92f035b9d1eaf1e8796d1d0 /writerfilter | |
parent | d0b404ffe1b5040c680bc7f319e9e859bfa43c7f (diff) |
INTEGRATION: CWS xmlfilter06 (1.3.8); FILE MERGED
2008/06/05 16:15:08 hbrinkm 1.3.8.1: cleanups
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx index 2dd84312fd26..aee2be60ad47 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: OOXMLFastDocumentHandler.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -119,6 +119,22 @@ throw (uno::RuntimeException, xml::sax::SAXException) #endif } +OOXMLFastContextHandler::Pointer_t +OOXMLFastDocumentHandler::getContextHandler() const +{ + if (mpContextHandler == OOXMLFastContextHandler::Pointer_t()) + { + mpContextHandler.reset + (new OOXMLFastContextHandler(m_xContext)); + mpContextHandler->setStream(mpStream); + mpContextHandler->setDocument(mpDocument); + mpContextHandler->setXNoteId(msXNoteId); + mpContextHandler->setForwardEvents(true); + } + + return mpContextHandler; +} + uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLFastDocumentHandler::createFastChildContext (::sal_Int32 Element, @@ -131,17 +147,14 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL << endl; #endif - if (mpContextHandler.get() == NULL) - { - mpContextHandler.reset - (new OOXMLFastContextHandler(m_xContext)); - mpContextHandler->setStream(mpStream); - mpContextHandler->setDocument(mpDocument); - mpContextHandler->setXNoteId(msXNoteId); - mpContextHandler->setForwardEvents(true); - } + return getContextHandler()->createFromStart(Element, Attribs); +} + +OOXMLParserState::Pointer_t OOXMLFastDocumentHandler::getParserState() const +{ + OOXMLParserState::Pointer_t pParserState; - return mpContextHandler->createFromStart(Element, Attribs); + return getContextHandler()->getParserState(); } uno::Reference< xml::sax::XFastContextHandler > SAL_CALL |