[openoffice.org/f14] Resolves: rhbz#728945 unable to export into XHTML/HTML
David Tardon
dtardon at fedoraproject.org
Mon Aug 8 15:38:50 UTC 2011
commit 6f2028e1410ee26ee17de69ea05653331ca9d75e
Author: David Tardon <dtardon at redhat.com>
Date: Mon Aug 8 17:32:37 2011 +0200
Resolves: rhbz#728945 unable to export into XHTML/HTML
0001-add-missing-xsl-when-start-tag.patch | 24 ++++++++++++++++++++++++
openoffice.org.spec | 5 ++++-
2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/0001-add-missing-xsl-when-start-tag.patch b/0001-add-missing-xsl-when-start-tag.patch
new file mode 100644
index 0000000..709996d
--- /dev/null
+++ b/0001-add-missing-xsl-when-start-tag.patch
@@ -0,0 +1,24 @@
+From bfa0bab28076f937f63327bbffae74c0dd0e2f29 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Wed, 24 Nov 2010 13:28:09 +0100
+Subject: [PATCH] add missing xsl:when start tag
+
+---
+ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+index 70cb8b7..3e030ba 100644
+--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
++++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+@@ -1827,6 +1827,7 @@
+ <xsl:if test="$listStyle/text:list-style/text:list-level-style-number">
+ <xsl:choose>
+ <xsl:when test="$isListHeader">0</xsl:when>
++ <xsl:when test="$isEmptyList">
+ <!-- An empty list item (no text:h/text:p as child), will not count as item and does not increment the count. -->
+ <xsl:variable name="tempItemNumber">
+ <xsl:choose>
+--
+1.7.6
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 6cc4d67..2f7d4e1 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -177,6 +177,7 @@ Patch93: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
Patch94: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch
Patch95: openoffice.org-3.3.0.rh697176.framework.crash.patch
Patch96: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
+Patch97: 0001-add-missing-xsl-when-start-tag.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1770,6 +1771,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
%patch94 -p1 -b .rhbz693265-fix-crash-from-unhandled-except.patch
%patch95 -p1 -b .rh697176.framework.crash.patch
%patch96 -p1 -b .rhbz667082-do-not-crash-importing-section-containin.patch
+%patch97 -p1 -b .add-missing-xsl-when-start-tag.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
touch scripting/util/provider/javascript/delzip
@@ -3965,12 +3967,13 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
%endif
%changelog
-* Wed Aug 02 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.7-UNBUILT
+* Mon Aug 08 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.7-UNBUILT
- Related: rhbz#702833 addEventListener without removeEventListener
- Resolves: rhbz#693265 fix crash from unhandled exception
- Resolves: rhbz#697176 framework crash in dock restoration
- Resolves: rhbz#667082 do not crash importing section containing just
an empty paragraph (dtardon)
+- Resolves: rhbz#728945 unable to export into XHTML/HTML (dtardon)
* Wed Jun 08 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.6
- Resolves: rhbz#695509 crash in RefreshDocumentLB
More information about the scm-commits
mailing list