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

Accepting request 922557 from LibreOffice:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/922557
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=236
This commit is contained in:
Dominique Leuenberger 2021-10-11 13:30:31 +00:00 committed by Git OBS Bridge
commit 4889035e7b
32 changed files with 524 additions and 6843 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boost_1_71_0.tar.xz
View File

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

3
boost_1_75_0.tar.xz Normal file
View File

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

6228
bsc1182969.patch
View File

File diff suppressed because it is too large Load Diff

305
bsc1187173.patch
View File

@ -1,305 +0,0 @@
From 8dcf0e0ccdd17d1c1b650e43944cb1e706920edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@collabora.com>
Date: Thu, 22 Apr 2021 21:56:29 +0200
Subject: [PATCH] fix component handling for ucpdav1 when --with-webdav=serf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Both the webdav=neon and webdav=serf cases were actually using
the same ucpdav1.component file. And f3f0d05f72d8dbd9717910b4d6b4
changed component handling for neon, but not for serf.
So separate component handling for neon and for serf, and also
do the f3f0d05 change also for the serf case.
Change-Id: Id5907cf1c8fbb93817e81295f71ad87191fe5c16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114525
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit 237446b38631c2a40c227e96f7f8c30b9c3932b4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114502
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
---
postprocess/Rdb_services.mk | 5 ++-
ucb/Library_ucpdav1.mk | 7 +--
ucb/source/ucp/webdav/ucpdav1.component | 7 ++-
ucb/source/ucp/webdav/webdavprovider.cxx | 52 ++++++----------------
ucb/source/ucp/webdav/webdavprovider.hxx | 7 ---
ucb/source/ucp/webdav/webdavservices.cxx | 56 ------------------------
6 files changed, 25 insertions(+), 109 deletions(-)
delete mode 100644 ucb/source/ucp/webdav/webdavservices.cxx
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index ad5549d75aaf..5ecd216005eb 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -173,9 +173,12 @@ $(eval $(call gb_Rdb_add_components,services,\
extensions/source/ole/oleautobridge \
winaccessibility/source/service/winaccessibility \
) \
- $(if $(WITH_WEBDAV), \
+ $(if $(filter neon,$(WITH_WEBDAV)), \
ucb/source/ucp/webdav-neon/ucpdav1 \
) \
+ $(if $(filter serf,$(WITH_WEBDAV)), \
+ ucb/source/ucp/webdav/ucpdav1 \
+ ) \
$(call gb_Helper_optional,SCRIPTING, \
basctl/util/basctl \
sc/util/vbaobj \
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index b9e1d1037897..127d046eb72b 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -10,8 +10,6 @@
$(eval $(call gb_Library_Library,ucpdav1))
-$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav-neon/ucpdav1))
-
$(eval $(call gb_Library_use_sdk_api,ucpdav1))
$(eval $(call gb_Library_set_include,ucpdav1,\
@@ -31,6 +29,8 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\
ifeq ($(WITH_WEBDAV),neon)
+$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav-neon/ucpdav1))
+
$(eval $(call gb_Library_use_externals,ucpdav1,\
boost_headers \
libxml2 \
@@ -69,6 +69,8 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
else # WITH_WEBDAV == serf
+$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1))
+
$(eval $(call gb_Library_use_externals,ucpdav1,\
boost_headers \
apr \
@@ -110,7 +112,6 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
ucb/source/ucp/webdav/webdavprovider \
ucb/source/ucp/webdav/webdavresponseparser \
ucb/source/ucp/webdav/webdavresultset \
- ucb/source/ucp/webdav/webdavservices \
))
endif # WITH_WEBDAV
diff --git a/ucb/source/ucp/webdav/ucpdav1.component b/ucb/source/ucp/webdav/ucpdav1.component
index 50a3d87b28e0..bb16e3b3979d 100644
--- a/ucb/source/ucp/webdav/ucpdav1.component
+++ b/ucb/source/ucp/webdav/ucpdav1.component
@@ -17,11 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.WebDAVContentProvider">
+ <implementation name="com.sun.star.comp.WebDAVContentProvider"
+ constructor="ucb_webdav_ContentProvider_get_implementation">
<service name="com.sun.star.ucb.WebDAVContentProvider"/>
</implementation>
</component>
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 570b36e6180c..cc19bc7f0a61 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -82,56 +82,25 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
// XServiceInfo methods.
-OUString SAL_CALL ContentProvider::getImplementationName()
-{
- return getImplementationName_Static();
-}
-OUString ContentProvider::getImplementationName_Static()
+OUString
+ContentProvider::getImplementationName()
{
return "com.sun.star.comp.WebDAVContentProvider";
}
-sal_Bool SAL_CALL ContentProvider::supportsService( const OUString& ServiceName )
-{
- return cppu::supportsService( this, ServiceName );
-}
-
-css::uno::Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames()
-{
- return getSupportedServiceNames_Static();
-}
-
-/// @throws css::uno::Exception
-static css::uno::Reference< css::uno::XInterface >
-ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-{
- css::lang::XServiceInfo* pX =
- static_cast<css::lang::XServiceInfo*>(new ContentProvider( comphelper::getComponentContext(rSMgr) ));
- return css::uno::Reference< css::uno::XInterface >::query( pX );
-}
-
css::uno::Sequence< OUString >
-ContentProvider::getSupportedServiceNames_Static()
+ContentProvider::getSupportedServiceNames()
{
- css::uno::Sequence< OUString > aSNS { WEBDAV_CONTENT_PROVIDER_SERVICE_NAME };
- return aSNS;
+ return { WEBDAV_CONTENT_PROVIDER_SERVICE_NAME };
}
-// Service factory implementation.
-
-css::uno::Reference< css::lang::XSingleServiceFactory >
-ContentProvider::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr )
+sal_Bool
+ContentProvider::supportsService(const OUString& s)
{
- return cppu::createOneInstanceFactory(
- rxServiceMgr,
- ContentProvider::getImplementationName_Static(),
- ContentProvider_CreateInstance,
- ContentProvider::getSupportedServiceNames_Static() );
+ return cppu::supportsService(this, s);
}
-
-
// XContentProvider methods.
@@ -198,4 +167,11 @@ ContentProvider::queryContent(
return xContent;
}
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+ucb_webdav_ContentProvider_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+ return cppu::acquire(new ContentProvider(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index e399178a9df9..76540cd3d4d8 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -85,13 +85,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
- static css::uno::Reference< css::lang::XSingleServiceFactory >
- createServiceFactory( const css::uno::Reference<
- css::lang::XMultiServiceFactory >& rxServiceMgr );
-
// XContentProvider
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
deleted file mode 100644
index 419c9740d3e0..000000000000
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include "webdavprovider.hxx"
-
-using namespace com::sun::star;
-
-extern "C" SAL_DLLPUBLIC_EXPORT void * ucpdav1_component_getFactory(
- const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
-{
- void * pRet = nullptr;
-
- uno::Reference< lang::XMultiServiceFactory > xSMgr(
- static_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
- uno::Reference< lang::XSingleServiceFactory > xFactory;
-
-
- // WebDAV Content Provider.
-
-
- if ( ::http_dav_ucp::ContentProvider::getImplementationName_Static().
- equalsAscii( pImplName ) )
- {
- xFactory = ::http_dav_ucp::ContentProvider::createServiceFactory( xSMgr );
- }
-
-
- if ( xFactory.is() )
- {
- xFactory->acquire();
- pRet = xFactory.get();
- }
-
- return pRet;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
2.26.2
commit b345c5b489a8b270dfa767d2bb773232540a7fe6
Author: Luboš Luňák <l.lunak@collabora.com>
Date: Thu Apr 22 22:07:48 2021 +0200
handle properly missing URI components for webdav/serf
Username is not mandatory for http://, and files require only path.
Change-Id: Iab4e81692b288d17dd8a35954e34a1bbe7c943ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114526
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit 8313e7fe55d4ad147df0b5b1f9f94c6882197132)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114503
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx
index dab11a64cfa9..ac87848c0878 100644
--- a/ucb/source/ucp/webdav/SerfUri.cxx
+++ b/ucb/source/ucp/webdav/SerfUri.cxx
@@ -90,9 +90,9 @@ SerfUri::SerfUri( const OUString & inUri )
void SerfUri::init( const apr_uri_t * pUri )
{
- mScheme = OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 );
- mUserInfo = OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 );
- mHostName = OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 );
+ mScheme = pUri->scheme ? OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 ) : "";
+ mUserInfo = pUri->user ? OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 ) : "";
+ mHostName = pUri->hostname ? OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 ) : "";
mPort = pUri->port;
mPath = OStringToOUString( pUri->path, RTL_TEXTENCODING_UTF8 );

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
libcmis-0.5.2.tar.xz Normal file
View File

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

3
libreoffice-7.1.5.2.tar.xz
View File

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDx/XsACgkQ9DSh76/u
rqNmoA//dMLWq+KgYcBsG24UfAsoHC3yqA1TYT0sbEMpgtFe7uavMJtphv9waPfA
9GmKZbHdDXD5BWQ6Bv8BlsCukpWEytw1NsDEhEZFURqp8fdO84Gcp7CFn3uI0ovO
yEznp3zAR60ut3tuCZyOB11h+BSldA/W73Z5xRR2ORfUDj4GuHi2+4/IKr5JtF+6
YAj4AaHqgxp3MwxE5t/UdfVZLXP6SUvxLU7eoLhcnMLOd5oJAwfhABd5d85yzWZr
ZubXD239mYaMKJD1DGERlpqqfRSaMQOzJogIJVCiXr2fmFIsu0IKJVntb99pL/X4
DleQsYMiFHS8XHDZpTduhI4GxAwy2YZ/HBm/iUxvbqICuII2UbVVzQJNNqogN4eD
pLybFxwdQwpuZn6M6GttmiOR6z6+USX4hzpMXPjNyDmGxlcw56uiF6Q4dmPG5/I7
yyobJZWlpJ1WNJ9Qifv25Z8qkTdvfpSBCJxLxeN0SHkAHzYtbcCB9Uq/den0YY5v
QgaRRU5CPP0cC8X+zGkdgKI7wngj2NrvSpmG/lat1Rwqh8KlkPTc/yYXlIKoYnoU
Hc0EmHxvUxTiE0iKg2WboNG/bGufp0hBisbME10VPLmp5QVwkm4uxfGAjY3kiXol
E8G2jebIP6FCcYpC9rdNnQFGTAlRAf4dUoC2CwMLqlRdOy+7+A0=
=20Eu
-----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.1.5.2.tar.xz
View File

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDx/YQACgkQ9DSh76/u
rqPJ6g/9GLHnDRA48oPHKaXpZCZ0J7pzNlRFMrSuEpAyyRlkYX5/XRrWQKRUbalJ
qFCybU2nTiNRb8N3xiWb7y24+aNpPUZkx7rnU7Vm69TNe19WR9xKxkBhdWBkQLrD
tEv/mR0xOBHLdc+Q7cNCVzrQ3UWZIRChfmeNAgIl+DzVX1qMi60v8oANfuGJJxAa
l6Yj8lYm+04qfX8dPk4XZM9kTgJQMlLZMSbbPFwuoaJjuIsBi3Wu33Ppxvf37LpS
H6418wROajZ74Owa0htB2aAjQwIZjS/90noqY2SxGPBNf9gMNRmRTCX/mudAFUgZ
smkqRjoBZm+ZCDq2Oz8k4oEHsj1TUtIs5QhZI8VqToIA/y53SBn3bq42yME+0P/V
2V4pe6Qy0hv9u/YXsBAbLbXXVbr0LOaBe3BNK0dbdGBu1NWt8WLP1FBYpcKNl2Xw
0Ee/mS6JHoT1EGmKKaghml29zvqoQhqx1fUHN/l6zuxwvaTr18Ob8KRHsksXUde8
4ULdO/O7QLTcNnI8CaPD3giIcihBEWvoMHtWUWHG1b39EUEfUs+djzyzK7jQZ3Ux
btUMDUUDth2sY8HVVdg3p4HUbehiRooEDRJCg/XxLsasA3d6siwPy2/vEciadmEi
iMTTyFxv5mQd1Bcg+lCPJRQ8ohL0GUeaFeMpSp3BF8uI3zq9NdM=
=Ej8U
-----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-----

2
libreoffice-rpmlintrc
View File

@ -1,2 +1,2 @@
# libreoffice devel package is de facto called libreoffice-sdk
addFilter("devel-file-in-non-devel-package")
#addFilter("devel-file-in-non-devel-package")

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

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDx/YUACgkQ9DSh76/u
rqN76g//Z2aFAo46O/8ODbH4tIF6Cvc9JgI3Sy6DP6nlDHontrAfeENUpe2y3eRv
xJe2Ksu9P7HqGSndCDWdjZkD8ClBKG/CT9kj3+mn2ehzopZU+pBFhvhqanR48LXZ
S8wbntPHhUvi+xN0qapMx4dGAXNNCZfSMyrAkC8g1e8Bbc3PViwSjwZaBl2dPMm3
mZpnobviWS34LYcCgvRdnoJxvNLwem2eOV7WNkKJvmhEZ9NrzYIxorIrTxQBm0Ri
/qli+4p1KTyTn8cRnCsaspmi124y62f1z4ml9Sji0hQwFVRI0pCWce7OeqR1VgH6
LjJVhq8yea5UFVvXq1h/5txlW6+49tX/ot9vOrFfp+Z1zgf52YA0Bdz6lsxiCw1S
kzb36UWFJ2Ydj3J+JJnnLri4psuH1EazOcEmK9iAGV6FwbtmI9StrDLuYg+Ag6mr
036kGJd/Bl0bvXiZkQudPuF1CTAhSg1lPej08AC2KRn9IFvr+5yJVfrR7zWQXyF4
4N3hWNDBuPcYLaWpwtak1IjMtNlIRr+C7BiZdPXJB2NKJcBwBqcRVRNU8LEVSpVY
YLXnGKlzXtCRrtIE2bcUa64/RHx/mCaiCJkTXdwvNxy/e2PiWy7oPWMQzH0QodZs
R6h0hcXz+hC8m59e9/ecQH+oso8ct9PCmkq50J78Dx7gsu35X3o=
=FjrM
-----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-----

47
libreoffice.changes
View File

@ -1,8 +1,55 @@
-------------------------------------------------------------------
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>
- Add vendored poppler to use for all codestreams except Tumbleweed.
-------------------------------------------------------------------
Thu Sep 23 11:45:36 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Use vendored boost for all codestreams except Tumbleweed.
Update boost vendored version.
-------------------------------------------------------------------
Tue Sep 14 10:26:02 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Update to 7.2.1.2:
* LO minor release
- Added patch:
* pld-skia-patches.patch
* skia-freetype2.11.patch
-------------------------------------------------------------------
Tue Aug 17 15:18:30 UTC 2021 - Markéta Machová <mmachova@suse.com>
- Keep upstream desktop file names (bsc#1183655) and display math icon (bsc#1180479)
-------------------------------------------------------------------
Tue Aug 3 09:05:09 UTC 2021 - Markéta Machová <mmachova@suse.com>
- Update to 7.2.0
* LO major release
- Dropped patches:
* use-comphelper.patch
* bsc1184961.patch
* bsc1185505.patch
* bsc1185797.patch
* bsc1182969.patch
* bsc1187173.patch
* tdf142839.patch
* multicolumn-crash-fix.patch
-------------------------------------------------------------------
Thu Jul 29 13:27:48 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

87
libreoffice.spec
View File

@ -46,7 +46,7 @@
%endif
%bcond_with firebird
Name: libreoffice
Version: 7.1.5.2
Version: 7.2.2.1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -87,11 +87,14 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
Source2006: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
# PDFium is bundled everywhere
Source2008: %{external_url}/pdfium-4306.tar.bz2
Source2008: %{external_url}/pdfium-4500.tar.bz2
# Single C file with patches from LO
Source2009: %{external_url}/dtoa-20180411.tgz
# Skia is part of chromium and bundled everywhere as by google only way is monorepo way
Source2010: %{external_url}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
Source2010: %{external_url}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
# Fix the build with freetype-2.11
Source2011: skia-freetype2.11.patch
Source2012: %{external_url}/libcmis-0.5.2.tar.xz
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build
Patch1: scp2-user-config-suse.diff
@ -99,18 +102,11 @@ Patch1: scp2-user-config-suse.diff
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
# PATCH-FIX-UPSTREAM https://github.com/LibreOffice/core/commit/f14b83b38d35a585976ef5d422754d8e0d0266a6 ucp: fix call to getComponentContext
Patch4: use-comphelper.patch
# PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error
Patch6: gcc11-fix-error.patch
# bsc#1182969 Multi column textbox in editengine
Patch9: bsc1182969.patch
# tdf#142839 Fix a regression caused by "Multi column textbox in editengine"
Patch10: tdf142839.patch
# Avoid crash getting default item for OWN_ATTR_TEXTCOLUMNS
Patch11: multicolumn-crash-fix.patch
# bsc#1187173, bsc#1186871 fix component handling for ucpdav1 when --with-webdav=serf
Patch12: bsc1187173.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
@ -161,7 +157,6 @@ BuildRequires: pentaho-reporting-flow-engine
BuildRequires: pkgconfig
BuildRequires: python3-lxml
BuildRequires: python3-xml
BuildRequires: qrcodegen-devel
BuildRequires: sac
BuildRequires: ucpp
BuildRequires: unixODBC-devel
@ -177,6 +172,7 @@ BuildRequires: pkgconfig(bluez)
BuildRequires: pkgconfig(dbus-1) >= 0.60
BuildRequires: pkgconfig(epoxy) >= 1.2
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0) >= 2.40
BuildRequires: pkgconfig(glu)
@ -193,20 +189,20 @@ BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libabw-0.1)
BuildRequires: pkgconfig(libcdr-0.1) >= 0.1
BuildRequires: pkgconfig(libclucene-core)
BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.2
BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1
BuildRequires: pkgconfig(libeot) >= 0.01
BuildRequires: pkgconfig(libepubgen-0.1)
BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.8
BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.10
BuildRequires: pkgconfig(libexttextcat) >= 3.1.1
BuildRequires: pkgconfig(libfreehand-0.1)
BuildRequires: pkgconfig(liblangtag)
BuildRequires: pkgconfig(libmspub-0.1) >= 0.1
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.16
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.19
BuildRequires: pkgconfig(libnumbertext) >= 1.0.6
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4
BuildRequires: pkgconfig(liborcus-0.16)
BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libpq)
BuildRequires: pkgconfig(libqxp-0.0)
BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1
@ -223,8 +219,6 @@ BuildRequires: pkgconfig(mdds-1.5) >= 1.5.0
BuildRequires: pkgconfig(mythes)
BuildRequires: pkgconfig(nspr) >= 4.8
BuildRequires: pkgconfig(nss) >= 3.9.3
BuildRequires: pkgconfig(poppler)
BuildRequires: pkgconfig(poppler-cpp)
BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends)
@ -232,6 +226,7 @@ BuildRequires: pkgconfig(serf-1) >= 1.1.0
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.28
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(zxing)
Requires: liberation-fonts
Requires: libreoffice-branding >= 6.0
Requires: libreoffice-icon-themes = %{version}
@ -262,9 +257,21 @@ Obsoletes: %{name}-icon-theme-crystal < %{version}
Provides: %{name}-icon-theme-oxygen = %{version}
Obsoletes: %{name}-icon-theme-oxygen < %{version}
ExclusiveArch: aarch64 %{ix86} x86_64 ppc64le
%if 0%{?suse_version} < 1500
%if 0%{?suse_version} < 1550
# Too old boost on the system
Source2020: %{external_url}/boost_1_71_0.tar.xz
Source2020: %{external_url}/boost_1_75_0.tar.xz
Source2023: %{external_url}/poppler-21.01.0.tar.xz
Source2024: %{external_url}/poppler-data-0.4.10.tar.gz
%else
BuildRequires: libboost_date_time-devel
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_iostreams-devel
BuildRequires: libboost_locale-devel
BuildRequires: libboost_system-devel
BuildRequires: pkgconfig(poppler) >= 21.01.0
BuildRequires: pkgconfig(poppler-cpp)
%endif
%if 0%{?suse_version} < 1500
# Too old icu on the system
Source2021: %{external_url}/icu4c-68_1-src.tgz
Source2022: %{external_url}/icu4c-68_1-data.zip
@ -284,11 +291,6 @@ Requires(postun):update-desktop-files
%else
BuildRequires: gcc >= 7
BuildRequires: gcc-c++ >= 7
BuildRequires: libboost_date_time-devel
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_iostreams-devel
BuildRequires: libboost_locale-devel
BuildRequires: libboost_system-devel
# genbrk binary is required
BuildRequires: icu
BuildRequires: java-devel >= 9
@ -362,6 +364,7 @@ Provides: libreoffice-branding-openSUSE = 4.0.1
Obsoletes: libreoffice-branding-openSUSE < 4.0.1
Provides: libreoffice-branding-SLE = 4.0.1
Obsoletes: libreoffice-branding-SLE < 4.0.1
Supplements: (libreoffice and branding-openSUSE)
BuildArch: noarch
%description branding-upstream
@ -570,11 +573,11 @@ This package contains some GNOME extensions and GTK2 interface for LibreOffice.
Summary: Gtk3 interface for LibreOffice
Group: Productivity/Office/Suite
Requires: %{name}-gnome = %{version}
Supplements: packageand(libreoffice:gnome-session)
Supplements: packageand(libreoffice:mate-session-manager)
Supplements: packageand(libreoffice:xfce4-session)
Supplements: (libreoffice and gnome-session)
Supplements: (libreoffice and mate-session-manager)
Supplements: (libreoffice and xfce4-session)
%if !%{with kdeintegration}
Supplements: packageand(libreoffice:plasma5-workspace)
Supplements: (libreoffice and plasma5-workspace)
%endif
%description gtk3
@ -981,18 +984,17 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%endif # Leap 42/SLE-12
%patch2
%patch3
%patch4 -p1
%patch6 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch7 -p1
%patch8 -p1
%if 0%{?suse_version} < 1500
%patch101 -p1
%endif
%patch990 -p1
%patch991 -p1
cp %{SOURCE2011} external/skia
# Disable some of the failing tests (some are random)
%if 0%{?suse_version} < 1330
sed -i -e '/CppunitTest_desktop_lib/d' desktop/Module_desktop.mk
@ -1079,6 +1081,8 @@ export NOCONFIGURE=yes
--with-system-jars \
--with-system-ucpp \
--with-system-dicts \
--with-system-libpng \
--without-system-libcmis \
--with-vendor=SUSE \
--with-tls=nss \
--disable-openssl \
@ -1128,8 +1132,11 @@ export NOCONFIGURE=yes
%else
--disable-firebird-sdbc \
%endif
%if 0%{?suse_version} < 1500
%if 0%{?suse_version} < 1550
--without-system-boost \
--without-system-poppler \
%endif
%if 0%{?suse_version} < 1500
--without-system-icu \
%endif
--enable-evolution2 \
@ -1194,8 +1201,6 @@ for desktop in * ; do
relative_target=`readlink $desktop | sed "s|%{_libdir}|../../%{_lib}|"`
# create the link
ln -sf $relative_target $desktop
# enable startup notification (bnc#796875)
grep -q "NoDisplay=true" $desktop || sed -i "s/\(\[Desktop Entry\]\)/\1\nStartupNotify=true/" $desktop
# suse_update
app=`echo $desktop | sed "s/.desktop//"`
%suse_update_desktop_file $app
@ -1386,6 +1391,12 @@ grep -v "%{_libdir}/libreoffice/program/libmysqlclo.so" file-lists/common_list.t
mv tmplist file-lists/common_list.txt
echo "%{_libdir}/libreoffice/program/libmysqlclo.so" >> file-lists/base_list.txt
# Remove empty files
rm %{buildroot}%{_libdir}/libreoffice/share/extensions/*/help/*.done
rm %{buildroot}%{_libdir}/libreoffice/share/extensions/*/help/*/*.ht_
rm %{buildroot}%{_libdir}/libreoffice/share/extensions/wiki-publisher/help/sa-IN/help.key_
rm %{buildroot}%{_libdir}/libreoffice/share/extensions/nlpsolver/locale/NLPSolverCommon_en_US.default
# We have ton of duped files so run over it
%fdupes %{buildroot}%{_prefix}

125
multicolumn-crash-fix.patch
View File

@ -1,125 +0,0 @@
From f093f265dbc42482556bdc358cd7aef933700e34 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Tue, 22 Jun 2021 16:14:28 +0300
Subject: [PATCH] Avoid crash getting default item for OWN_ATTR_TEXTCOLUMNS
... as seen in https://dev-builds.libreoffice.org/crashtest/89459662bf2684a07596d4132c84e5da7e0af8d4/backtraces/task908-core.backtrace.txt
...
#8 0x00007fb81c9674f2 in Application::Abort(rtl::OUString const&) (rErrorText="") at /home/buildslave/source/libo-core/vcl/source/app/svapp.cxx:274
#9 0x00007fb8226aa127 in desktop::Desktop::Exception(ExceptionCategory) (this=0x7ffdf0d856d0, nCategory=<optimized out>) at /home/buildslave/source/libo-core/include/rtl/ustring.hxx:181
bInException = true
nOldMode = <optimized out>
rArgs = <optimized out>
bRestart = <optimized out>
bAllowRecoveryAndSessionManagement = <optimized out>
#10 0x00007fb81c97ca5a in VCLExceptionSignal_impl(void*, oslSignalInfo*) (pInfo=<optimized out>) at /home/buildslave/source/libo-core/vcl/source/app/svmain.cxx:169
nOldMode = SystemWindowFlags::DIALOG
pSVData = 0x7fb81d423300 <rtl::Static<ImplSVData, (anonymous namespace)::private_aImplSVData>::get()::instance>
aLock = {m_isAcquired = true, m_isChecked = true, m_rSolarMutex = @0x5612f7423da0}
bIn = true
nVCLException = <optimized out>
#11 0x00007fb82282d1a7 in callSignalHandler(oslSignalInfo*) (pInfo=pInfo@entry=0x7fb80a196af0) at /home/buildslave/source/libo-core/sal/osl/all/signalshared.cxx:59
pHandler = 0x5612f826c2d0
Action = <optimized out>
#12 0x00007fb82289e5a8 in (anonymous namespace)::signalHandlerFunction(int, siginfo_t*, void*) (signal=6, info=0x7fb80a196cf0, context=0x7fb80a196bc0) at /home/buildslave/source/libo-core/sal/osl/unx/signal.cxx:451
Info = {Signal = osl_Signal_AccessViolation, UserSignal = 6, UserData = 0x0}
#13 0x00007fb8224d6840 in <signal handler called> () at /lib/x86_64-linux-gnu/libc.so.6
#14 0x00007fb8224d67bb in raise () at /lib/x86_64-linux-gnu/libc.so.6
#15 0x00007fb8224c1535 in abort () at /lib/x86_64-linux-gnu/libc.so.6
#16 0x00007fb8224c140f in () at /lib/x86_64-linux-gnu/libc.so.6
#17 0x00007fb8224cf102 in () at /lib/x86_64-linux-gnu/libc.so.6
#18 0x00007fb81f72434c in SfxItemPool::GetDefaultItem(unsigned short) const (this=0x5612f8e2ec00, nWhich=<optimized out>) at /home/buildslave/source/libo-core/svl/source/items/itempool.cxx:728
__PRETTY_FUNCTION__ = "const SfxPoolItem& SfxItemPool::GetDefaultItem(sal_uInt16) const"
nPos = <optimized out>
pDefault = <optimized out>
#19 0x00007fb81f724326 in SfxItemPool::GetDefaultItem(unsigned short) const (this=0x5612f8869790, nWhich=4006) at /home/buildslave/source/libo-core/svl/source/items/itempool.cxx:727
__PRETTY_FUNCTION__ = "const SfxPoolItem& SfxItemPool::GetDefaultItem(sal_uInt16) const"
nPos = <optimized out>
pDefault = <optimized out>
#20 0x00007fb80de6cc2e in SdStyleSheet::setPropertyValue(rtl::OUString const&, com::sun::star::uno::Any const&) (this=0x5612f89d3940, aPropertyName=..., aValue=uno::Any("com.sun.star.text.XTextColumns": {<com::sun::star::uno::XInterface> = {_vptr.XInterface = 0x5612f89006c0}, <No data fields>})) at /home/buildslave/source/libo-core/include/svl/style.hxx:257
aGuard = {<osl::Guard<comphelper::SolarMutex>> = {pT = 0x5612f7423da0}, <No data fields>}
pEntry = 0x7fb80e7252e8 <GetStylePropertySet()::aFullPropertyMap_Impl+1992>
rStyleSet = SfxItemSet of pool 0x5612f8869790 with parent 0x0 and Which ranges: [(1000, 1012), (1014, 1033), (1047, 1056), (1068, 1091), (1093, 1124), (1174, 1229), (4007, 4058)] = {1000 = 0x0, 1001 = 0x0, 1002 = 0x0, 1003 = 0x0, 1004 = 0x0, 1005 = 0x0, 1006 = 0x0, 1007 = 0x0, 1008 = 0x0, 1009 = 0x0, 1010 = 0x0, 1011 = 0x0, 1012 = 0x0, 1014 = 0x0, 1015 = 0x0, 1016 = 0x0, 1017 = 0x0, 1018 = 0x0, 1019 = 0x0, 1020 = 0x0, 1021 = 0x0, 1022 = 0x0, 1023 = 0x0, 1024 = 0x0, 1025 = 0x0, 1026 = 0x0, 1027 = 0x0, 1028 = 0x0, 1029 = 0x0, 1030 = 0x0, 1031 = 0x0, 1032 = 0x0, 1033 = 0x0, 1047 = 0x0, 1048 = 0x0, 1049 = 0x0, 1050 = 0x0, 1051 = 0x0, 1052 = 0x0, 1053 = 0x0, 1054 = 0x0, 1055 = 0x0, 1056 = 0x0, 1068 = 0x0, 1069 = 0x0, 1070 = 0x0, 1071 = 0x0, 1072 = 0x0, 1073 = 0x0, 1074 = 0x0, 1075 = 0x0, 1076 = 0x0, 1077 = 0x0, 1078 = 0x0, 1079 = 0x0, 1080 = 0x0, 1081 = 0x0, 1082 = 0x0, 1083 = 0x0, 1084 = 0x0, 1085 = 0x0, 1086 = 0x0, 1087 = 0x0, 1088 = 0x0, 1089 = 0x0, 1090 = 0x0, 1091 = 0x0, 1093 = 0x0, 1094 = 0x0, 1095 = 0x0, 1096 = 0x0, 1097 = 0x0, 1098 = 0x0, 1099 = 0x0, 1100 = 0x0, 1101 = 0x0, 1102 = 0x0, 1103 = 0x0, 1104 = 0x0, 1105 = 0x0, 1106 = 0x0, 1107 = 0x0, 1108 = 0x0, 1109 = 0x0, 1110 = 0x0, 1111 = 0x0, 1112 = 0x0, 1113 = 0x0, 1114 = 0x0, 1115 = 0x0, 1116 = 0x0, 1117 = 0x0, 1118 = 0x0, 1119 = 0x0, 1120 = 0x0, 1121 = 0x0, 1122 = 0x0, 1123 = 0x0, 1124 = 0x0, 1174 = 0x0, 1175 = 0x0, 1176 = 0x0, 1177 = 0x0, 1178 = 0x0, 1179 = 0x0, 1180 = 0x0, 1181 = 0x0, 1182 = 0x0, 1183 = 0x0, 1184 = 0x0, 1185 = 0x0, 1186 = 0x0, 1187 = 0x0, 1188 = 0x0, 1189 = 0x0, 1190 = 0x0, 1191 = 0x0, 1192 = 0x0, 1193 = 0x0, 1194 = 0x0, 1195 = 0x0, 1196 = 0x0, 1197 = 0x0, 1198 = 0x0, 1199 = 0x0, 1200 = 0x0, 1201 = 0x0, 1202 = 0x0, 1203 = 0x0, 1204 = 0x0, 1205 = 0x0, 1206 = 0x0, 1207 = 0x0, 1208 = 0x0, 1209 = 0x0, 1210 = 0x0, 1211 = 0x0, 1212 = 0x0, 1213 = 0x0, 1214 = 0x0, 1215 = 0x0, 1216 = 0x0, 1217 = 0x0, 1218 = 0x0, 1219 = 0x0, 1220 = 0x0, 1221 = 0x0, 1222 = 0x0, 1223 = 0x0, 1224 = 0x0, 1225 = 0x0, 1226 = 0x0, 1227 = 0x0, 1228 = 0x0, 1229 = 0x0, 4007 = 0x0, 4008 = 0x0, 4009 = 0x0, 4010 = 0x0, 4011 = 0x0, 4012 = 0x0, 4013 = 0x0, 4014 = 0x0, 4015 = 0x0, 4016 = 0x0, 4017 = 0x0, 4018 = 0x0, 4019 = 0x0, 4020 = 0x0, 4021 = 0x0, 4022 = 0x0, 4023 = 0x0, 4024 = 0x0, 4025 = 0x0, 4026 = 0x0, 4027 = 0x0, 4028 = 0x0, 4029 = 0x0, 4030 = 0x0, 4031 = 0x0, 4032 = 0x0, 4033 = 0x0, 4034 = 0x0, 4035 = 0x0, 4036 = 0x0, 4037 = 0x0, 4038 = 0x0, 4039 = 0x0, 4040 = 0x0, 4041 = 0x0, 4042 = 0x0, 4043 = 0x0, 4044 = 0x0, 4045 = 0x0, 4046 = 0x0, 4047 = 0x0, 4048 = 0x0, 4049 = 0x0, 4050 = 0x0, 4051 = 0x0...}
aSet = SfxItemSet of pool 0x5612f8869790 with parent 0x0 and Which ranges: [(4006, 4006)] = {4006 = 0x0}
#21 0x00007fb81945d8eb in SvXMLImportPropertyMapper::FillPropertySet_(std::__debug::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> const&, rtl::Reference<XMLPropertySetMapper> const&, SvXMLImport&, ContextID_Index_Pair*) (rProperties=std::__debug::vector of length 3, capacity 4 = {...}, rPropSet=uno::Reference to (class SdStyleSheet *) 0x5612f89d3ad0, rPropSetInfo=uno::Reference to (class SfxItemPropertySetInfo *) 0x5612f8938ed8, rPropMapper=rtl::Reference to 0x5612f89a1900, rImport=..., pSpecialContextIds=pSpecialContextIds@entry=0x7fb80a1978b0) at /home/buildslave/source/libo-core/include/com/sun/star/uno/Reference.h:384
rProp = @0x5612f8497590: {mnIndex = 54, maValue = uno::Any("com.sun.star.text.XTextColumns": {<com::sun::star::uno::XInterface> = {_vptr.XInterface = 0x5612f89006c0}, <No data fields>})}
nIdx = 54
rPropName = "TextColumns"
nPropFlags = 201342976
i = 1
bSet = false
nCount = <optimized out>
#22 0x00007fb8194650c6 in SvXMLImportPropertyMapper::FillPropertySet(std::__debug::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, ContextID_Index_Pair*) const (this=0x5612f8fa4960, aProperties=std::__debug::vector of length 3, capacity 4 = {...}, rPropSet=uno::Reference to (class SdStyleSheet *) 0x5612f89d3ad0, pSpecialContextIds=pSpecialContextIds@entry=0x7fb80a1978b0) at /home/buildslave/source/libo-core/xmloff/source/style/xmlimppr.cxx:466
xInfo = uno::Reference to (class SfxItemPropertySetInfo *) 0x5612f8938ed8
xMultiPropSet = empty uno::Reference
bSet = <optimized out>
xTolPropSet = empty uno::Reference
...
Change-Id: Icdb32ff5383a8073f525aad1a39ff1dcc70559f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117661
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit f2ea39c70da3f82bb39f8b51b5484172360b1fc2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117639
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
---
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 3f6b0b9..232b3b8 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -18,10 +18,12 @@
*/
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/table/BorderLine.hpp>
+#include <com/sun/star/text/XTextColumns.hpp>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -32,6 +34,7 @@
#include <editeng/fhgtitem.hxx>
#include <editeng/ulspitem.hxx>
#include <svl/hint.hxx>
+#include <svl/intitem.hxx>
#include <svl/itemset.hxx>
#include <svx/xflbmtit.hxx>
@@ -41,6 +44,7 @@
#include <svx/unoshprp.hxx>
#include <svx/unoshape.hxx>
#include <svx/svdpool.hxx>
+#include <svx/sdmetitm.hxx>
#include <svx/sdtaaitm.hxx>
#include <svx/sdtacitm.hxx>
#include <svx/sdtayitm.hxx>
@@ -1003,6 +1007,23 @@
throw IllegalArgumentException();
}
+ if (pEntry->nWID == OWN_ATTR_TEXTCOLUMNS)
+ {
+ if (css::uno::Reference<css::text::XTextColumns> xColumns; aValue >>= xColumns)
+ {
+ rStyleSet.Put(SfxInt16Item(SDRATTR_TEXTCOLUMNS_NUMBER, xColumns->getColumnCount()));
+ if (css::uno::Reference<css::beans::XPropertySet> xPropSet{ xColumns,
+ css::uno::UNO_QUERY })
+ {
+ auto aVal = xPropSet->getPropertyValue("AutomaticDistance");
+ if (sal_Int32 nSpacing; aVal >>= nSpacing)
+ rStyleSet.Put(SdrMetricItem(SDRATTR_TEXTCOLUMNS_SPACING, nSpacing));
+ }
+ return;
+ }
+ throw IllegalArgumentException();
+ }
+
SfxItemSet aSet( GetPool()->GetPool(), {{pEntry->nWID, pEntry->nWID}});
aSet.Put( rStyleSet );

3
pdfium-4306.tar.bz2
View File

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

3
pdfium-4500.tar.bz2 Normal file
View File

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

10
pld-skia-patches.patch Normal file
View File

@ -0,0 +1,10 @@
--- 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 @@
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))

3
poppler-21.01.0.tar.xz Normal file
View File

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

3
poppler-data-0.4.10.tar.gz Normal file
View File

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

37
skia-freetype2.11.patch Normal file
View File

@ -0,0 +1,37 @@
--- skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-03-01 15:53:09.178606791 +0100
+++ skia/src/ports/SkFontHost_FreeType_common.cpp 2021-08-12 17:48:32.358901987 +0200
@@ -665,8 +665,13 @@
canvas->drawPaint(paint);
break;
}
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ case FT_COLR_PAINTFORMAT_TRANSFORM: {
+ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine);
+#else
case FT_COLR_PAINTFORMAT_TRANSFORMED: {
SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
+#endif
canvas->concat(transform);
break;
@@ -760,12 +765,20 @@
traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
FT_COLOR_NO_ROOT_TRANSFORM);
break;
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ case FT_COLR_PAINTFORMAT_TRANSFORM:
+#else
case FT_COLR_PAINTFORMAT_TRANSFORMED:
+#endif
canvas->saveLayer(nullptr, nullptr);
// Traverse / draw operation will apply transform.
colrv1_draw_paint(canvas, palette, face, paint);
traverse_result =
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint);
+#else
colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint);
+#endif
canvas->restore();
break;
case FT_COLR_PAINTFORMAT_ROTATE:

3
skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
View File

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

3
skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz Normal file
View File

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

38
tdf142839.patch
View File

@ -1,38 +0,0 @@
From 4a2894a2b9c973b275788190220d205e41eb92db Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Thu, 17 Jun 2021 17:22:36 +0300
Subject: [PATCH] tdf#142839: do not forget to initialize *pHeightNTP
Regression after commit d0a1616ccad0dd5f5a02c1b0204f537b57d0b4b5
Change-Id: Iaa8f67e0c7e3d99b057294717d24ffac4ad3534c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117389
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 59611f7b6acbf643bde0e0121ee51e2df53e7d50)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117305
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
---
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 4980c57..ff080b1 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3437,6 +3437,8 @@
tools::Long ImpEditEngine::Calc1ColumnTextHeight(tools::Long* pHeightNTP)
{
tools::Long nHeight = 0;
+ if (pHeightNTP)
+ *pHeightNTP = 0;
// Pretend that we have ~infinite height to get total height
comphelper::ValueRestorationGuard aGuard(nCurTextHeight,
std::numeric_limits<tools::Long>::max());
@@ -3467,6 +3469,8 @@
tools::Long nTentativeColHeight = mnMinColumnWrapHeight;
tools::Long nWantedIncrease = 0;
tools::Long nCurrentTextHeight;
+ if (pHeightNTP)
+ *pHeightNTP = 0;
// This does the necessary column balancing for the case when the text does not fit min height.
// When the height of column (taken from nCurTextHeight) is too small, the last column will

42
use-comphelper.patch
View File

@ -1,42 +0,0 @@
From f14b83b38d35a585976ef5d422754d8e0d0266a6 Mon Sep 17 00:00:00 2001
From: Andrew Udvare <audvare@gmail.com>
Date: Thu, 24 Dec 2020 06:04:16 -0500
Subject: [PATCH] ucp: fix call to getComponentContext
Commit 3f9940c2e050830051a31e4b70736132e034a9db mistakenly removed
include/ucbhelper/getcomponentcontext.hxx seeing the getComponentContext method
as unused.
According to that file, ucbhelper::getComponentContext was just a duplicate of
comphelper::getComponentContext so this commit changes to calling that method
instead.
Change-Id: Ibd66b56a72afce437a26417d7944ec1ace34a4eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108262
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
ucb/source/ucp/webdav/webdavprovider.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 462e4e5a98f7..570b36e6180c 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <comphelper/processfactory.hxx>
#include <ucbhelper/contentidentifier.hxx>
#include <ucbhelper/macros.hxx>
#include "webdavprovider.hxx"
@@ -106,7 +107,7 @@ static css::uno::Reference< css::uno::XInterface >
ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
{
css::lang::XServiceInfo* pX =
- static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
+ static_cast<css::lang::XServiceInfo*>(new ContentProvider( comphelper::getComponentContext(rSMgr) ));
return css::uno::Reference< css::uno::XInterface >::query( pX );
}