summaryrefslogtreecommitdiff
path: root/filter/source/docbook
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-03-09 09:04:47 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-03-09 09:04:47 +0000
commit289007e70de44535ccba009b4be5a0e057e3076f (patch)
treec4499ddac65fd2dcd8b9860ea81a6f9389da4470 /filter/source/docbook
parent210c14b61d3f55e51d4a702e4a3a494060b75e6d (diff)
INTEGRATION: CWS fwkmerge1 (1.5.40); FILE MERGED
2004/02/03 13:38:57 lo 1.5.40.1: #115238# merge in fixes from cws fwk01pp1
Diffstat (limited to 'filter/source/docbook')
-rw-r--r--filter/source/docbook/docbooktosoffheadings.xsl53
1 files changed, 17 insertions, 36 deletions
diff --git a/filter/source/docbook/docbooktosoffheadings.xsl b/filter/source/docbook/docbooktosoffheadings.xsl
index 54c1af5bee83..b4476c383765 100644
--- a/filter/source/docbook/docbooktosoffheadings.xsl
+++ b/filter/source/docbook/docbooktosoffheadings.xsl
@@ -502,15 +502,9 @@ xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.
<xsl:template match="para">
-<xsl:choose>
-<xsl:when test="ancestor::varlistentry">
- <xsl:element name="text:p">
- <xsl:attribute name="text:style-name">VarList Term</xsl:attribute>
- <xsl:apply-templates />
- </xsl:element>
-</xsl:when>
-<xsl:otherwise>
- <xsl:element name="text:p">
+
+<xsl:element name="text:p">
+
<xsl:choose>
<xsl:when test="ancestor-or-self::footnote">
<xsl:attribute name= "text:style-name"><xsl:text>Footnote</xsl:text></xsl:attribute>
@@ -538,11 +532,10 @@ xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.
<xsl:attribute name="text:style-name">Text body</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
- <xsl:apply-templates/>
+
+<xsl:apply-templates/>
</xsl:element>
-</xsl:otherwise>
-</xsl:choose>
</xsl:template>
<xsl:template match="section">
@@ -770,13 +763,12 @@ xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.
<!-- lists Section -->
-
-
<xsl:template match="itemizedlist">
<xsl:element name="text:unordered-list">
- <xsl:attribute name="text:style-name">Itemized List</xsl:attribute>
- <xsl:attribute name="text:continue-numbering">false</xsl:attribute>
- <xsl:apply-templates/>
+ <xsl:if test="not(ancestor::itemizedlist)">
+ <xsl:attribute name="text:style-name">L1</xsl:attribute>
+ </xsl:if>
+ <xsl:apply-templates/>
</xsl:element>
</xsl:template>
@@ -798,32 +790,21 @@ xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.
<xsl:template match="term">
<xsl:if test="parent::varlistentry">
- <text:list-item>
- <xsl:element name="text:p">
- <xsl:attribute name="text:style-name">VarList Term</xsl:attribute>
- <xsl:apply-templates />
- </xsl:element>
+ <text:list-item>
+ <xsl:element name="text:p">
+ <xsl:attribute name="text:style-name">VarList Term</xsl:attribute>
+ <xsl:apply-templates />
+ </xsl:element>
</text:list-item>
</xsl:if>
</xsl:template>
-
<xsl:template match="listitem">
- <xsl:choose>
- <xsl:when test="parent::varlistentry">
- <text:list-item>
- <xsl:apply-templates/>
- </text:list-item>
- </xsl:when>
- <xsl:otherwise>
- <text:list-item>
- <xsl:apply-templates/>
- </text:list-item>
- </xsl:otherwise>
- </xsl:choose>
+ <text:list-item>
+ <xsl:apply-templates/>
+ </text:list-item>
</xsl:template>
-
<!-- end of lists-->
<xsl:template match="menuchoice">