[ooo-build-commit] patches/dev300

[Cédric Bosdonnat]

 patches/dev300/apply              |    3 +++
 patches/dev300/docx-ugly-fix.diff |   17 +++++++++++++++++
 2 files changed, 20 insertions(+)

New commits:
commit dbc4202df629763c805d64f71579761ab1014b5f
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri Dec 4 09:59:44 2009 +0100

    Temporary fix for n#548701
    
    The crash doesn't happen anymore, but the sections import won't be as
    good as now (which wasn't really good in fact). This fix will have to be
    removed when a global section rework will be done.
    
    * patches/dev300/apply:
    * patches/dev300/docx-ugly-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2578ae8..2225f28 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2107,6 +2107,9 @@ docx-fixes01.diff, cbosdo
 docx-vml-import.diff, cbosdo
 writerfilter-docx-numbering.diff, n#536407, cbosdo
 
+# Ugly temporary fix
+docx-ugly-fix.diff, n#548701, cbosdo
+
 buildfix-oox-depends-on-unotools.diff
 
 oox-fix-placeholder-layout.diff, n#485316, n#480223, rodo
diff --git a/patches/dev300/docx-ugly-fix.diff b/patches/dev300/docx-ugly-fix.diff
new file mode 100644
index 0000000..248e0f5
--- /dev/null
+++ b/patches/dev300/docx-ugly-fix.diff
@@ -0,0 +1,17 @@
+diff --git writerfilter/source/dmapper/PropertyMap.cxx writerfilter/source/dmapper/PropertyMap.cxx
+index fda15ed..a0248b0 100644
+--- writerfilter/source/dmapper/PropertyMap.cxx
++++ writerfilter/source/dmapper/PropertyMap.cxx
+@@ -768,10 +768,12 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
+ //        ::rtl::OUString sSelection = m_xStartingRange->getString();
+ //        sSelection.getLength();
+         //-->debug
++#if 0
+         uno::Reference< beans::XPropertySet > xSection =
+                                     rDM_Impl.appendTextSectionAfter( m_xStartingRange );
+         if( m_nColumnCount > 0 && xSection.is())
+             ApplyColumnProperties( xSection );
++#endif
+     }
+     else
+     {