pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 922532 from LibreOffice:7.2

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/922532
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=980
This commit is contained in:
Danilo Spinella 2021-10-01 12:09:49 +00:00 committed by Git OBS Bridge
parent 2721e33845
commit e002a0cb2a
16 changed files with 380 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
bsc1189813.patch Normal file
View File

@ -0,0 +1,305 @@
From 1d5dc93089ee2e9b3b3761fd7b5558d55ac8a1fa Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Mon, 20 Sep 2021 11:26:53 +0200
Subject: [PATCH] tdf#144091 svx: fix unwanted blur of shadow from table cell
fill
Initial render support for shadows of table shapes were added in commit
a75bf43a8d6c5dec6dcc86908c142ceec541aa8c (tdf#129961 svx: add rendering
for table shadow as direct format, 2020-12-02).
That already noticed a trick with the shadow of table shapes: the shadow
is generate from the cell fill and the border, but not from the text.
An additional trick is that when blur is enabled for the table shape's
shadow, then only the border should be blurred, not the cell fill.
In the bug document's case, the effective cell background was gray, with
a semi-transparent red shadow. We used to render cc0000 with blur and
cccccc without blur, now we correctly render cca3a3, matching
PowerPoint.
(cherry picked from commit 37a52d30bbfcf1d073779b50139c4dafa507be4b)
Conflicts:
drawinglayer/source/primitive2d/shadowprimitive2d.cxx
drawinglayer/source/tools/primitive2dxmldump.cxx
include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx
Change-Id: I7326a5f6254cf19b2d05181084c78e734ff7a7b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122357
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Related: tdf#144091 svx: fix interaction of transp cell fill and transp shadow
This is a follow-up to commit 37a52d30bbfcf1d073779b50139c4dafa507be4b
(tdf#144091 svx: fix unwanted blur of shadow from table cell fill,
2021-09-20), where it turned out that the original bugdoc was just a
special case of almost full transparency (80%), that's why avoiding the
blur fixed the problem.
A more general approach instead is to multiply the alpha or the cell
fill of table shapes and the alpha of the shadow itself. The end result
is the same (80% transparency) for the first bugdoc, but this gives back
the blur on the second bugdoc.
(cherry picked from commit 00fa364a2403dc23a786d3f91fde06e10b3a4a9a)
Conflicts:
drawinglayer/source/primitive2d/shadowprimitive2d.cxx
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
Change-Id: I63560e3a73473c70157ecee8365ec7154217f269
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122565
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
---
.../processor2d/vclpixelprocessor2d.cxx | 2 +-
.../source/tools/primitive2dxmldump.cxx | 33 +++++-
.../primitive2d/baseprimitive2d.hxx | 11 ++
.../sdr/primitive2d/sdrdecompositiontools.cxx | 72 ++++++++++---
svx/source/table/viewcontactoftableobj.cxx | 16 ++-
vcl/source/bitmap/bitmapfilter.cxx | 5 +
9 files changed, 221 insertions(+), 21 deletions(-)
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 9bdbf95a015b..5e6c6a73cd60 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -1037,7 +1037,7 @@ void VclPixelProcessor2D::processGlowPrimitive2D(const primitive2d::GlowPrimitiv
const sal_uInt8 nAlpha = rCandidate.getGlowColor().GetAlpha();
impBufferDevice aBufferDevice(*mpOutputDevice, aRange);
- if (aBufferDevice.isVisible())
+ if (aBufferDevice.isVisible() && !aRange.isEmpty())
{
// remember last OutDev and set to content
OutputDevice* pLastOutputDevice = mpOutputDevice;
diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx
index 7c5e5771d9bc..1e99ac91ed54 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -569,11 +569,42 @@ void Primitive2dXmlDump::decomposeAndWrite(
break;
}
+ case PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D:
+ {
+ // ModifiedColorPrimitive2D.
+ rWriter.startElement("modifiedColor");
+ drawinglayer::primitive2d::Primitive2DContainer aPrimitiveContainer;
+ pBasePrimitive->get2DDecomposition(aPrimitiveContainer,
+ drawinglayer::geometry::ViewInformation2D());
+ decomposeAndWrite(aPrimitiveContainer, rWriter);
+ rWriter.endElement();
+ break;
+ }
+
default:
{
- rWriter.startElement("unhandled");
+ OString aName("unhandled");
+ switch (nId)
+ {
+ case PRIMITIVE2D_ID_RANGE_SVX | 14: // PRIMITIVE2D_ID_SDRCELLPRIMITIVE2D
+ {
+ aName = "sdrCell";
+ break;
+ }
+ }
+ rWriter.startElement(aName);
rWriter.attribute("id", OUStringToOString(sCurrentElementTag, RTL_TEXTENCODING_UTF8));
rWriter.attribute("idNumber", nId);
+
+ auto pBufferedDecomposition
+ = dynamic_cast<const BufferedDecompositionPrimitive2D*>(pBasePrimitive);
+ if (pBufferedDecomposition)
+ {
+ rWriter.attribute(
+ "transparenceForShadow",
+ OString::number(pBufferedDecomposition->getTransparenceForShadow()));
+ }
+
drawinglayer::primitive2d::Primitive2DContainer aPrimitiveContainer;
pBasePrimitive->get2DDecomposition(aPrimitiveContainer,
drawinglayer::geometry::ViewInformation2D());
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 7619e04e5279..f697886c1ac5 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -204,6 +204,10 @@ private:
/// a sequence used for buffering the last create2DDecomposition() result
Primitive2DContainer maBuffered2DDecomposition;
+ /// When a shadow wraps a list of primitives, this primitive wants to influence the transparency
+ /// of the shadow.
+ sal_uInt16 mnTransparenceForShadow = 0;
+
protected:
/** access methods to maBuffered2DDecomposition. The usage of this methods may allow
later thread-safe stuff to be added if needed. Only to be used by getDecomposition()
@@ -236,6 +240,13 @@ public:
virtual void
get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor,
const geometry::ViewInformation2D& rViewInformation) const override;
+
+ void setTransparenceForShadow(sal_uInt16 nTransparenceForShadow)
+ {
+ mnTransparenceForShadow = nTransparenceForShadow;
+ }
+
+ sal_uInt16 getTransparenceForShadow() const { return mnTransparenceForShadow; }
};
} // end of namespace drawinglayer::primitive2d
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index dcff748ea60f..1cd60e75d925 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -545,7 +545,6 @@ basegfx::B2DRange getTextAnchorRange(const attribute::SdrTextAttribute& rText,
{
if(!rContent.empty())
{
- Primitive2DContainer aRetval(2);
basegfx::B2DHomMatrix aShadowOffset;
{
@@ -576,25 +575,66 @@ basegfx::B2DRange getTextAnchorRange(const attribute::SdrTextAttribute& rText,
}
// create shadow primitive and add content
- aRetval[0] = Primitive2DReference(
- new ShadowPrimitive2D(
- aShadowOffset,
- rShadow.getColor(),
- rShadow.getBlur(),
- (pContentForShadow ? *pContentForShadow : rContent)));
-
- if(0.0 != rShadow.getTransparence())
+ const Primitive2DContainer& rContentForShadow
+ = pContentForShadow ? *pContentForShadow : rContent;
+ int nContentWithTransparence = std::count_if(
+ rContentForShadow.begin(), rContentForShadow.end(),
+ [](const Primitive2DReference& xChild) {
+ auto pChild = dynamic_cast<BufferedDecompositionPrimitive2D*>(xChild.get());
+ return pChild && pChild->getTransparenceForShadow() != 0;
+ });
+ if (nContentWithTransparence == 0)
{
- // create SimpleTransparencePrimitive2D
- const Primitive2DContainer aTempContent { aRetval[0] };
-
+ Primitive2DContainer aRetval(2);
aRetval[0] = Primitive2DReference(
- new UnifiedTransparencePrimitive2D(
- aTempContent,
- rShadow.getTransparence()));
+ new ShadowPrimitive2D(
+ aShadowOffset,
+ rShadow.getColor(),
+ rShadow.getBlur(),
+ (pContentForShadow ? *pContentForShadow : rContent)));
+
+ if(0.0 != rShadow.getTransparence())
+ {
+ // create SimpleTransparencePrimitive2D
+ const Primitive2DContainer aTempContent { aRetval[0] };
+
+ aRetval[0] = Primitive2DReference(
+ new UnifiedTransparencePrimitive2D(
+ aTempContent,
+ rShadow.getTransparence()));
+ }
+
+ aRetval[1] = Primitive2DReference(new GroupPrimitive2D(rContent));
+ return aRetval;
+ }
+
+ Primitive2DContainer aRetval;
+ for (const auto& xChild : rContentForShadow)
+ {
+ double fChildTransparence = 0.0;
+ auto pChild = dynamic_cast<BufferedDecompositionPrimitive2D*>(xChild.get());
+ if (pChild)
+ {
+ fChildTransparence = pChild->getTransparenceForShadow();
+ fChildTransparence /= 100;
+ }
+ aRetval.push_back(Primitive2DReference(
+ new ShadowPrimitive2D(aShadowOffset, rShadow.getColor(), rShadow.getBlur(),
+ { xChild })));
+ if (rShadow.getTransparence() != 0.0 || fChildTransparence != 0.0)
+ {
+ Primitive2DContainer aTempContent{ aRetval.back() };
+
+ double fChildAlpha = 1.0 - fChildTransparence;
+ double fShadowAlpha = 1.0 - rShadow.getTransparence();
+ double fTransparence = 1.0 - fChildAlpha * fShadowAlpha;
+ aRetval.back() = Primitive2DReference(new UnifiedTransparencePrimitive2D(
+ std::move(aTempContent), fTransparence));
+ }
}
- aRetval[1] = Primitive2DReference(new GroupPrimitive2D(rContent));
+ aRetval.push_back(
+ Primitive2DReference(new GroupPrimitive2D(rContent)));
return aRetval;
}
else
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 967bfe820738..41d60d7652f8 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -39,6 +39,7 @@
#include <svx/sdooitm.hxx>
#include <vcl/canvastools.hxx>
#include <o3tl/unit_conversion.hxx>
+#include <svx/xfltrit.hxx>
#include <cell.hxx>
#include "tablelayouter.hxx"
@@ -326,10 +327,19 @@ namespace sdr::contact
aAttribute
= drawinglayer::primitive2d::createNewSdrFillTextAttribute(
rCellItemSet, nullptr);
+ rtl::Reference pCellReference
+ = new drawinglayer::primitive2d::SdrCellPrimitive2D(
+ aCellMatrix, aAttribute);
+
+ sal_uInt16 nTransparence(
+ rCellItemSet.Get(XATTR_FILLTRANSPARENCE).GetValue());
+ if (nTransparence != 0)
+ {
+ pCellReference->setTransparenceForShadow(nTransparence);
+ }
+
const drawinglayer::primitive2d::Primitive2DReference
- xCellReference(
- new drawinglayer::primitive2d::SdrCellPrimitive2D(
- aCellMatrix, aAttribute));
+ xCellReference(pCellReference);
aRetvalForShadow.append(xCellReference);
}
}
diff --git a/vcl/source/bitmap/bitmapfilter.cxx b/vcl/source/bitmap/bitmapfilter.cxx
index f2020539e04d..9ede4e578b10 100644
--- a/vcl/source/bitmap/bitmapfilter.cxx
+++ b/vcl/source/bitmap/bitmapfilter.cxx
@@ -19,6 +19,11 @@ BitmapFilter::~BitmapFilter() {}
bool BitmapFilter::Filter(BitmapEx& rBmpEx, BitmapFilter const& rFilter)
{
+ if (rBmpEx.IsEmpty())
+ {
+ return true;
+ }
+
BitmapEx aTmpBmpEx(rFilter.execute(rBmpEx));
if (aTmpBmpEx.IsEmpty())
--
2.31.1

3
libreoffice-7.2.1.2.tar.xz
View File

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

16
libreoffice-7.2.1.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmE4/YcACgkQ9DSh76/u
rqOlhg/+IEiAvVg0qI7FgS0/wIkA4PtiD8Q3qLqlOMPSLh4b8Qpk34SGxF/4VRJt
4mpCd+eMkulIrsFKNuISfkG21Wek9gftQg1XrnY5uFeVcenMfeF+tcB6AQl0wWa2
E719HFG5KnFWnh+ogediM+fxSR0pnXQB7iId6sK8vlKnwH8x1K2nw9PaZwhkRAue
xkB8Ee2ELBzlJQNGVIa40X2NQddGPswRWnfGxX6rh/vd7UKkuOLJoNoJnutyxJwS
zrWxwbwxChyv77GeIadpmYsCKkZHus0sfHJA1shp39cSdLIgoOIrUF7swjqzpmh6
LNItCnjKTUhDuM/MyZLhJHx/Z6+0g41VodSWcrSQAm05kCOrUGaZj/myoXk+afV9
l2m9GHZohK2oXfT/WpD6we937Y5W3BHkF/YGJ6ydPVOtpkLmPETFCkMe1fstZtki
hdQvWB/KWF2x5BPE/6VXKzBABzpRHO3lqNhFPBnH2YEj0Ql9ea89D5o5+sD6BtdO
tVeo9LZjj8nlU2h0naRjHh4DZFmFn5KprWDzsSUtOx4woSXonaxbqNlXsrnuCuAm
4sCwTdKzIRSuqlGSF2ULUA3jjzbCA0DZ2i9yxWjaVuq/epf9Z/pvRwLtTIs5wdgO
VHNh6ub+ao6DEr8O3xDxc90vSlYwln8FI2ENReKpdOqUldPVr0g=
=FSSI
-----END PGP SIGNATURE-----

3
libreoffice-7.2.2.1.tar.xz Normal file
View File

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

16
libreoffice-7.2.2.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmFKNbcACgkQ9DSh76/u
rqOQehAAqWjdATWs9ESuHZ/QCYz+fgRM7/xP2doo4TbhWQfmJRjjK6Zru210NQ52
OrtWC1A7EpUZRJkfDJC9Nh2iDbcz8M9SvmM9408J1iUIj1mOvLQPp6hEvyObu772
hXGTyuqaQ/hE0tSqMijrdJTGZCx/0NP4c0wKrlu1RJ477p1DBbqCTqpFeeCVc4Oh
ZOWfyIuU6syYtCev9cg20rgmogv+bT2d2BZcERinTgC/UOL5uknbQzrPO7TcXdPO
gdc7amBGfTIXlNVpALXR/H2eqs8SaSS04Q4pqvPr5p9IR24lN0uOorbQ85RN4WQc
MuypX9FP0LmB1dKS4jICWxi9MBKN4km4Waf9lolEf7eXuioxkTn2bfWSixFwy9DQ
XkCjR4MPUL1K731rDlalYFBoRtRAV6u5pchh/q3t+rTp6qBy8LIrR4AFtz70X0vQ
FzJCFACoP0g2cXIppQ+xwn5Zpr2LcourECj+/6MdalCmCkZIMcjQA8Rb8oGI4NIM
nMaT59vzpZzv3NAB7r3crZX5a778x8SRFmMPb2judGC7mE4M9UuqAI+OkamIzr3X
4GGEIp655y1LZ38epFApb9TjPhN7JWb1Hzf2O8wv2EoteTsIhxmLikXzcq2wwS1c
5UQtDeu5wug+2WZ+O5zSy4lGuUHWChkiI/iu++7B90nfTCqsgzQ=
=6Hsx
-----END PGP SIGNATURE-----

3
libreoffice-help-7.2.1.2.tar.xz
View File

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

16
libreoffice-help-7.2.1.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmE4/YwACgkQ9DSh76/u
rqOmcxAAiPLaQWwX+v5wKd/EAXFcXGNR9COh/KF8IrDgrh/4a4FWPFHFn4Lo/GOM
z189fgYcYWCnZguzCGL0ISivKXgp/rzMHjqAax5kDQoCf8hcrJxy1v8PzidM77vP
fADF3gSE4K9JabwzWU1AssaCV8hp+LRko/1bS26esLyDq+2BQFq/IN7EMvoXGgnK
0YWi+m0fUkTo1yC/J79wwOQWsAplfsCf9gpEE/+yhKCOww3vGHblHXRrk9IkOxIP
H+NenjhHcW7wZVlptfL4EkDHh+B9NoLM/ILr/S0cenJ2gMlVGNwIikICg5A1fGMH
VXrQOG0dm21Qm6KUJ0S/yG2TgzVazjSmnhL6JzLTpgb/mNfribjba0QJTuJ8knfV
ofTCk5QqQ10WkPa7feE99c2OYbxz5EbM6Q7YRbrUEpFJRBjsAG1zR/LOHxdVM728
v/9prhfRgWk6D0TQl4CT3cT6TM+Ks9WcjI9M0jLoaacf1J+GDLLxsR7p5kdGMTIR
+aK4KvMoYaj0tNqBowIjUwXKTDWt2Letu/8/UKgnEN3WObmn1u84DU/UdLMj0AnC
L+OmCyN5wca6lQoWWUWOEMIP/cTUeeI5XZanEV4J2ENh+pR3yXO6rxKm9TG60zVh
SdnRjBeli/iI9DrIdJHPR5nT03oVotqvpE9xePmccAiSVCJXWC8=
=UYVg
-----END PGP SIGNATURE-----

3
libreoffice-help-7.2.2.1.tar.xz Normal file
View File

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

16
libreoffice-help-7.2.2.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmFKNb0ACgkQ9DSh76/u
rqMAHQ/9FEkjBI8oFikDftqszfTJz1A8/Yv71yuqP6ryhl2ptLd5eB/H1VdyMWg4
33M6JSUF05sWpjjbBOyiwAtkPIxvMuGJtd8b3d+ML9FjjekLbnbHqAxtpeT6wnfg
nCYqKZjpyBmGzod7He2Z3kH1We+VwrBK6fBbHAnwnjDqswxexXgfkCkLFujpU4ta
Sj/6b84z/pd4AeiXE+o4Q3ik4QfFTc4XtgO1iWUI3Ek8UZrM7GlUcYdN5lE/Tqs/
bUbh1lk+qri691MCo/R52VvbSrlVSTMRK8uGJ9NIEpvjZlTqLPW1Q15MiLYoKcVA
/gL3gN1UKKFv5i5BRvR6pE+STYQoi2p0qojKAmLSb8OZDp2y0Ftw1u1K4MxRJG5m
PHf4w5GXr97OSn5UN+3B6mp1libDQyjuk4AEHg+y8iRoBZklZujkHjyckhOxEb4u
DvCS49f0zvHuiNhJ5ariDAI0KgTcyrig6DtFUojXLYL1mtIC9u7WYJoyxEto7gx0
fDvdkaRsxUokmsuOotMUeOsLolE795Xxk5kl0ALMQJaDwTmm1vIpOgCklplW7iqu
cQLVZbgm6s8/ej0C61YLFqDv9UbIinHXvpKyjpixPu12wO/2D8G9W0CBNfcwC5GL
BUKUy5ZAQ0Mb6gZ94F3wmEYYJC1/Ev57f2M3Emv7FIk/QvxdAck=
=HVWR
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.2.1.2.tar.xz
View File

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

16
libreoffice-translations-7.2.1.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIyBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmE4/Y4ACgkQ9DSh76/u
rqN8gg/4+qeDxJrv4MH4xfBBOEpkpaEtRWqQFKkZiX7++YVJaMrXr7v6sK6vkUw0
LYZCS+cwroLDYUoun7PEQb9IUdLWrf1d8gQ1XESwpQCCUcnlsZ5+vttUFFDz1/DA
ADq2qqDHMH+PC+a6qinmuS6oTqKPKbb3YgDt89rCsY3/FA6xUiDSvmm3R7vlaWWO
GHg6vQCJMvEzGYPhHa1G2VvTOlfn/kDC4x6cL44sz/RzgKiLBlbxK8Ry7xVHYXq7
PgS50U+CVcCXzYpz4spjRl0nP/+mzGIE5RUg/oVhBghczN/TlwH1RhdXqfGr1bJ0
UEoRSm67g870IadS/dRq9/s39fXMp8qOBmi2QHjPucRf+o20th+5d37GnQ24huHO
Yeq09korOi9WikRUpJ3q6X5HhhZTfuxDKCdo63I1hTSIuRRCiO1/rQ7GgBuApO0j
FPMfO++sJXQUnr6wyEDwrSFyYQM4syPm5RmeapUjQAhYtIH/S+o/Yb/Udy+u+H0n
O7JywvGoSm8SIRI73tgum8edFdhXX97GQqu7++4AF6G8ziPOs2czS19WQEujE/qh
vTay0IctBzW+l6RJyhLEETFyHDIwl/MC4YYo5pzqE945Fz3r+990w6Ch+/Q3EuXd
P7HQQEWtl4Gb8HJKkZhwi4yCQudAMhqC389W4xCY7/Bq6yAbYg==
=zybS
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.2.2.1.tar.xz Normal file
View File

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

16
libreoffice-translations-7.2.2.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmFKNb4ACgkQ9DSh76/u
rqPxsg/+MXmtFaPzQYrHBT8wq7c65lkffMqW7R+bBEZg8WWjr23EIqpuoD/dIPuE
UGqC75vwvlYhJ3GvkWFF0PUzjdDIfVkIlRvMXyPjUNycD1T9L/Y87GEy8qSK6nH3
evksdP7NBV5oBnO9x4L0fTml4VqLeeAD9ObI1rlrwp1hCx6795pra0IUeQh29Ey1
aqDlrcidwG6NpSdowyzuaqU8GThUhE7Xvwa6pPdRSK06H7xWoQJfY4m3P354wDiv
tbEsnWH6OIdpoGQbTGOY7z0b/9wr0Iq12qrZHj5QRLGQbYKJ9/dvPcLfz8IsqpnK
vrf+Hg2v0dBsucZhpZgp2cOCm5yhTs7RuPKkC8zxYnnjwP8Ql4BKkEbq/ERFwhZM
MdvWT3mYUoGziV87aK2Mv0pvX38LD9/AO62rqc68hEJn+u+kqEUwYRL21tikUYGg
kvWsYVGXFSWrCbnSteKbfwOr8IH0WxXx5byM0N8ctRbighf5Ea8iodJsblnjei+p
vZbc+XtdRCMKtEk1sQrzXvis+6ardwGEqxeF3+4jitX3i3RqoQum1HC/qZxSLMM4
H6rF7l7T/cgPliO3ZuoqvD4pXNc4EpesoDdnSEer7O+gzdLCOON+uq4LaBEnNGxu
2n+UHHvL6gMYKgULYDa+tZW1gMpdcm3VVPxlgpGPm3rsYLUlPug=
=MQBh
-----END PGP SIGNATURE-----

12
libreoffice.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Sep 30 13:53:39 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Update to 7.2.2.1
- Refresh pld-skia-patches.patch
-------------------------------------------------------------------
Wed Sep 29 14:07:19 UTC 2021 - Andras Timar <andras.timar@collabora.com>
- Fix bsc#1189813: LO-L3: Shadow effect for tables in PPTX partly incorrect
* bsc1189813.patch
-------------------------------------------------------------------
Fri Sep 24 13:39:16 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>

5
libreoffice.spec
View File

@ -46,7 +46,7 @@
%endif
%bcond_with firebird
Name: libreoffice
Version: 7.2.1.2
Version: 7.2.2.1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -105,6 +105,8 @@ Patch3: mediawiki-no-broken-help.diff
# PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error
Patch6: gcc11-fix-error.patch
Patch7: pld-skia-patches.patch
# bsc#1189813 LO-L3: Shadow effect for tables in PPTX partly incorrect
Patch8: bsc1189813.patch
# Build with java 8
Patch101: 0001-Revert-java-9-changes.patch
# try to save space by using hardlinks
@ -984,6 +986,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch3
%patch6 -p1
%patch7 -p1
%patch8 -p1
%if 0%{?suse_version} < 1500
%patch101 -p1
%endif

4
pld-skia-patches.patch
View File

@ -1,9 +1,9 @@
--- libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk.orig 2021-08-10 19:27:48.000000000 +0200
+++ libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk 2021-08-12 18:09:22.813517161 +0200
@@ -39,6 +39,7 @@
fast-png-write.patch.1 \
skia_sk_cpu_sse_level_0_by_default.patch.1 \
fix-warnings.patch.1 \
disable-freetype-colrv1.1 \
windows-libraries-system32.patch.1 \
+ skia-freetype2.11.patch \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))