diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-08-07 18:49:24 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-08-29 09:17:17 +0200 |
| commit | c4e7271a58ceb3178cad2c2f686985ea7362d085 (patch) | |
| tree | 8b56e23380ae0550c9143f59000fe5a344863c92 /xmloff | |
| parent | 44d56e25d6b68b0a8f37b9b8d4f0da68bbe285c2 (diff) | |
tdf#125628: FORMATTING: Part of text loose yellow highlight reopening document
Change-Id: Id42c33857537451c2dec17d24f65b10f9c16dfa2
Reviewed-on: https://gerrit.libreoffice.org/77135
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit fa774e16b1dfe4844ec5eb3f9372d6468f6b8a56)
Reviewed-on: https://gerrit.libreoffice.org/77183
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/77902
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtexppr.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 8e963dbe9e0a..3d2acaff4209 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -1129,9 +1129,8 @@ void XMLTextExportPropertySetMapper::ContextFilter( pClip11State->mnIndex = -1; // When both background attributes are available export the visible one - if( pCharHighlight && pCharBackground ) + if (pCharHighlight) { - assert(pCharBackgroundTransparency); // always together Color nColor = COL_TRANSPARENT; pCharHighlight->maValue >>= nColor; if( nColor == COL_TRANSPARENT ) @@ -1140,8 +1139,10 @@ void XMLTextExportPropertySetMapper::ContextFilter( // and we'd need another property CharHighlightTransparent for that pCharHighlight->mnIndex = -1; } - else + // When both background attributes are available export the visible one + else if(pCharBackground) { + assert(pCharBackgroundTransparency); // always together pCharBackground->mnIndex = -1; pCharBackgroundTransparency->mnIndex = -1; } |