summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2019-08-07 18:49:24 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2019-08-07 22:33:14 +0200
commitfa774e16b1dfe4844ec5eb3f9372d6468f6b8a56 (patch)
treea4a98028c463eee91e408f43ccb286f90eb95a32 /xmloff
parentbf8c682f3e956d22bb731808f16a82e44463239f (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>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/txtexppr.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 0397d1a832da..f246d78cd6f6 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -1130,9 +1130,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 )
@@ -1141,8 +1140,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;
}