[openoffice.org/f14] Resolves: rhbz#624561 Skip unsupported <w:sdt> elements

[David Tardon]

commit 34732c7bba6db902974bd631f7088d48607c5e39
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 25 13:12:52 2011 +0200

    Resolves: rhbz#624561 Skip unsupported <w:sdt> elements

 ...fdo-32170-Skip-unsupported-w-sdt-elements.patch |   39 ++++++++++++++++++++
 openoffice.org.spec                                |    7 +++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/0001-DOCX-fdo-32170-Skip-unsupported-w-sdt-elements.patch b/0001-DOCX-fdo-32170-Skip-unsupported-w-sdt-elements.patch
new file mode 100644
index 0000000..4668bda
--- /dev/null
+++ b/0001-DOCX-fdo-32170-Skip-unsupported-w-sdt-elements.patch
@@ -0,0 +1,39 @@
+From 8ee87e7490c3e6ab80efa9b7ab7fbf97c7cd1029 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedricbosdo at openoffice.org>
+Date: Wed, 8 Dec 2010 15:51:41 +0100
+Subject: [PATCH] [DOCX] fdo#32170: Skip unsupported <w:sdt> elements
+
+This only makes the <w:sdt> elements skipped to get their content
+---
+ writerfilter/source/ooxml/model.xml |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
+index 7a77b42..33a22ec 100644
+--- a/writerfilter/source/ooxml/model.xml
++++ b/writerfilter/source/ooxml/model.xml
+@@ -22592,6 +22592,12 @@
+       <attribute name="uri" tokenid="ooxml:CT_SmartTagRun_uri"/>
+       <attribute name="element" tokenid="ooxml:CT_SmartTagRun_element"/>
+     </resource>
++    <resource name="CT_SdtBlock" resource="Properties">
++      <element name="sdtPr" tokenid="ooxml:CT_SdtPr"/>
++      <element name="sdtEndPr" tokenid="ooxml:CT_SdtEndPr"/>
++      <element name="sdtContent" tokenid="ooxml:CT_SdtContentBlock"/>
++    </resource>
++    <resource name="CT_SdtContentBlock" resource="Properties"/>
+     <resource name="EG_PContent" resource="Properties">
+       <element name="fldSimple" tokenid="ooxml:EG_PContent_fldSimple"/>
+       <element name="hyperlink" tokenid="ooxml:EG_PContent_hyperlink"/>
+@@ -23324,7 +23330,7 @@
+       <action name="start" action="footnoteCont"/>
+       <action name="start" action="endnoteSeparator"/>
+       <action name="start" action="endnoteCont"/>
+--->
++      -->
+       <action name="end" action="endCharacterGroup"/>
+       <action name="end" action="endParagraphGroup"/>
+       <action name="end" action="endSectionGroup"/>
+-- 
+1.7.7
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 96a763b..78225ae 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 20
-%define rh_rpm_release 8
+%define rh_rpm_release 9
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -181,6 +181,7 @@ Patch97: 0001-add-missing-xsl-when-start-tag.patch
 Patch98: 0001-Resolves-fdo-39159-don-t-restore-original-view-setti.patch
 Patch99: 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch
 Patch100: 2011-2713.patch
+Patch101: 0001-DOCX-fdo-32170-Skip-unsupported-w-sdt-elements.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1778,6 +1779,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch98 -p1 -b .fdo39159-don-t-restore-original-view-setti.patch
 %patch99 -p1 -b .rhbz738255-avoid-crash-on-NULL-pointer.patch
 %patch100 -p1 -b .2011-2713.patch
+%patch101 -p1 -b .rhbz624561-Skip-unsupported-w-sdt-elements.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3973,6 +3975,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Tue Oct 25 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.9
+- Resolves: rhbz#624561 Skip unsupported <w:sdt> elements (dtardon)
+
 * Thu Oct 06 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.8
 - CVE-2011-2713
 - Resolves: rhbz#738255 avoid crash sc inputhdl NULL