Accepting request 971125 from home:dspinella:branches:LibreOffice:Factory

- Update to version 7.3.3.1:
  There is no changelog available
  * Fixes bsc#1196499
- Remove upstreamed patches:
  * bsc1195881.patch
  * bsc1196212.patch

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

bsc1195881.patch

@@ -1,87 +0,0 @@
-From e072e4149ffd4c07be1b6ded38e560f9cb635515 Mon Sep 17 00:00:00 2001
-From: Sarper Akdemir <sarper.akdemir@collabora.com>
-Date: Wed, 30 Mar 2022 17:02:30 +0300
-Subject: [PATCH] tdf#148273 docx import: fix section break format leak to
- bullets
-
-Fixes RES_PARATR_LIST_AUTOFMT leaking into the next section.
-
-Achieves this by resetting list related attributes on the cursor's
-text node in DomainMapper_Impl::RemoveLastParagraph() after the
-deletion of the paragraph.
-
-Change-Id: Ib4d09c5f190b8b8fd3bdc119ddd57d91f353de2f
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132324
-Tested-by: Jenkins
-Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
----
-diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
-index db77b87481c3..579e1752508a 100644
---- a/sw/inc/unoprnms.hxx
-+++ b/sw/inc/unoprnms.hxx
-@@ -502,6 +502,7 @@
- #define UNO_NAME_SEPARATOR_LINE_IS_ON "SeparatorLineIsOn"
- #define UNO_NAME_IS_SKIP_HIDDEN_TEXT "IsSkipHiddenText"
- #define UNO_NAME_IS_SKIP_PROTECTED_TEXT "IsSkipProtectedText"
-+#define UNO_NAME_RESET_PARAGRAPH_LIST_ATTRIBUTES "ResetParagraphListAttributes"
- #define UNO_NAME_DOCUMENT_INDEX_MARKS "DocumentIndexMarks"
- #define UNO_NAME_FOOTNOTE_IS_COLLECT_AT_TEXT_END "FootnoteIsCollectAtTextEnd"
- #define UNO_NAME_FOOTNOTE_IS_RESTART_NUMBERING "FootnoteIsRestartNumbering"
-diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
-index 72376372fe2f..067daf3d25f4 100644
---- a/sw/source/core/unocore/unoobj.cxx
-+++ b/sw/source/core/unocore/unoobj.cxx
-@@ -2118,6 +2118,15 @@ SwXTextCursor::setPropertyValue(
-         }
-         rUnoCursor.SetSkipOverProtectSections(bSet);
-     }
-+    else if (rPropertyName == UNO_NAME_RESET_PARAGRAPH_LIST_ATTRIBUTES)
-+    {
-+        SwTextNode* pTextNode= GetPaM()->GetNode().GetTextNode();
-+
-+        if(pTextNode)
-+        {
-+            pTextNode->ResetAttr(RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END);
-+        }
-+    }
-     else
-     {
-         SwUnoCursorHelper::SetPropertyValue(rUnoCursor,
-diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
-index f261538a0f19..22f2be927f8d 100644
---- a/writerfilter/source/dmapper/DomainMapper.cxx
-+++ b/writerfilter/source/dmapper/DomainMapper.cxx
-@@ -3789,10 +3789,10 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
-                 static_cast<ParagraphPropertyMap*>(xContext.get())->SetListId(-1);;
-                 xContext->Erase(PROP_NUMBERING_LEVEL);
-             }
--            m_pImpl->SetParaSectpr(false);
-             finishParagraph(bRemove, bNoNumbering);
-             if (bRemove)
-                 m_pImpl->RemoveLastParagraph();
-+            m_pImpl->SetParaSectpr(false);
-         }
-         else
-         {
-diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
-index f8700faee88c..e3d6f4c41952 100644
---- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
-+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
-@@ -717,6 +717,14 @@ void DomainMapper_Impl::RemoveLastParagraph( )
-                 // delete
-                 xCursor->setString(OUString());
-
-+                // While removing paragraphs that contain section properties, reset list
-+                // related attributes to prevent them leaking into the following section's lists
-+                if (GetParaSectpr())
-+                {
-+                    uno::Reference<beans::XPropertySet> XCursorProps(xCursor, uno::UNO_QUERY);
-+                    XCursorProps->setPropertyValue("ResetParagraphListAttributes", uno::Any());
-+                }
-+
-                 // call to xCursor->setString possibly did remove final bookmark
-                 // from previous paragraph. We need to restore it, if there was any.
-                 if (sLastBookmarkName.getLength())
---
-2.34.1
-

bsc1196212.patch

@@ -1,23 +0,0 @@
-diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
-index 622d35c..b57b06b 100644
---- a/sd/source/ui/docshell/docshel4.cxx
-+++ b/sd/source/ui/docshell/docshel4.cxx
-@@ -399,6 +399,18 @@
-         mpDoc->SetSummationOfParagraphs();
-     }
- 
-+    if (aFilterName == "Impress MS PowerPoint 2007 XML" ||
-+        aFilterName == "Impress MS PowerPoint 2007 XML AutoPlay" ||
-+        aFilterName == "Impress MS PowerPoint 2007 XML VBA" ||
-+        aFilterName == "Impress Office Open XML")
-+    {
-+        // We need to be able to set the default tab size for each text object.
-+        // This is possible at the moment only for the whole document. See
-+        // TextParagraphPropertiesContext constructor. So default tab width
-+        // of the LibreOffice is 1270 but MSO is 2540 on general settings.
-+        mpDoc->SetDefaultTabulator( 2540 );
-+    }
-+
-     const bool bRet = SfxObjectShell::ImportFrom(rMedium, xInsertPosition);
- 
-     SfxItemSet* pSet = rMedium.GetItemSet();

libreoffice-7.3.2.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be96b0c9c7af7e24564729281ca6cef4eadfb06c9b30131a6fc94fa3e43b46a8
-size 255657596

libreoffice-7.3.2.2.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmI7Jn0ACgkQ9DSh76/u
-rqNfUxAAhPQ5P5VP1nEZUxfuUe/qn3EFikPHcdC0//jSsF7NBmHYJv7boI52yk8A
-B9v3nNL+nJHDwxd+tP7uSPy5nGn1KiNvvYHSSnh2gC5/B5q77sYmRYju+HmB81pv
-o9eZ36TzGkdcI2/QY4XyfwoP9hdRGD627pemZQ5SDYPogwFjqsfulX9jJUPBhkQn
-smsiaIcoaoOhlJCYQudkVAl+r9rt3wvncrZwGnJ3bp1yK2XrG0hW55y1tIyyhkHQ
-5jvdCdTi3N+Caf8RwuhEgJ6zR9suKNgjb64gv39fYALeAGbcFfH8NiAqMmkeR0z/
-meQuCBwZI+IA3CQ+EoKbjEuCGpczM95v1CrLP4PAlqLdgoPaVoDJiXqMubdiEzk6
-9+Ktuu//FzwBBuv1HJjTonfmEzam+aC0KbliN4wLcKpQlnlFywfPhVE/nWKwoqgN
-bzklkQJSjB0XD6kIAKRD1I1pQ/EX/w3lRuiPJUx17Z9L/CAlt3Rvu63LGkooliVc
-XzlhSHXYirZothIuIQDr/gqsOost4VwCOFS4OuZDz2f8dZ/2SJ6V3QQw3Wgqev+b
-IUr21I7cpGiEbIrVsQPx4mGvNsCV8WY/ngI88Ujd/ndgyLXEiL2FOOzgaKKz+azg
-Ftl1LND0UC9m8RPc6SZHlo50r1pvLoWELICgKQjlZ7uAypOXudo=
-=dVS1
------END PGP SIGNATURE-----

libreoffice-7.3.3.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f56f6fa977b308749988be6b8048a9486e8ff84d661f67e4244b679bb8e2c8b9
+size 256040876

libreoffice-7.3.3.1.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmJV2EsACgkQ9DSh76/u
+rqOcaBAAyYRZQLbSMSLxZoNBNZEUcUdp0NsEwlmE2HhYMzYM/6MA2DXO0fYMVsVQ
+n2Q8OUF6b7yK4bQ4bA5UdWliCwuPFA+h8xJ4lInJPT3/4/bJiZ408b4IkcOvLwa4
+UqEMtuvCeq6eptsNUPUDxfq1BoSSjz0S8rj8IH0TbTBprmEVUiTcYVI+kxtwu9uh
+Qbosvh+/rtD8Ge+eA1zEDpzXXveVa0E9YHEO9sx/t1vGgmFWDBLwBqQ9SrJ+n1mT
+/TZzE3Mnq2v+3h43VvFWm4MLHJ8pJtxw26zy5+NoneGDUvQD+L9q4przCRHXq4ja
+3OLxgx1Cz+C7F8POdgyWDd7PDrMzF+ts4vs33Lu7ofXE6/DmLHH1Ez1O69hZXUXU
+azvZIz7DLpPJWM0CVN+zTHEJyv+1s6sFwZlai+P4JRN1N9Be5S9ybU1EAc+kzdtf
+wWmvtcY50YnLRg7W1AvsBvkwWtv9QW9k/h3gWzZyqx5XjqmJ4Wgi77fEFWMflVEC
+STdmDnQwuvRRJ2d8vEEqY8Ti7xgHN0cUi31f+Wna+sfvlI6Y4ZMzMdF5KYrJMxkJ
+TPaycH/dWoI8liImt5sqDIpTMK64St+hqeehhB3M2S6yvf+wGMJID9+Vt3Jrb3aG
+3XZBJ6HXt50Ju62+2/eqdsUcQ/FNYjXwOE0cBSy7KiFBg1y/1E0=
+=YUNP
+-----END PGP SIGNATURE-----

libreoffice-help-7.3.2.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:addb19304e3330f49614eb979541cf1bdf93b481dcce22fdee20fbb193066aec
-size 112209056

libreoffice-help-7.3.2.2.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmI7JoMACgkQ9DSh76/u
-rqMi7Q//dQuVLDFP0jKQiyXCK/hU1JAJ1ozosoCrPIjloArJJT3ucvfnMOndL9Sj
-Vudv6ucQzRZ3sFUfwK8fXkcyCs60dZmfARd824GnQh2FxOtbj9VEju1g+vREnUpk
-4ows/Rvij8XWI3R/CgoN+FwPTdW3OM/DM+R3SaE8lOFgyvxO5VYNXw/UctdS9MOV
-oMPKklmhv4pSngCiqwizhmD6uNlWgne1jC8Ow7/ym1WGzTucZkEhGHmuAqyhkqd+
-ZY6lBZrU0g3RSagmWoRT7J5/RyBmsshv+q35ndHSCiASjmVxi0l28DYmliICqA8Y
-gjawiv9SJKCJbxyC1C07Hyv5Gp9H2SYSkpq5C79OtmqXS7OORrSaxE5Kg17TzPxO
-sQPahi+lP7GnSGPafdYy5bdEOGDIpVDgJ7GIKnlnefRKZjUbO4fNZjuFwTDxNDpg
-kbIvX0mpCgbNja+e/hOMnvBOz6+3HJEPLT00zXWjmIwsyDnuj5r29X18LiXYWFTw
-IXe7xaoiYgp8a3bh4ovfPXd/KKI96E1kKo0eBQuhVJLAma6BKwVyL2hoCYTzmTC9
-4sSKlfpBVOLtDjH79Y66Nn2TXaENDYy8KASlrUuKlZvYqSWWm1qJm3Qbrwj7ccyx
-WIyKh3cDip0Kko4Nk4EvH242GavMWc5LYkByuvd4p+HrHvNW2CQ=
-=7Wl9
------END PGP SIGNATURE-----

libreoffice-help-7.3.3.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e597d4dde72046263cfd50fbd850bcb6c2ec2a1507e26309b06b1e973cc34e3
+size 112208648

libreoffice-help-7.3.3.1.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmJV2FEACgkQ9DSh76/u
+rqOjCBAApZSXLskl2pKWe79sWlHxelfSXW0TdjE1x/fSkHdVkyqJUf97k0tv3bhv
+6NW/ZT+QG2z09AnpU+3Cim80sbuP0rBIgffP+5J4LPjkl1vA5SA2sij1Wzip1BiK
+hm9S8F3704qINj0JSCY2RLkOxPZNfhkt5HROft0fxyKN++hEZpKApjFMTbcQiFQQ
+2vXGvYxg3rDHf/l36fuisCvkzahB+mlLvUKEVHTLF+tTbydWjyYfrpAuORbc08og
+PexINzFKS4EvxzYVgx+R9yeDbDQzhFZJ4HAVIzH0qFVLmxVJqpg6G/+QyAVqoOZ0
+7EdTkG1RJr+b1GpQNnXu00ohegwIfFxJfYFZCT9Ja1wYWr2iLe1YA6r4x61mtBqU
+Yw+LjDktGXtUNsyDpIEdhzoL226yegmBWhNyPPB9Lm/Oz+394zW8bmI16c/CAimq
+u9YHCWX5UMD3v0ZunfpP04Zxh+AluznJPBb8h5fFs1CQ2gK270kVwAahUi2g7Rd7
+Qz48n/rSvZcQjZBG7Wv9zjCF9/dkbru9Gdw8HFiy86xA6tLEi1il2P5muHhA44Om
+QdFwvNEQo0nhwbBL5aNOzaN1iMWutDPwAeN66Mu/KeMQWz0yH25P3DdoECizLHTR
+FbMX8ZmymoZitO6/bG8S64DSkArcNz23cl6NyVSHiNDvoGh10Ek=
+=KWNE
+-----END PGP SIGNATURE-----

libreoffice-translations-7.3.2.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2588507b425bc7047b6325fcde8a2fcc9a927cee5b76065f42ddb68bad0fd71
-size 196162372

libreoffice-translations-7.3.2.2.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmI7JoQACgkQ9DSh76/u
-rqPJ/A//Th8zGDAr3KfC7lVrUH1ROFyxzWoXeOR0JnvLYbq3/iPLfSSM4bAFvNeT
-xLuAESGyO4lOoDb2zHTpfIIgxlG8VFzaalVlAAqZuiKhVPgqwawLVtGwrM/jQOnD
-FOJ9xXzRvaAFTsTJ/000NSOw5LRCTqyEtCGGOc1T8+6lotpXon8VgVR+RiyJoXdh
-tL0h060rBzK5XvJi3JJDVmjqJjMdBVF6GTyEIV48ENfJbMHfdHDoVDy7CdbkWfQ4
-V339rwrDcBNr3SIlhKj7NQBPVjNbG5wO9PqeJ+LXopEvGuS2yZH3irIZjZuh9uUL
-jx2uXg+m0F4ZqUlyaprc0wAvNABYsjdLo38iwm3S35wY23Sf13Et4GfKckznAlap
-Z1eoips1ETS6dDyYEdICQ/T/IVdAhCQSzqidO4b8JpzrPzPk8zOaT/bw9Wrbe1Lq
-dayS2Abdl/xxHCfHpHYXVn/IJYNlvVZ/ldFS1zB17mZn19+CPCCYFjtaM0CwZnmi
-rKh7kDeyVSHNIr+WkZHU4p2Uxt6aSTkBraLidZ+5DDbFr+FD3ooO9wA3q7K9UP7x
-L+V5iVqQhymbjSHvkeFmfBOscwdtBVTM71jASAiEXyGmmD7zrqrMdXh+lxRpOYyA
-e/d3iyHR4DB814PxpXrQfG6D80KRIGdJe23lf3FRrXleUt+gyOQ=
-=aLpH
------END PGP SIGNATURE-----

libreoffice-translations-7.3.3.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36399cc3c89135eabb1b906232261ce5c515ba63945cf68a5751d1e81165ab60
+size 196250044

libreoffice-translations-7.3.3.1.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmJV2FIACgkQ9DSh76/u
+rqNrBw/9EVLCWjpl1z+1bnpct51yINB4ATLR4rYUX8JcCUC8veJNdr2Fb/X2VN8O
+xxFEq8Z6akHSy4YDTMu9VR3dj6bKmmk16xv8SWj2GIfUPmth/JpOd6OcYgGa8Bj3
+rKzMTaGjJWvVIx0GirdsJ2oV//PII3Hyqc1MLHXF4mKnH5/Nm9e7DEGDs5/qBaym
+kRdQIK7GJkxkacbyS8B+WdbqsAjMWoKPmfVuuu8r3JW1KLDzm5oP/6jSBlQlMnLc
+r3fxCYBNqivt3P4UtEWDgEa/3JY8vqXLJx1iVLHWSLnk7FJtf8ICcqZ+nZDW60dC
+2wKmEtnzlzvxJIzlBkM7IvdNkC8XHILfT76c0dWRdhkZRKes8M9Pa2X/PQxa5jgO
+V4WX70HBQN+OgBwJInJoKsAoCNGGsBetA9ftl6REU3d0lqKsUCUGn0b120+O7FUq
+cA6otjO9FBdQcrjxw+StLi6Yen7BkS4WuCOLXSe0jyzv3UIro/15ocCYEEmTX+YV
+OvH3WudFt9x3Z5U1XrzTyXbu0kOj58NgM/exO9xgQ9OmRYGBeU3HN713hA/wSF1/
+YdXPdRldMQptsqQuiLdUp8uZOm11ghd0GvK6vFilI00HYir7nfJjp2JzZ0Md4+rz
+kd3W2P8FSndAhoFRI5Qyc1qwWhplmTy9P5bkHTsIhQ1XX2hbPNM=
+=xL43
+-----END PGP SIGNATURE-----

libreoffice.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Apr 19 10:40:59 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Update to version 7.3.3.1:
+  There is no changelog available
+  * Fixes bsc#1196499
+- Remove upstreamed patches:
+  * bsc1195881.patch
+  * bsc1196212.patch
+
 -------------------------------------------------------------------
 Wed Apr 13 10:50:07 UTC 2022 - Andras Timar <andras.timar@collabora.com>
 

libreoffice.spec

@@ -47,7 +47,7 @@
 %endif
 %bcond_with firebird
 Name:           libreoffice
-Version:        7.3.2.2
+Version:        7.3.3.1
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        LGPL-3.0-or-later AND MPL-2.0+
@@ -105,10 +105,6 @@ Patch3:         mediawiki-no-broken-help.diff
 Patch6:         gcc11-fix-error.patch
 Patch9:         fix_math_desktop_file.patch
 Patch10:        fix_gtk_popover_on_3.20.patch
-# Bug 1196212 - LO-L3: Text with tabs appears quite different in Impress than in PowerPoint
-Patch11:        bsc1196212.patch
-# Bug 1195881 - LO-L3: Bullets appear larger and green (instead of black)
-Patch12:        bsc1195881.patch
 # Bug 1192616 - LO-L3: Extraneous/missing lines in table in Impress versus PowerPoint
 Patch13:        bsc1192616.patch
 # Build with java 8
@@ -130,8 +126,9 @@ BuildRequires:  commons-logging
 BuildRequires:  cups-devel
 # Use bundled curl on SLE-12-SP5
 %if 0%{suse_version} >= 1500
-Source2013:     %{external_url}/curl-7.79.1.tar.xz
 BuildRequires:  curl-devel >= 7.68.0
+%else
+Source2013:     %{external_url}/curl-7.79.1.tar.xz
 %endif
 # Needed for tests
 BuildRequires:  dejavu-fonts
@@ -1020,8 +1017,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch3
 %patch6 -p1
 %patch9 -p1
-%patch11 -p1
-%patch12 -p1
 %patch13 -p1
 %if 0%{?suse_version} < 1500
 %patch10 -p1