summaryrefslogtreecommitdiff
path: root/writerfilter/source/ooxml/OOXMLFactory.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-10-04 18:09:56 +0200
committerMichael Stahl <mst@openoffice.org>2010-10-04 18:09:56 +0200
commitca5d8d7810fae5848f52aaa735720e3fd964ccaf (patch)
tree177c85dfc83d3c35ee8839d428a0e9cb66555d90 /writerfilter/source/ooxml/OOXMLFactory.cxx
parent75f9a6e8dbd15b06ce600049e26faf9c772de90e (diff)
parent5fdb27c983c8eeb1e09b6d508f763c26344dd300 (diff)
merge DEV300_m89
Diffstat (limited to 'writerfilter/source/ooxml/OOXMLFactory.cxx')
-rw-r--r--[-rwxr-xr-x]writerfilter/source/ooxml/OOXMLFactory.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index f0c82dbf9a1b..a277d5928af6 100755..100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -265,7 +265,13 @@ OOXMLFactory::createFastChildContext(OOXMLFastContextHandler * pHandler,
OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine);
- return createFastChildContextFromFactory(pHandler, pFactory, Element);
+ uno::Reference< xml::sax::XFastContextHandler> ret;
+
+ //Avoid handling unknown tokens and recursing to death
+ if ((Element & 0xffff) < OOXML_FAST_TOKENS_END)
+ ret = createFastChildContextFromFactory(pHandler, pFactory, Element);
+
+ return ret;
}
void OOXMLFactory::characters(OOXMLFastContextHandler * pHandler,