[Libreoffice-commits] core.git: xmloff/source

[Tamás Zolnai (via logerrit)]

 xmloff/source/text/txtexppr.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit fa774e16b1dfe4844ec5eb3f9372d6468f6b8a56
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Aug 7 18:49:24 2019 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Aug 7 22:33:14 2019 +0200

    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 at collabora.com>

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;
         }