[ooo-build-commit] .: patches/dev300

[Katarina Machalkova]

 patches/dev300/apply                               |    1 +
 patches/dev300/ooxml-sw-fix-2010-import-crash.diff |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 4c719bc216a18f3f6154bbf966a94bf4efed1ab7
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Wed Jul 21 16:03:17 2010 +0200

    Fix for Writer crash on import of ooxml 2010 docx
    
    * patches/dev300/apply:
    * patches/dev300/ooxml-sw-fix-2010-import-crash.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c5b0868..90f6e4b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3044,6 +3044,7 @@ desktop-cmd-bulk-conversion.diff, flr-muthusuba
 ooxml-sc-docpropsimp.diff, muthusuba
 ooxml-sc-page-date-imp.diff, muthusuba
 ooxml-sc-brk.diff, muthusuba
+ooxml-sw-fix-2010-import-crash.diff, bubli
 
 # depends on pptx-autoplay-fix.diff
 ooxml-autoplay-fix.diff, tml
diff --git a/patches/dev300/ooxml-sw-fix-2010-import-crash.diff b/patches/dev300/ooxml-sw-fix-2010-import-crash.diff
new file mode 100644
index 0000000..b994614
--- /dev/null
+++ b/patches/dev300/ooxml-sw-fix-2010-import-crash.diff
@@ -0,0 +1,13 @@
+--- writerfilter/source/filter/ImportFilter.cxx.old	2010-06-18 10:31:57.000000000 +0200
++++ writerfilter/source/filter/ImportFilter.cxx	2010-07-13 17:03:08.000000000 +0200
+@@ -98,7 +98,9 @@
+ 
+     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