diff options
| author | Svante Schubert <svante.schubert@gmail.com> | 2020-07-08 00:57:33 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-07-11 12:08:55 +0200 |
| commit | 96ec38abd90a637f3dd0ba497bf84fb9ef060b06 (patch) | |
| tree | cd981a7accbec6d37008a22c2581824420523817 /filter | |
| parent | 93df58aea6684b9e38b4dd6886c8e707b6458770 (diff) | |
Fixing top border style by fixing three XSLT issues triggered by...
... new properties in ODF 1.3
* check for fo:border='none'
* missing @ in @fo:background-color
* without default case (xsl:otherwise), end delimiter for "page"
missing in CSS
Change-Id: Ie5d0c3e8a32de0403534c5a4fa33a5f20393ce69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98365
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 646cf598633bacc3959fc126c9117f06f3d0f9e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98335
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98515
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl | 13 | ||||
| -rw-r--r-- | filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl | 3 |
2 files changed, 12 insertions, 4 deletions
diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl index f9b5aff1b363..d1c8f189be85 100644 --- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl @@ -705,11 +705,16 @@ <xsl:choose> <xsl:when test=" $style/@style:family='paragraph' - and(( + and + ( + ( ( $style/*/@fo:border-top or $style/*/@fo:border-bottom - or $style/*/@fo:border + or ($style/*/@fo:border + and + not($style/*/@fo:border='none') + ) ) and ( @@ -727,10 +732,10 @@ and ( $style/*/@fo:background-color and - not($style/*/fo:background-color='transparent') + not($style/*/@fo:background-color='transparent') ) ) - )"> + )"> <xsl:element name="style" namespace=""> <xsl:copy-of select="$style/@style:family" /> <xsl:attribute name="style:name"><xsl:value-of select="concat($style/@style:name, '_borderStart')" /></xsl:attribute> diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl index dc07f7e2918b..ec5b680df150 100644 --- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl @@ -303,6 +303,9 @@ <xsl:when test=".='tb-lr'"> <xsl:text>vertical-lr; </xsl:text> </xsl:when> + <xsl:otherwise> + <xsl:text>horizontal-tb; direction:ltr;</xsl:text> + </xsl:otherwise> </xsl:choose> </xsl:template> <!-- *** Properties with a no 'fo:' or 'style:' prefix *** --> |