diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-10 18:58:50 +0200 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-10 18:58:50 +0200 |
commit | 91de39795e474157f12d25e505ecfa1e6cd1f65b (patch) | |
tree | 07ac3eed07f1d285d631fbbbb8c398c1e160ae06 | |
parent | 21ccce872d6e7ad7d02896775cab10cf349758fd (diff) | |
parent | 0368696a2000b074f742147bc46057d8b6e70a29 (diff) |
CWS-TOOLING: integrate CWS dtardon01
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 2 | ||||
-rw-r--r-- | writerperfect/source/wpdimp/WordPerfectImportFilter.cxx | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 51960959d185..d64e95b0a61a 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -152,12 +152,12 @@ OOXMLFastContextHandler::OOXMLFastContextHandler (OOXMLFastContextHandler * pContext) : cppu::WeakImplHelper1<com::sun::star::xml::sax::XFastContextHandler>(), mpParent(pContext), + mId(0), mnToken(OOXML_FAST_TOKENS_END), mpStream(NULL), mnTableDepth(0), mnInstanceNumber(mnInstanceCount), mnRefCount(0), - m_xContext(pContext->m_xContext), mbFallback(false) { if (pContext != NULL) diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx index a6cdba08616c..d4ee07e87c6d 100644 --- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx +++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx @@ -46,9 +46,6 @@ #ifndef _ATTRLIST_HPP_ #include <xmloff/attrlist.hxx> #endif -#ifndef _XMLKYWD_HPP -#include <xmloff/xmlkywd.hxx> -#endif #include <ucbhelper/content.hxx> #include "filter/FilterInternal.hxx" |