Accepting request 895618 from LibreOffice:7.1

- Fix bsc#1185505 - LO-L3: Text highlight "bleeds" when saving as PPTX
  * bsc1185505.patch

OBS-URL: https://build.opensuse.org/request/show/895618
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=964

bsc1185505.patch

@@ -0,0 +1,37 @@
+From 097fcc9721d24f6a634b98a0033dbdf9a5a21122 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=BCl=C5=9Fah=20K=C3=B6se?= <gulsah.kose@collabora.com>
+Date: Wed, 19 May 2021 14:37:36 +0300
+Subject: [PATCH] tdf#96061 Unset the highlight property
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When we have highlight property on specific part of the text
+the following texts were highligthing. To prevent this we unset the
+highlight property when we have not highlight property anymore.
+
+Change-Id: I802cde1c784afe47201a9ba4f41827dd0c705035
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115800
+Tested-by: Jenkins
+Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
+Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
+---
+ .../drawingml/textcharacterproperties.cxx     |   2 +
+ sd/qa/unit/data/pptx/tdf96061.pptx            | Bin 0 -> 21022 bytes
+ sd/qa/unit/export-tests-ooxml2.cxx            |  35 ++++++++++++++++++
+ 3 files changed, 37 insertions(+)
+ create mode 100644 sd/qa/unit/data/pptx/tdf96061.pptx
+
+diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
+index 20965e33abb1..4eb5acaffb56 100644
+--- a/oox/source/drawingml/textcharacterproperties.cxx
++++ b/oox/source/drawingml/textcharacterproperties.cxx
+@@ -177,6 +177,8 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil
+
+     if( maHighlightColor.isUsed() )
+         rPropMap.setProperty( PROP_CharBackColor, maHighlightColor.getColor( rFilter.getGraphicHelper() ));
++    else
++        rPropMap.setProperty( PROP_CharBackColor, sal_Int32(-1));
+ }
+
+ static void pushToGrabBag( PropertySet& rPropSet, const std::vector<PropertyValue>& aVectorOfPropertyValues )

libreoffice.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 26 13:32:48 UTC 2021 - Andras Timar <andras.timar@collabora.com>
+
+- Fix bsc#1185505 - LO-L3: Text highlight "bleeds" when saving as PPTX
+  * bsc1185505.patch
+
 -------------------------------------------------------------------
 Wed May 19 10:26:14 UTC 2021 - Markéta Machová <mmachova@suse.com>
 

libreoffice.spec

@@ -105,6 +105,8 @@ Patch4:         use-comphelper.patch
 Patch5:         bsc1184961.patch
 # PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error
 Patch6:         gcc11-fix-error.patch
+# bsc#1185505 - LO-L3: Text highlight "bleeds" when saving as PPTX
+Patch7:         bsc1185505.patch
 # Build with java 8
 Patch101:       0001-Revert-java-9-changes.patch
 # try to save space by using hardlinks
@@ -978,6 +980,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %if 0%{?suse_version} < 1500
 %patch101 -p1
 %endif