diff options
| author | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-13 18:17:10 +0200 |
|---|---|---|
| committer | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-13 19:57:41 +0200 |
| commit | eacca3e15710c7a6ca967956bb4f721388a83897 (patch) | |
| tree | 7ea77384a0e29967cd1faf1b9e5335d43b379484 /writerfilter/source | |
| parent | 8059087d790508177c9b327c9156dfb8eaaf9f3b (diff) | |
Merged ooxml-sw-fix-2010-import-crash.diff from ooo-build
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/filter/ImportFilter.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index 3feed4171017..6c4cdd82e6cc 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -104,7 +104,9 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes writerfilter::dmapper::SourceDocumentType eType = (m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_MS_Word_2007" ) ) || - m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_MS_Word_2007_Template" ) )) ? + m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_MS_Word_2007_Template" ) ) || + m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_OOXML" ) ) || + m_sFilterName.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "writer_OOXML_Text_Template" ) )) ? writerfilter::dmapper::DOCUMENT_OOXML : writerfilter::dmapper::DOCUMENT_DOC; writerfilter::Stream::Pointer_t pStream(new writerfilter::dmapper::DomainMapper(m_xContext, xInputStream, m_xDstDoc, eType)); //create the tokenizer and domain mapper |