filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl | 13
++++++----
filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl | 3
++
sw/source/filter/ww8/ww8par2.cxx | 3
++
3 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 96ec38abd90a637f3dd0ba497bf84fb9ef060b06
Author: Svante Schubert <svante.schub...@gmail.com>
AuthorDate: Wed Jul 8 00:57:33 2020 +0200
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat Jul 11 12:08:55 2020 +0200
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.st...@cib.de>
(cherry picked from commit 646cf598633bacc3959fc126c9117f06f3d0f9e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98335
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98515
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
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 *** -->
commit 93df58aea6684b9e38b4dd6886c8e707b6458770
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jul 7 16:05:19 2020 +0100
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat Jul 11 12:08:41 2020 +0200
ofz#23961 pad back to original length
in case of multi-byte input encoding resulting in a shorter output string
than
input
Change-Id: Ieb4bb7b5f4551ca22e87c573233f083901f3d3c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98273
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98516
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 058662e47c12..c96f74b28559 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -615,6 +615,9 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFormat &rNum,
WW8_ANLV const &rAV,
return;
}
sText = OUString(reinterpret_cast<char const *>(pText), nLen,
eCharSet);
+ // ofz#23961 in case of multi-byte input encoding resulting in shorter
+ // output pad to full length with something semi-arbitrary
+ comphelper::string::padToLength(sText, nLen, cBulletChar);
}
else
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
