diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-06 16:33:10 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-06 21:27:30 +0200 |
| commit | fafc6f046f9e92d5776d31ea6abb188ec74aaa71 (patch) | |
| tree | 253d4950f2e7098eaf6e08d8c630de5a852ce0b7 /svtools | |
| parent | 510209df4bcf457cac819e75889d564d620f119d (diff) | |
sw HTML export: avoid writing <font> in XHTML mode
First, it should be <$prefix:font>, not <font>, but then XHTML prefers
CSS for font color.
Change-Id: I947c0b93a117c8e88e4aec91c3c7f843bd943c59
Reviewed-on: https://gerrit.libreoffice.org/57085
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/svhtml/htmlout.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 8ee63d19b757..fb0a5b941a17 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -580,9 +580,12 @@ SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nL } -SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor ) +SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor, bool bXHTML ) { - rStream.WriteCharPtr( "\"#" ); + rStream.WriteCharPtr( "\"" ); + if (bXHTML) + rStream.WriteCharPtr( "color: " ); + rStream.WriteCharPtr( "#" ); if( rColor == COL_AUTO ) { rStream.WriteCharPtr( "000000" ); |