LibreOffice.git
23 months agonss: upgrade to release 3.55.0distro/cib/libreoffice-6-0
Michael Stahl [Fri, 7 Aug 2020 16:57:00 +0000 (7 18:57 +0200)]
nss: upgrade to release 3.55.0

Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403.
(also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47)

* external/nss/nss.nspr-parallel-win-debug_build.patch:
  remove, merged upstream

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100420
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 227d30a3a17f2fffb1a166cdc3e2a796bb335214)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100590
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 94cecbfdf3cf01fe3d5658c7edf78696da2a249f)

Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888

23 months agoNSS: enable parallel build
Jan-Marek Glogowski [Wed, 26 Jun 2019 16:09:19 +0000 (26 18:09 +0200)]
NSS: enable parallel build

Since NSS 3.53, the Makefile based build should be fixed (upstream
bug 290526). The only missing patch is a minimal NSPR fix for the
"NSPR, configure + make, parallel, Windows, MS VS, debug" build.
That patch isn't incuded in the NSPR 4.25 release (but it's already
in the mercurial repo for NSPR 4.26).

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95218
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit b56e8d6def26a0430853835e997f1be841840a61)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100419
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit c1bce55faebd9ad8751d7b6b9a7f77dff7b3d507)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100589
(cherry picked from commit 3e4dbb1708d4b3b7619602b63602b884a7bb2caa)

Change-Id: I8eaa3792a12bdff734e56ac3f552991478957e23

2 years agocurl: upgrade to release 7.71.0
Michael Stahl [Mon, 29 Jun 2020 12:00:56 +0000 (29 14:00 +0200)]
curl: upgrade to release 7.71.0

Fixes CVE-2020-8169, and about 3 other ones that don't affect LO/libcmis.

Disable new optional dependencies "ngtcp2" and "quiche".

Change-Id: I595ed909c4e792ac3244643511a338b117e7f102
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97406
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit cb0c7e26e5708010b1fe941ae2f66134f31ed876)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97386
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 43130216127913d30074d3fe99c5706dcce44dee)

2 years agoicu: add patch to fix CVE-2020-10531
Michael Stahl [Tue, 24 Mar 2020 09:48:04 +0000 (24 10:48 +0100)]
icu: add patch to fix CVE-2020-10531

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90971
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 002d1152dc418f7d624409e76cd9d4ac0b42c7f8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90975
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 63b573faf984875cda7a879e696ea75fae81df57)

Change-Id: I0aca4af1bd79f28bf1c920a4d05e80948106aaac

2 years agoRemove a fragment from a file URL early on
Stephan Bergmann [Wed, 15 Jan 2020 16:16:02 +0000 (15 17:16 +0100)]
Remove a fragment from a file URL early on

...as ShellExecuteExW would ignore it anyway

Change-Id: I969db094bb7d2ea230ac8c36eb23d71a90fbe466
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86868
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 14b36a16b225bf7c988f118d499a7287c47cd83e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86877
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 51da0d22ff42b20ab38130b7874651ef136ecceb)

2 years agonss: upgrade to release 3.47.1
Michael Stahl [Mon, 25 Nov 2019 11:34:28 +0000 (25 12:34 +0100)]
nss: upgrade to release 3.47.1

Fixes CVE-2019-11745.

Remove nss.fix-freebl-add-lcc-support.patch.1, fixed upstream.

Reviewed-on: https://gerrit.libreoffice.org/83673
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit a6238c3fba80889f9090d997e2a4979b78b34ac7)

Change-Id: I72e35c90fabb0a83f547a787dbaee774e35f9c08

2 years agopoppler: upgrade to release 0.82.0
Michael Stahl [Wed, 20 Nov 2019 12:11:59 +0000 (20 13:11 +0100)]
poppler: upgrade to release 0.82.0

fixes CVE-2019-9903 CVE-2019-9631 CVE-2019-9545 CVE-2019-9543
CVE-2019-14494 CVE-2019-12293 CVE-2019-11026 CVE-2019-10873
CVE-2019-10872 CVE-2019-10871 CVE-2019-10018

remove obsolete 0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1

Reviewed-on: https://gerrit.libreoffice.org/83308
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 28e52c49452320ac76489d0f93ca5692456e5331)
Reviewed-on: https://gerrit.libreoffice.org/83336
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit f3b2d61376c6d7ae262f58406d89ef0caa8b0aaf)

Change-Id: I72b3bf89b294ed3e24157c7e75fd58d4f68d9f35

2 years agoFix build with poppler-0.82
Rasmus Thomsen [Sat, 26 Oct 2019 12:11:35 +0000 (26 14:11 +0200)]
Fix build with poppler-0.82

Reviewed-on: https://gerrit.libreoffice.org/81545
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 2eadd46ab81058087af95bdfc1fea28fcdb65998)
Reviewed-on: https://gerrit.libreoffice.org/83363
Reviewed-by: Rasmus Thomsen <oss@cogitri.dev>
(cherry picked from commit 928a372775a0758aa76eb10e568d5c106a8586eb)

Change-Id: I3b6b3faea7986f3e5a6ae4790580d03bc9c955fc

2 years agolibxslt: upgrade to release 1.1.34
Michael Stahl [Wed, 20 Nov 2019 14:08:24 +0000 (20 15:08 +0100)]
libxslt: upgrade to release 1.1.34

Fixes CVE-2019-18197.

Remove obsolete e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1.

Reviewed-on: https://gerrit.libreoffice.org/83312
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit e9ea24cc004a8b9a5856f2f268bd40433c504db1)
Reviewed-on: https://gerrit.libreoffice.org/83377
(cherry picked from commit d19b32c779bfeb51ef9570c3de8ed1925ec44473)

Change-Id: I95cf498e245083528f98bfef8cdd240bbe2211b9

2 years agolibxslt: upgrade to release 1.1.33
Michael Stahl [Mon, 14 Jan 2019 14:52:00 +0000 (14 15:52 +0100)]
libxslt: upgrade to release 1.1.33

Change-Id: Ifc64dae74df341e107857e43223ead04b9c1061e
Reviewed-on: https://gerrit.libreoffice.org/66309
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 3f720ac5ff65ddb2c0a06e48d0e2e9bec29f3a43)
Reviewed-on: https://gerrit.libreoffice.org/66364
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit efe7b735104343e5e0182e1b004aca9c7b79a901)

2 years agolibxml2: upgrade to release 2.9.10
Michael Stahl [Wed, 20 Nov 2019 14:05:02 +0000 (20 15:05 +0100)]
libxml2: upgrade to release 2.9.10

... which is, surprisingly enough, required to build the latest libxslt.

Reviewed-on: https://gerrit.libreoffice.org/83311
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit d1bf39a78ed239d4493f0470ca937852265e79d6)
Reviewed-on: https://gerrit.libreoffice.org/83347
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit e9dc4662d4ba3bde91407911f1bc1a7aa25fa0ce)

Change-Id: Ifbb36ed61b8f68185f9c788f63a8edeb58899f94

2 years agopython3: upgrade to release 3.5.9
Michael Stahl [Mon, 18 Nov 2019 17:45:46 +0000 (18 18:45 +0100)]
python3: upgrade to release 3.5.9

Fixes CVE-2019-9948 CVE-2019-9740 CVE-2019-10160 CVE-2019-16056
and expat CVE-2019-15903.

python-3.3.5-pyexpat-symbols.patch.1 fails to apply, and it's a
mystery why --with-system-expat is used everywhere but on MacOSX,
where 292af048ace2d4b455b2da3a22c784cb05db1d09 disabled it for no
obvious reason, so try to remove the special case and get rid of the
patch.

Reviewed-on: https://gerrit.libreoffice.org/83117
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit b0930d56130fdddfe65e92b081a8afad77974076)
Reviewed-on: https://gerrit.libreoffice.org/83189
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 0d4b1f624349361e5bf11b58ccc9e0e295c0e4aa)

Remove external/python3/python-3.5.7-c99.patch.1 - was apparently
reverted upstream.

Change-Id: I5ba4532eb6e7c2fb90daba95d132dcc7c9013d96

2 years agoResolves: tdf#126928 allow link updates in an intermediate linked document
Eike Rathke [Fri, 16 Aug 2019 13:36:15 +0000 (16 15:36 +0200)]
Resolves: tdf#126928 allow link updates in an intermediate linked document

... if link updates are allowed in the current document and that
intermediate document resides in a trusted location.

This works with both, the "Always (from trusted locations)" and
the "On request" settings under Tools -> Options -> Calc ->
General. It can't work with documents residing in a non-trusted
location as there is no way to allow updates on demand for a such
loaded document (hidden via formulas).

Reviewed-on: https://gerrit.libreoffice.org/77588
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 54bf84746a2a9a2e2aaf0df9e429b0cfd538f640)
Reviewed-on: https://gerrit.libreoffice.org/77604
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 14825a8b7f00ee4c148f2583856e5102312cabbd)

(cherry picked from commit f136b30fa3e991b780e4b1ed704d04256d0cfca0)

Change-Id: Ie483f7743db7c6d5cf947dc16a9c3660855f3423

2 years agolatest expat
Caolán McNamara [Mon, 16 Sep 2019 08:34:00 +0000 (16 09:34 +0100)]
latest expat

Change-Id: Ia98c9718ccd8e18b5f56851027bde944164f05c4
Reviewed-on: https://gerrit.libreoffice.org/78978
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 4436a29401beffd0893ecae70cd09c7a49f49f22)

2 years agoImprove check
Stephan Bergmann [Mon, 26 Aug 2019 08:18:09 +0000 (26 10:18 +0200)]
Improve check

Change-Id: I8280a81eef2ced0ff0ace51ea9f094421abafe13
Reviewed-on: https://gerrit.libreoffice.org/78108
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 761e6dd25782420bf06e4a2ff3205a79b6cbb136)
Reviewed-on: https://gerrit.libreoffice.org/78129
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit ffad51e9e625a22f1efab3da7886baf4134b444f)

2 years agoImprove check for absolute URI
Stephan Bergmann [Mon, 19 Aug 2019 09:27:15 +0000 (19 11:27 +0200)]
Improve check for absolute URI

Change-Id: I4dee44832107f72f8f3fb68554428dc1e646c346
Reviewed-on: https://gerrit.libreoffice.org/77706
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit c79efeb66f7951305d0334bc288aee1c571a8728)
Reviewed-on: https://gerrit.libreoffice.org/77724
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 52f7aa318722bd17c77ee5c4fa8307936e7b53af)

2 years agoan absolute uri is invalid input
Caolán McNamara [Fri, 16 Aug 2019 09:18:34 +0000 (16 10:18 +0100)]
an absolute uri is invalid input

Change-Id: I392be4282be8ed67e3451b28d2c9f22acd4c87fc
Reviewed-on: https://gerrit.libreoffice.org/77564
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 3c076e54f736980e208f5c27ecf179aa90aea103)
Reviewed-on: https://gerrit.libreoffice.org/77572
Tested-by: Jenkins
(cherry picked from commit 5445f7ffd09e891b220dabb19cd013bcf591fc08)

2 years agoconstruct final url from parsed output
Caolán McNamara [Mon, 12 Aug 2019 19:32:54 +0000 (12 20:32 +0100)]
construct final url from parsed output

Change-Id: Ifd733625a439685ad307603eb2b00bf463eb9ca9
Reviewed-on: https://gerrit.libreoffice.org/77373
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 87959e5deea6d33cd35dbb3b8423056f9566710e)
Reviewed-on: https://gerrit.libreoffice.org/77377
(cherry picked from commit c03acb9b8a97254cfcf7c45ef920b93b7f1dd344)

2 years agoexpand pyuno path separators
Caolán McNamara [Wed, 7 Aug 2019 11:58:01 +0000 (7 12:58 +0100)]
expand pyuno path separators

Change-Id: Ic97649ed6d4be595b308922c7bdc880cbb60b239
Reviewed-on: https://gerrit.libreoffice.org/77102
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 75903a0298218f89a199a5ac151ee0166f4469d7)

2 years agoImprove the Windows SDK 10 ProductVersion-Path
Juergen Funk [Wed, 5 Sep 2018 13:36:23 +0000 (5 15:36 +0200)]
Improve the Windows SDK 10 ProductVersion-Path

At the moment the ProductVersion-Path has always the same format,
with this patch, when the format the same, then no change is need for
the next Version.

Change-Id: I6a52fd20751ba139dd5ed6e3802f29c5e8f02975
Reviewed-on: https://gerrit.libreoffice.org/60041
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
(cherry picked from commit dfb18a0557d5a897f443fd1f1d617365f6ae134a)

2 years agoProperly obtain location
Stephan Bergmann [Tue, 6 Aug 2019 11:29:22 +0000 (6 13:29 +0200)]
Properly obtain location

Change-Id: I9fb0d883a3623394343cd54ef61e5610544198c8
Reviewed-on: https://gerrit.libreoffice.org/77019
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit a9cde2557242a0c343d99533f3ee032599c66f42)
Reviewed-on: https://gerrit.libreoffice.org/77023
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 28c6af3ddc283ca9c5712359a9abcb385c1575b4)

2 years agokeep name percent-encoded
Stephan Bergmann [Sat, 3 Aug 2019 15:37:48 +0000 (3 16:37 +0100)]
keep name percent-encoded

Change-Id: I470c4b24192c3e3c9b556a9bbb3b084359e0033b
Reviewed-on: https://gerrit.libreoffice.org/77006
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 315c51731384230194af26b86a976bf5d06c9dcc)

2 years agotdf#126641: don't fail on file URLs with fragment
Mike Kaganski [Thu, 1 Aug 2019 08:52:12 +0000 (1 10:52 +0200)]
tdf#126641: don't fail on file URLs with fragment

This only fixes part that the URL refuses to open the target file.
Honoring fragment isn't fixed here, since it's the system call to
ShellExecuteExW that in this case internally converts the file URL
into a system path, and strips the fragment from it.

Regression from commit d59ec4cd1660410fa1b18c50d2d83b1417a82ddc.

Change-Id: I6c9ed27e9a5bd7f2780dd3be96f816a6e825e043
Reviewed-on: https://gerrit.libreoffice.org/76778
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 2207269a84c7c9920af3385b837ce67978c720b4)
Reviewed-on: https://gerrit.libreoffice.org/76848
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit dd2b7919058fc0e23a7117d39110d3ecaaad1fb2)
Reviewed-on: https://gerrit.libreoffice.org/76881
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 72861eaf7cf9af3e7764b13d9e74edc5548806d2)

2 years agosolenv installer: don't let RPM generate config(...) Requires
Michael Stahl [Wed, 31 Jul 2019 10:30:26 +0000 (31 12:30 +0200)]
solenv installer: don't let RPM generate config(...) Requires

Fedora 30's rpm 4.14.2.1 will generate this Requires:
config(lodevbasis6.1-core) = 6.1.7.0.0-1

... but no corresponding Provides because that's disabled, so the
package cannot be installed.

The reason is that there is one %config file in the -core rpm:
%attr(0644,root,root) %config(noreplace) "/opt/libreofficedev6.1/./share/psprint/psprint.conf"

Old RPM from CentOS6 does not generate these config requires.

Unfortunately there doesn't appear to be a way to disable this
config(...) without disabling AutoReq, so do that, and invoke the shell
script find-requires-x11.sh manually from epmfile.pm.

Change-Id: I7fee0d9cd1b9e79f81bd4c611500e84736564881
Reviewed-on: https://gerrit.libreoffice.org/76736
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit b1d555ed42a035e0489accc19903c1ed8897bcee)
(cherry picked from commit fa58f27bb421b449134e79c03a4fb8762ab18679)

2 years agoremove LibreLogo from build
Michael Stahl [Mon, 29 Jul 2019 10:28:26 +0000 (29 12:28 +0200)]
remove LibreLogo from build

Change-Id: I62b45ea4890f5693e7d12f2b8c4ae43a9a03d16e
(cherry picked from commit e9d6950387a6e41f8f7b7d91921a2686defe136b)

2 years agoFix libgpg-error compilation error with gawk5
nd101 [Wed, 3 Jul 2019 01:41:06 +0000 (3 09:41 +0800)]
Fix libgpg-error compilation error with gawk5

This is an adaptation of upstream patch
https://github.com/gpg/libgpg-error/commit/7865041c77f4f7005282f10f9b6666b19072fbdf
plus a fix to Makefile.in

Change-Id: I5bf946cf93e5849b8a3428064ab86f6255be97da
Reviewed-on: https://gerrit.libreoffice.org/75022
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit af3b993ebea2f653fabba981d4c22b9aa779b32a)
Reviewed-on: https://gerrit.libreoffice.org/75075
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 87215115618de0c12d287a300fc5fde993886089)
Reviewed-on: https://gerrit.libreoffice.org/76308
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 8edc7023a14d26a7a6201f154b5c0e8edb47b1d9)

2 years agosw: fix use after free on tdf117215-1.odt
Michael Stahl [Thu, 18 Jul 2019 12:07:06 +0000 (18 14:07 +0200)]
sw: fix use after free on tdf117215-1.odt

Move the fix from 6d0ea082889c89eb8b408779f2de08da7441ff54 to
SwFlyFrame::DestroyImpl() so we unregister every SwFlyFrame.

==1550==ERROR: AddressSanitizer: heap-use-after-free on address 0x615000383f56 at pc 0x7efcd70d5ab9 bp 0x7ffeb7ac7c40 sp 0x7ffeb7ac7c38
WRITE of size 1 at 0x615000383f56 thread T0
    0 SwAnchoredObject::SetTmpConsiderWrapInfluence(bool) sw/source/core/layout/anchoredobject.cxx:743:32
    1 SwObjsMarkedAsTmpConsiderWrapInfluence::Clear() sw/source/core/layout/objstmpconsiderwrapinfl.cxx:53:23
    2 SwLayouter::ClearObjsTmpConsiderWrapInfluence(SwDoc const&) sw/source/core/layout/layouter.cxx:387:84
    3 sw::DocumentLayoutManager::ClearSwLayouterEntries() sw/source/core/doc/DocumentLayoutManager.cxx:497:5
    4 sw::DocumentStateManager::SetModified() sw/source/core/doc/DocumentStateManager.cxx:45:39
    5 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3942:36

0x615000383f56 is located 342 bytes inside of 504-byte region [0x615000383e00,0x615000383ff8)
freed by thread T0 here:
    1 SwFlyAtContentFrame::~SwFlyAtContentFrame() sw/source/core/inc/flyfrms.hxx:159:7
    2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9
    3 SwFrameFormat::DelFrames() sw/source/core/layout/atrfrm.cxx:2624:17
    4 SwUndoFlyBase::DelFly(SwDoc*) sw/source/core/undo/undobj1.cxx:161:19
    5 SwUndoDelLayFormat::SwUndoDelLayFormat(SwFrameFormat*) sw/source/core/undo/undobj1.cxx:403:5
    6 SwHistoryTextFlyCnt::SwHistoryTextFlyCnt(SwFrameFormat*) sw/source/core/undo/rolbck.cxx:538:20
    7 SwHistory::Add(SwFlyFrameFormat&, unsigned short&) sw/source/core/undo/rolbck.cxx:1083:50
    8 SwUndoSaveContent::DelContentIndex(SwPosition const&, SwPosition const&, DelContentType) sw/source/core/undo/undobj.cxx:1020:39
    9 SwUndoDelete::SwUndoDelete(SwPaM&, bool, bool) sw/source/core/undo/undel.cxx:229:9
    11 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3939:55

Change-Id: Ia0c28c9d5792615cbb566e502374efd0f4056daf
Reviewed-on: https://gerrit.libreoffice.org/75857
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit dea72ef111ee8a0b1b178f8cd48757514d5ca831)
Reviewed-on: https://gerrit.libreoffice.org/75941
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 4b9324b93dcbd72c8c8949309d45790dd8f7d5fd)
Reviewed-on: https://gerrit.libreoffice.org/76306
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 00c4ae49aa88319660b9201e8e5d8393953fa1ed)

2 years agoforcepoint73 deleted SwAnchoredObject still referenced in TmpConsiderWrapInfl
Caolán McNamara [Thu, 9 Aug 2018 11:32:01 +0000 (9 12:32 +0100)]
forcepoint73 deleted SwAnchoredObject still referenced in TmpConsiderWrapInfl

Reviewed-on: https://gerrit.libreoffice.org/58760
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 6d0ea082889c89eb8b408779f2de08da7441ff54)

Change-Id: If255723834d049865fcf6fd0eac7768dfcbad2a1
Reviewed-on: https://gerrit.libreoffice.org/58768
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit de765158b372d5f7bbb1b37c7d6be695ab6104ac)

2 years agoPostpone loading of all external references, including INDIRECT()
Eike Rathke [Thu, 11 Jul 2019 13:50:07 +0000 (11 15:50 +0200)]
Postpone loading of all external references, including INDIRECT()

... which can be constructed with an arbitrary URI text string not
an svExternal* token type, until link updates are allowed.

Reviewed-on: https://gerrit.libreoffice.org/75422
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit b824b23860b2cf533d4f2428d4a750bd72576181)
Reviewed-on: https://gerrit.libreoffice.org/76304
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Change-Id: I2ce4de415ff99ace04c083c36c1383d76a4ef40d
(cherry picked from commit 31b1d2af8ce01804049168b7b0317d93d77a42d7)

2 years agoPostpone filter detection until link update is allowed
Mike Kaganski [Tue, 9 Jul 2019 08:44:42 +0000 (9 18:44 +1000)]
Postpone filter detection until link update is allowed

Change-Id: I85b2185e550f2a133ceb485241ef513b40593e34
Reviewed-on: https://gerrit.libreoffice.org/75301
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 03c708bf085f91480c014d7fa31e7a317b2c7b8f)
Reviewed-on: https://gerrit.libreoffice.org/76303
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 43bf332aeede732557378e81765f29b704b17188)

2 years agodecode url escape codes and check each path segment
Caolán McNamara [Fri, 26 Jul 2019 12:25:31 +0000 (26 13:25 +0100)]
decode url escape codes and check each path segment

Change-Id: Ie8f7cef912e8dacbc2a0bca73534a7a242a53ca1
Reviewed-on: https://gerrit.libreoffice.org/76378
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 7942929685fafb0f9c82feb8da7279e5103c87f0)
Reviewed-on: https://gerrit.libreoffice.org/76451
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit aab62f2b21c331ff8c31b7c856d5e59080b9d64a)

2 years agoexpand LibreLogo check to global events
Caolán McNamara [Tue, 23 Jul 2019 14:31:05 +0000 (23 15:31 +0100)]
expand LibreLogo check to global events

Reviewed-on: https://gerrit.libreoffice.org/76189
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 4a66c7eda6ccde26a42c4e31725248c59940255d)

Change-Id: I7f436983ba0eb4b76b02d08ee52626e54b103d5f
Reviewed-on: https://gerrit.libreoffice.org/76305
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit b14742734481ae0a4731989a99db487d8ae1986a)

2 years agoofz#11125 pass param len around
Caolán McNamara [Sat, 27 Oct 2018 18:45:34 +0000 (27 19:45 +0100)]
ofz#11125 pass param len around

Change-Id: I4b382271df21c58de0e102af6e0b07a88a1d9610
Reviewed-on: https://gerrit.libreoffice.org/62448
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 6253b1a29c8c1bcd7fd9efb07ca1a12fb0fc1746)

2 years agoforcepoint#67 detect cairo surface creation failure
Caolán McNamara [Wed, 1 Aug 2018 20:34:20 +0000 (1 21:34 +0100)]
forcepoint#67 detect cairo surface creation failure

if e.g. too large

Reviewed-on: https://gerrit.libreoffice.org/58454
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 36bee88834f90818c5475b460c729186ef6c9229)

Change-Id: I7de8748a5ed695c1b3ddc8c1358414f3acd68c94

2 years agotdf#121198: fix crash in SdrPage::GetPageNum()
Xisco Fauli [Tue, 6 Nov 2018 11:01:34 +0000 (6 12:01 +0100)]
tdf#121198: fix crash in SdrPage::GetPageNum()

Regression from 9348b322a5c230dfcc2231661b73e480b130fcd9

Change-Id: Ibf9d6b65f0dbcc3a751e3ac5f3dbc28d908d6c25
Reviewed-on: https://gerrit.libreoffice.org/62952
Tested-by: Jenkins
(cherry picked from commit ebd24b39eee5ac72d33ad731e31469cf8f330631)
Reviewed-on: https://gerrit.libreoffice.org/62965
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 86d6ef3371b425d8ec1347902c54597c2749cae7)

2 years agotdf#118385 Avoid crash on loading document
Szymon Kłos [Thu, 16 Aug 2018 12:32:19 +0000 (16 14:32 +0200)]
tdf#118385 Avoid crash on loading document

Reviewed-on: https://gerrit.libreoffice.org/59173
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 308fbd8cdf9ce0fc3921b6c4c58707609b486fb9)
Reviewed-on: https://gerrit.libreoffice.org/59247
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 67ac2e8adc708480aa4e28a81cec464938e43c86)

Change-Id: Ifb18fee79667a5d0284407e84877b0d4d89536d9

3 years agoNSS fix lcc support patch
Jan-Marek Glogowski [Fri, 12 Jul 2019 13:01:41 +0000 (12 15:01 +0200)]
NSS fix lcc support patch

This hangs the build process with current MSVC cl.exe. It even
hangs when just calling "cl -? >/dev/null". Probably
a cl.exe bug to detect redirection properly?

This adds stdin redirection to /dev/null, like in configure.ac checks.

Reviewed-on: https://gerrit.libreoffice.org/75495
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit b11ea5e9c37b19f0d60a4075146668954a7bf728)

Change-Id: Ie03c3103ac68cd131dc280755621a8ce0417314f

3 years agonss: upgrade to release 3.45
Michael Stahl [Wed, 10 Jul 2019 10:20:00 +0000 (10 12:20 +0200)]
nss: upgrade to release 3.45

Fixes CVE-2019-11729 CVE-2019-11719 CVE-2019-11727, and the less
important CVE-2018-12384 and CVE-2018-12404 from intermediate releases.

Since NSS 3.44 it's possible to build as static libraries and for iOS;
drop the nss-chromium-nss-static.patch and nss-more-static.patch and
hope that it works.

Drop one hunk from nss.patch that looks fixed upstream.

Reviewed-on: https://gerrit.libreoffice.org/75344
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 6efc8a33f69bc7f4be45b7b81f67cd74c163b99e)

Change-Id: I7f37ac36f7f8dfd49d0bfb4a6185ca49d4f618a3
Reviewed-on: https://gerrit.libreoffice.org/75410
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
3 years agoMore uses of referer URL with SvxBrushItem
Stephan Bergmann [Fri, 7 Jun 2019 07:28:12 +0000 (7 09:28 +0200)]
More uses of referer URL with SvxBrushItem

Reviewed-on: https://gerrit.libreoffice.org/73643
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d)
Conflicts:
sw/source/core/text/porfld.cxx
sw/source/core/unocore/unosett.cxx

Reviewed-on: https://gerrit.libreoffice.org/73860
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced)

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23

3 years agoexplictly exclude LibreLogo from XScript usage
Caolán McNamara [Fri, 7 Jun 2019 13:04:07 +0000 (7 14:04 +0100)]
explictly exclude LibreLogo from XScript usage

Change-Id: I567647f0e2f8b82e4ef2995c673abe82f4564228
Reviewed-on: https://gerrit.libreoffice.org/73659
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit cb0024e3668979dfdef44db5aa15ddfaf035e695)

3 years agosanitize LibreLogo calls
László Németh [Thu, 6 Jun 2019 12:25:32 +0000 (6 14:25 +0200)]
sanitize LibreLogo calls

Change-Id: Ie4d9858e5b4b3e55ab08416fb9338d2df34ee5e1
Reviewed-on: https://gerrit.libreoffice.org/73627
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 1b63fa32bbd4a5b89d2ee3a53b28de4250c8dad3)

3 years agocurl: upgrade to release 7.65.0
Michael Stahl [Wed, 22 May 2019 09:40:54 +0000 (22 11:40 +0200)]
curl: upgrade to release 7.65.0

Fixes CVE-2019-5435. It looks like this is not a problem on 32-bit
Windows because fortunately we don't use /LARGEADDRESSAWARE flag
to set IMAGE_FILE_LARGE_ADDRESS_AWARE... but on 32-bit Linux
the user-space VM is 3GB so an exploit might be possible.

Apparently there's no code in LO that uses the CURLU_URLENCODE flag.

The other one, CVE-2019-5436, doesn't matter because we disable tftp.

Change-Id: I0d4f087befa5a3c4fb21ec36761dad68932425d9
Reviewed-on: https://gerrit.libreoffice.org/72732
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit edb01616ac176401650c35d938c75c6c5558a47e)

3 years agotdf#114306: Revert commits fixing this issue ( 6.1 only )
Xisco Fauli [Mon, 25 Mar 2019 23:48:12 +0000 (26 00:48 +0100)]
tdf#114306: Revert commits fixing this issue ( 6.1 only )

Revert "tdf#114306 fix crash caused by special document 2"

This reverts commit d30eefb677b446886f7b5bab6de93d489ba63529.

Revert "tdf#114306 fix crash caused by special document"

This reverts commit e4400f4c4e267f8528df3a7d5a09623c888bd10c.

Revert "tdf#114306 fix unexpected page break in row-spanned table"

This reverts commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50

Reviewed-on: https://gerrit.libreoffice.org/69848
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit f15146021b722dda0cf10cb08de6e0a3c525168a)

Change-Id: Ifff799616f12ee428a3f923f6510b20059f5bc71

3 years agolibpng: upgrade to release 1.6.37
Michael Stahl [Thu, 2 May 2019 08:59:01 +0000 (2 10:59 +0200)]
libpng: upgrade to release 1.6.37

Fixes CVE-2019-7317.

Change-Id: I3374f5cbd6552e2c1569d63ee680d0c1d9389621
Reviewed-on: https://gerrit.libreoffice.org/71663
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit e2abbc0062398ea67cb13cb5b0b7bfdce78e652c)

3 years agoFilter out problematic file URLs
Stephan Bergmann [Fri, 29 Mar 2019 13:01:19 +0000 (29 14:01 +0100)]
Filter out problematic file URLs

(cherry picked from commit 7e50e885ebbe130debcd4278a10a4e288655fdfc)
Conflicts:
shell/source/win32/SysShExec.cxx

Change-Id: I87fd37e56326bef4888354b923407530c6f70760
Reviewed-on: https://gerrit.libreoffice.org/70188
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit a35068ba25ed9da37bcb20598c9791b6979cf1ef)

3 years agolibxslt: add patch for CVE-2019-11068
Michael Stahl [Wed, 17 Apr 2019 12:50:10 +0000 (17 14:50 +0200)]
libxslt: add patch for CVE-2019-11068

Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4
Reviewed-on: https://gerrit.libreoffice.org/70879
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e)
Reviewed-on: https://gerrit.libreoffice.org/70894
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 32948e7778b959ef1037d9be707a6bfc7db4160d)

3 years agopython3: upgrade to release 3.5.7
Michael Stahl [Wed, 3 Apr 2019 09:03:17 +0000 (3 11:03 +0200)]
python3: upgrade to release 3.5.7

Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647

Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5
Reviewed-on: https://gerrit.libreoffice.org/70182
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c)
Reviewed-on: https://gerrit.libreoffice.org/70194
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit a072b91c03f7e24cc5fe99e4b7462d37ef8d703b)

3 years agoupgrade to python 3.5.6
Caolán McNamara [Thu, 17 Jan 2019 10:50:42 +0000 (17 10:50 +0000)]
upgrade to python 3.5.6

Change-Id: I6cdfc50b2385c426e20ce0e9b216b18c763249b8
Reviewed-on: https://gerrit.libreoffice.org/66519
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Jenkins
(cherry picked from commit 6808e1e5e2361220988dfa81cb35d03fb6e15855)

3 years agopoppler: upgrade to release 0.74.0
Michael Stahl [Tue, 12 Mar 2019 11:57:20 +0000 (12 12:57 +0100)]
poppler: upgrade to release 0.74.0

Fixes CVE-2019-7310.

Add patch to fix CVE-2019-9200 too.

CVE-2018-20662 looks irrelevant because we don't build pdfunite tool.

Reviewed-on: https://gerrit.libreoffice.org/69094
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit f9b354784faf65ecc8024cf6d7d7aaf589f6d91f)

Change-Id: I5e7ddabbb341f6bfefb376d552b50c4006f41906

3 years agoopenssl: upgrade to release 1.0.2r
Michael Stahl [Wed, 27 Feb 2019 11:18:01 +0000 (27 12:18 +0100)]
openssl: upgrade to release 1.0.2r

Fixes CVE-2019-1559, plus a couple low-severity CVEs.

Reviewed-on: https://gerrit.libreoffice.org/68430
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd)

Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b

3 years agoupgrade to openssl 1.0.2p
Caolán McNamara [Mon, 3 Sep 2018 08:19:29 +0000 (3 09:19 +0100)]
upgrade to openssl 1.0.2p

Reviewed-on: https://gerrit.libreoffice.org/59926
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit dd371caa3aff09c80c19772fcf5968cfcf14ff8c)

Change-Id: Ifacf5dce39d830838b3cf57df760a04df97ade4b

3 years agoupload openssl 1.0.2o
David Tardon [Thu, 29 Mar 2018 07:20:19 +0000 (29 09:20 +0200)]
upload openssl 1.0.2o

Reviewed-on: https://gerrit.libreoffice.org/52051
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 9c459fd919cb8199a69fc2d630742930e533285b)

Change-Id: Ib44570ff53d754d1d568378ef0dac4d4789f2042

3 years agomDNSResponder: upgrade to release 878.200.35
Michael Stahl [Wed, 20 Feb 2019 14:23:11 +0000 (20 15:23 +0100)]
mDNSResponder: upgrade to release 878.200.35

Apple can't afford the costly GPG licenses to sign releases apparently,
but the sha256 matches some OpenWRT and FreshPorts repos...

Fixes CVE-2015-7988.

Removing windows build patches, fixed upstream (except for the last hunk
of the SOCKET patch, but that is in code that is only used on MacOSX).

Reviewed-on: https://gerrit.libreoffice.org/68092
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 3a85c2db176db708c0ff9401c40858eb60e80f1e)

Change-Id: I9fdba5929badb75f995c66da0850d188780e7beb

3 years agocurl: upgrade to release 7.64.0
Michael Stahl [Wed, 6 Feb 2019 10:39:31 +0000 (6 11:39 +0100)]
curl: upgrade to release 7.64.0

fixes CVE-2018-16890 and CVE-2019-3822

Change-Id: I4c0021a5002590659cbfbdf642a7704a05309bf2
Reviewed-on: https://gerrit.libreoffice.org/67444
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 6ac54b9c8bce9425d3415d1e9bd8da318c44ed47)

3 years agocurl: upgrade to release 7.63.0
Michael Stahl [Mon, 14 Jan 2019 15:19:58 +0000 (14 16:19 +0100)]
curl: upgrade to release 7.63.0

fixes CVE-2018-16840

Change-Id: Ica995a28a71eb5d5277d045d57fee9ba0f88883f
Reviewed-on: https://gerrit.libreoffice.org/66328
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 5e96a5c664aea950111199e56bda412512a849b0)
Reviewed-on: https://gerrit.libreoffice.org/66365
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 091451beafb1248e5ff55e4b54b5fda199287f5d)

3 years agopython3: add patch bpo-17239: Disable external entities in SAX parser
Michael Stahl [Mon, 14 Jan 2019 16:33:37 +0000 (14 17:33 +0100)]
python3: add patch bpo-17239: Disable external entities in SAX parser

Change-Id: I44e969d8d3a8fe6b6426d61a1cbe83154c8518dd
Reviewed-on: https://gerrit.libreoffice.org/66329
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit a57dd8eba9c0799dd42eb547a37622bce8fdb0b3)
Reviewed-on: https://gerrit.libreoffice.org/66370
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 66b3860fd1772284dc12d0d2d2c76ac59b16883e)

3 years agopoppler: upgrade to release 0.73.0
Michael Stahl [Mon, 14 Jan 2019 14:12:24 +0000 (14 15:12 +0100)]
poppler: upgrade to release 0.73.0

Change-Id: If20998f8565b5534a96b3f29ccec572273edca1d
Reviewed-on: https://gerrit.libreoffice.org/66306
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 0609ea4fc27f34367716bf41c0cdaa7785aed9da)
Reviewed-on: https://gerrit.libreoffice.org/66369
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 033ff5b3eb90deaf6fd5eb8a74100233aa5fe772)

3 years agosdext: fix build with poppler 0.73
Michael Stahl [Mon, 14 Jan 2019 14:08:42 +0000 (14 15:08 +0100)]
sdext: fix build with poppler 0.73

... which has removed Guchar, Gushort, Guint, Gulong...

Change-Id: Ia54ad378031f167f6779f6ffe574b85c1e72f26d
Reviewed-on: https://gerrit.libreoffice.org/66305
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 50d371ae08c66648d9f32f633b2245e1746e2bb6)
Reviewed-on: https://gerrit.libreoffice.org/66363
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit b5698ac28a8a79105edf28ffc1db19bbcbecda3a)

3 years agoFix build with poppler-0.72
Andreas Sturmlechner [Tue, 8 Jan 2019 10:24:40 +0000 (8 11:24 +0100)]
Fix build with poppler-0.72

Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134
Reviewed-on: https://gerrit.libreoffice.org/65960
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 65a6c9ae4791188ffcecf489073cf38873ce5e17)
Reviewed-on: https://gerrit.libreoffice.org/66376
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit a5a188d5bbb99f6e305dad6f81b9e3760aa32676)

3 years agoFix build with poppler 0.71
Aleksei Nikiforov [Thu, 22 Nov 2018 14:54:00 +0000 (22 17:54 +0300)]
Fix build with poppler 0.71

Change-Id: I470ece9dc4766e10e1ccb5e99b25a8d8cc4cbf38
Reviewed-on: https://gerrit.libreoffice.org/63860
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 8ff41a26caf51544699863c89598d37d93dc1b21)
Reviewed-on: https://gerrit.libreoffice.org/66375
Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 704ff8be10ecfb39be064bd08b2f9c11312e3428)

3 years agopoppler dropped GBool since 0.71
Mike Kaganski [Tue, 20 Nov 2018 07:45:38 +0000 (20 08:45 +0100)]
poppler dropped GBool since 0.71

See https://lists.freedesktop.org/archives/libreoffice/2018-November/081410.html

Change-Id: I258e08894486a925bed50a3a4232b6e805af6784
Reviewed-on: https://gerrit.libreoffice.org/63625
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 5e8bdd9203dd642111c62a6668ee665a20d4ba19)
Reviewed-on: https://gerrit.libreoffice.org/66374
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit c85bd2c443b9a509b028a90ee9e766929e63089f)

3 years agolcms2: upgrade to release 2.9
Michael Stahl [Tue, 15 Jan 2019 16:05:00 +0000 (15 17:05 +0100)]
lcms2: upgrade to release 2.9

... at least, that's the plan - this is harder than it appears, as the
upstream maintainer appears to have released version 2.9 at least 3
times:

- Fedora has a file evidently downloaded before Nov. 17 with SHA512 of e30ad5a9a1ab9e7aaace9431434caa19a5ff6143db46644aba971a5ee37a265b26bf738e886d766405a7eb45a9d620d67c7ab3684ace86a107cf5a76642c04a5
- Gentoo has a file evidently downloaded before Nov. 19 with SHA256 of d4ad6f8718f7f9dc8b2a3276c9f237aa3f5eccdcf98b86dedc4262d8a1e7f009
- Debian has a file evidently downloaded before Dec. 17 with SHA256 of 48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20

The lcms2-2.9.tar.gz available from sourceforge currently matches the
one Debian has, so let's use it.

* 0017-Upgrade-Visual-studio-2017-15.8.patch added (fixing CVE-2018-16435)
* 0001-Added-an-extra-check-to-MLU-bounds.patch.1 removed (fixed upstream)

Change-Id: Iab8dada8f6d77d5b2da8560993380b3332bc02f6
Reviewed-on: https://gerrit.libreoffice.org/66400
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 99b20e589e64fbcf374d84ae68911ef2a96e537c)
Reviewed-on: https://gerrit.libreoffice.org/66428
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 5d6a91c4df0ea51bb32794ff6068fa19bda44307)

3 years agolibxml2: upgrade to release 2.9.9
Michael Stahl [Mon, 14 Jan 2019 14:44:35 +0000 (14 15:44 +0100)]
libxml2: upgrade to release 2.9.9

* fixes CVE-2018-14404
* drop one hunk from libxml2-android.patch that was added in commit
  6a17d2f2ba7acfec277314b97b50e41532d6b44d; presumably nan() exists now
  given that other code is calling it.

Change-Id: I696cc4e1da55536ea1c89a6e0446ce5bc8398ba4
Reviewed-on: https://gerrit.libreoffice.org/66308
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit beea5852720b22043aefcd1e6b7243c202b40601)
Reviewed-on: https://gerrit.libreoffice.org/66367
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 69b5995ed815bea4d21080f64a4232f44131696f)

3 years agoBump version
Thorsten Behrens [Thu, 29 Nov 2018 17:18:04 +0000 (29 18:18 +0100)]
Bump version

Change-Id: I4a51c29d449eeb3934ee010b1e93a79bac9a30a9

3 years agoFix headless build on Linux
Thorsten Behrens [Tue, 20 Nov 2018 19:53:50 +0000 (20 20:53 +0100)]
Fix headless build on Linux

Conditional-compile some OpenGL-ness that crept in

Change-Id: I8d12f34db3b4875470a0d81e9ef6a1654153b206

3 years agotdf#121205: Convert <a:br> to newline chars in chart title
Vasily Melenchuk [Thu, 1 Nov 2018 16:37:21 +0000 (1 17:37 +0100)]
tdf#121205: Convert <a:br> to newline chars in chart title

Reviewed-on: https://gerrit.libreoffice.org/62752
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 57d4cd80dcaf01fe4897d79d89e906d355410243)
Reviewed-on: https://gerrit.libreoffice.org/62990
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Conflicts:
chart2/qa/extras/chart2import.cxx

Change-Id: I43d14025c48878c5bc035d492623f4fc52426e5e

3 years agoDefault OpenGL to off on all platforms
Thorsten Behrens [Wed, 18 Jul 2018 16:06:44 +0000 (18 18:06 +0200)]
Default OpenGL to off on all platforms

Change-Id: Ide04d3b37b9fabb64d514fd87acbdfe9e49e6727

3 years agoDisable crash reporter UI
Samuel Mehrbrodt [Thu, 12 Jan 2017 15:46:45 +0000 (12 16:46 +0100)]
Disable crash reporter UI

Change-Id: I8106ec674080ede7072581dab2e6700040de5828
(cherry picked from commit b981aa30c3eb5ddd0cf6c35e4c37ab687667f71b)

3 years ago./g: don't exit early on ./g checkout -f
Thorsten Behrens [Mon, 2 Jul 2018 16:11:47 +0000 (2 18:11 +0200)]
./g: don't exit early on ./g checkout -f

Reviewed-on: https://gerrit.libreoffice.org/56822
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 5fce97a58b8f764e35bf98128591c9a89537da05)

Change-Id: I33f54c365bce64ccccfeb1c58fc8e4faddb7ad77
Reviewed-on: https://gerrit.libreoffice.org/56916
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit dca20728ebe798ada1045ea3dabcb981166e2b9d)

3 years agoBranded images for msi installer
Katarina Behrens [Wed, 10 Feb 2016 13:42:18 +0000 (10 14:42 +0100)]
Branded images for msi installer

The sizes are 122 x 234, 374 x 44 installed units respectively, according to
http://msdn.microsoft.com/de-de/library/windows/desktop/aa369490%28v=vs.85%29.aspx

it is 163x312, 499x58 pixels at 96 dpi. I bumped dpi to 120 and it still looks pixelated,
but it's as good as it gets.

For better results, we need different graphics, with less fine details given the very limited
space

Change-Id: I4a7eafed16fd79f377d27afa8151cfab614b464b

3 years agoBranded application icons
Katarina Behrens [Tue, 9 Feb 2016 10:09:30 +0000 (9 11:09 +0100)]
Branded application icons

sadly, this doesn't replace Windows taskbar icon, that must be living somewhere
else. It works on Linux though.

 Conflicts:
icon-themes/galaxy/res/main128.png
icon-themes/galaxy/res/mainapp_16.png
icon-themes/galaxy/res/mainapp_16_8.png
icon-themes/galaxy/res/mainapp_32.png
icon-themes/galaxy/res/mainapp_32_8.png
icon-themes/galaxy/res/mainapp_48_8.png

Change-Id: I028fc68d96f02113622c5e1ec3ed830ac797be0b

3 years agoPoint to CIB helpdesk
Katarina Behrens [Tue, 9 Feb 2016 09:38:29 +0000 (9 10:38 +0100)]
Point to CIB helpdesk

it's pretty mean, b/c German translation (which I can't change) says the site
is in English, while CIB site is in German only and can't be switched to other
lang

Conflicts:
sfx2/source/appl/appserv.cxx

Change-Id: Ifbbb9e9d2bbee40998c07d1c68b61cd20d77dbc3

3 years agoPoint to CIB website
Katarina Behrens [Tue, 9 Feb 2016 09:00:30 +0000 (9 10:00 +0100)]
Point to CIB website

this idiotic postprocess script hard-codes libreoffice.org for some reason, grr

Change-Id: Ide1f19d4da9a437e01118e8baf74c0d1a8ca2e10

3 years agoCIB branding for start center
Katarina Behrens [Mon, 21 Sep 2015 11:47:57 +0000 (21 13:47 +0200)]
CIB branding for start center

Change-Id: I9887fded72131c7888d6e1b1165a778c8da2952d

3 years agopossible fix for tdf#120928 - quickstart --killtray throws exceptionlibreoffice-6-0
brinzing [Sat, 27 Oct 2018 15:32:38 +0000 (27 17:32 +0200)]
possible fix for tdf#120928 - quickstart --killtray throws exception

Change-Id: Id4081439075f4beecc2b0e4aed035d5ee28a2cfd
Reviewed-on: https://gerrit.libreoffice.org/62429
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
(cherry picked from commit a41d7ee25ea5057cd887c67d33d42f4c764f9c77)
Reviewed-on: https://gerrit.libreoffice.org/62441
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
3 years agotdf#116085 make sure Certificate Manager is found with GPG4win v3
Cor Nouws [Thu, 27 Sep 2018 19:53:12 +0000 (27 21:53 +0200)]
tdf#116085 make sure Certificate Manager is found with GPG4win v3

Reviewed-on: https://gerrit.libreoffice.org/61061
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 89a60912bba7ffd6f65ea99f4664f343c5025c95)
Reviewed-on: https://gerrit.libreoffice.org/61173
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Change-Id: I3a7ab7ec046a6bbff4b4a020e76356ffd454bab8
Reviewed-on: https://gerrit.libreoffice.org/62546
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
3 years agoupdate credits
Christian Lohmaier [Mon, 29 Oct 2018 19:40:24 +0000 (29 20:40 +0100)]
update credits

Change-Id: I8a383888ae8e2da96c7eef94c40cf3ddb7815d98
(cherry picked from commit 360b557c28c7f19731d566c01627cc104d06638a)

3 years agotdf#119235 svx,sd: fix drag&drop from ColorBar
Michael Stahl [Sat, 27 Oct 2018 21:39:27 +0000 (27 23:39 +0200)]
tdf#119235 svx,sd: fix drag&drop from ColorBar

This was using the SfxPoolItem serialisation of XATTR_FILL* items,
where only XFillColorItem and XFillStyleItem were actually used;
the binary serialisation was removed without being aware of this
feature.

Fix this by using uno::Any instead, rather than reviving the binary
serialisation.

Also change the clipboard format strings, just to be safe.

(regression from 97b889b8b2b2554ce33fd6b3f0359fc18f39832d)

Change-Id: I1828621a9aae606a1ca47835eef608062efe64a0
Reviewed-on: https://gerrit.libreoffice.org/62455
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 0a6813ad5d57d0df72562c797a8b0581bfd65a11)
Reviewed-on: https://gerrit.libreoffice.org/62472
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
3 years agotdf#120376 sd: fix duplicated styles on copy/paste
Michael Stahl [Sat, 27 Oct 2018 17:56:00 +0000 (27 19:56 +0200)]
tdf#120376 sd: fix duplicated styles on copy/paste

Unfortunately the comparison was inverted, so a style is copied
iff it already exists, which is clearly the reviewer's fault...

(regression from 57db6e24b5ad43d447c30e44a112c74c7e75b46b)

Change-Id: I3425982feb08e980eca9243cc16120897b65a70f
Reviewed-on: https://gerrit.libreoffice.org/62436
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit be9f3db2306150a37ef18e4ccc8d8f4a1934c5c1)
Reviewed-on: https://gerrit.libreoffice.org/62452
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
3 years agotdf#120807 check for valid ImplGetWindowImpl()
Jan-Marek Glogowski [Tue, 23 Oct 2018 19:42:54 +0000 (23 19:42 +0000)]
tdf#120807 check for valid ImplGetWindowImpl()

Change-Id: Ia1135d11990abc303849bd1b6a549c82008c79de
Reviewed-on: https://gerrit.libreoffice.org/62260
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit db0051744330d82986e8f2629a027bc4a5dc1b4a)
Reviewed-on: https://gerrit.libreoffice.org/62280
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
3 years agokeep pyuno script processing below base uri
Caolán McNamara [Thu, 18 Oct 2018 19:39:23 +0000 (18 20:39 +0100)]
keep pyuno script processing below base uri

Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7
Reviewed-on: https://gerrit.libreoffice.org/61969
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
3 years agoupdate credits
Christian Lohmaier [Thu, 18 Oct 2018 16:01:39 +0000 (18 18:01 +0200)]
update credits

Change-Id: I666805e38c40826328d8c4226c394d4c3072b2a7
(cherry picked from commit c3eb1c85f95168f8e84b8f655c839eff23c7e98a)

3 years agoUpdate git submodules
Christian Lohmaier [Wed, 17 Oct 2018 20:09:44 +0000 (17 22:09 +0200)]
Update git submodules

* Update translations from branch 'libreoffice-6-0'
  - update translations for 6.0.7 rc2

    Change-Id: I2fbf6583f2f1c8cf73077a0325bfa0be3e7de893

3 years agoResolves: tdf#93372 format table in base is ignored
Caolán McNamara [Wed, 3 Oct 2018 15:42:15 +0000 (3 16:42 +0100)]
Resolves: tdf#93372 format table in base is ignored

since...

commit b4bbb5e5d7b31caad2fbcc00382ad27df3c81001
Date:   Sun May 17 22:56:46 2015 +0900

    refactor how font, fg. and bg. are applied in widgets/controls

revert the relevant piece, in this case there are two Windows/Contexts getting
their settings manipulated, rather than the usual one

Change-Id: I0a228aee6aaf1f58b2235fccf14dc63ffa96dd2d
Reviewed-on: https://gerrit.libreoffice.org/61317
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 0be3a5eea3089c2b63cc821ffb282fd4ab8ec455)
Reviewed-on: https://gerrit.libreoffice.org/61525

3 years agotdf#90376 revert the dock windows' Idles to Timers
Jan-Marek Glogowski [Sat, 25 Aug 2018 00:35:26 +0000 (25 02:35 +0200)]
tdf#90376 revert the dock windows' Idles to Timers

The dock windows' Timers were converted to Idles in commit
eef25e0e7c03 ("changed timers to idles"). Since the Idles poll
the mouse buttons, they starve all lower priority events.

From the comment in ImplDockFloatWin2::Move, this is a hack to
get the mouse release event from the window decorations in X11.

Change-Id: Ibba3c58dd8b3d95dbd9296cc111ab32968bee230
Reviewed-on: https://gerrit.libreoffice.org/59590
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit afd49c198769b5e7fc01a68ce7a6847aa0d0ddd8)
Reviewed-on: https://gerrit.libreoffice.org/60720
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit e3a745f7604b084a7bb5fb6f18d5b50b5e137a98)
Reviewed-on: https://gerrit.libreoffice.org/61466

3 years agosw: fix invalid cast in SwEditWin::RequestHelp()
Michael Stahl [Thu, 11 Oct 2018 08:57:05 +0000 (11 10:57 +0200)]
sw: fix invalid cast in SwEditWin::RequestHelp()

This results in a garbage OUString.

Change-Id: I03b8030a812d7016df5c29f1341749fbdedf1729
Reviewed-on: https://gerrit.libreoffice.org/61652
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit bf0276f0b53c01ac434fef88e97f6b0dd4c41787)
Reviewed-on: https://gerrit.libreoffice.org/61674
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
3 years agoofz#10879 stay inside sSecStr bounds
Caolán McNamara [Wed, 10 Oct 2018 08:42:36 +0000 (10 09:42 +0100)]
ofz#10879 stay inside sSecStr bounds

Change-Id: I0ca70cdb9b80305c5339668d65d2c4c9977e7160
Reviewed-on: https://gerrit.libreoffice.org/61606
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
3 years agobump product version to 6.0.8.0.0+
Christian Lohmaier [Wed, 3 Oct 2018 19:00:07 +0000 (3 21:00 +0200)]
bump product version to 6.0.8.0.0+

Change-Id: Ida05fd143fbb2a5f8f1a307e888daa4144d45ee5

3 years agoUpdate git submodules
Christian Lohmaier [Wed, 3 Oct 2018 17:30:29 +0000 (3 19:30 +0200)]
Update git submodules

* Update translations from branch 'libreoffice-6-0'
  - update translations for 6.0.7 rc1

    Change-Id: I3d8c568a8fd73465e47c0334ad02679652128020

3 years agoResolves: tdf#119954 do not copy the old parent, init with new parent instead
Eike Rathke [Thu, 20 Sep 2018 16:12:03 +0000 (20 18:12 +0200)]
Resolves: tdf#119954 do not copy the old parent, init with new parent instead

The parent is always the ScDBCollection that contains the
ScDBCollection::NamedDBs container, not the one the
ScDBCollection::NamedDBs was copy-constructed from.

Change-Id: Ia409347f3aeb9ad7a5e68da7af727adfac98d6a2
Reviewed-on: https://gerrit.libreoffice.org/60833
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 7ea5d339dc4d8412f436f3affa589bfbd0b1ef68)
Reviewed-on: https://gerrit.libreoffice.org/60842
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
3 years agotdf#118786 WIN just assert in Yield
Jan-Marek Glogowski [Fri, 24 Aug 2018 07:14:47 +0000 (24 09:14 +0200)]
tdf#118786 WIN just assert in Yield

This reminds me - again - that Jenkins doesn't run make check.

It turns out InSendMessage() also returns true, if you process a
nested SendMessage in the same thread. Therefore we have to
remove the SalComWndProc assert and just keep the one in the
Yield call.

Why? Because there seem to be no way to get the information
ReplyMessage has access to, so we could detect the caller /
origin of the send message and implement proper nested call
checks. The alternative would be to change all call sites of
SendMessage to:

if ( !pSalData->mpInstance->IsMainThread() )
    SendMessage(...)
else
    SalComWndProc(...)

which is the same SendMessage already does.

Change-Id: I991d68a64952dc5d47ba51edd8635c9e8c46614c
Reviewed-on: https://gerrit.libreoffice.org/59538
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit bf0a63dc93a746a008fb1656457c77de8df693ba)
Reviewed-on: https://gerrit.libreoffice.org/59565
(cherry picked from commit a42c65176f2791cf5e48578a8898bf03185adc89)
Reviewed-on: https://gerrit.libreoffice.org/60726
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
3 years agotdf#118786 WIN allow nested SendMessage calls
Jan-Marek Glogowski [Fri, 17 Aug 2018 17:41:53 +0000 (17 19:41 +0200)]
tdf#118786 WIN allow nested SendMessage calls

This bug trips "assert( !pInst->mbNoYieldLock )".

There is already a special case, introduced in commit 4baec725e0dc
("WIN run main thread redirects ignoring SolarMutex"), to prevent
tripping the assert for a nested SendMessage call.

So this implements a general solution for nested SendMessage calls.
We just have to prevent yielding in a call from an other thread,
as the sending thread still owns the SolarMutex.

This way we can also drop the special handling in
WinSalFrame::ReleaseFrameGraphicsDC.

Conflicts:
vcl/win/app/salinst.cxx

Change-Id: I7024b081b26f3545af12a3a3a038fe5e5671af3c
Reviewed-on: https://gerrit.libreoffice.org/59275
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 35a254750392dcd738481f5d6e8719cee9fb41b3)
Reviewed-on: https://gerrit.libreoffice.org/59318
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3e392904c558d1f9fc91926511d148762813537e)
Reviewed-on: https://gerrit.libreoffice.org/60725
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
3 years agotdf#119458 reorganize sw background Idle handling
Jan-Marek Glogowski [Fri, 24 Aug 2018 06:05:26 +0000 (24 08:05 +0200)]
tdf#119458 reorganize sw background Idle handling

This is the squashed version of the following commits:
ce68889678bc tdf#119458 always start the SwDocIdle
107f0e6dba57 tdf#119458 fix sw background Idle state handling
771544544ee1 tdf#119458 fix sw background Idle unblocking
3bd8316718fd tdf#119458 just wakeup Scheduler on active Idle

While the first commit was really wrong, the third is just an
optimization to prevent unnecessary wakeups and Idle task
interrups from new calls to StartIdling(). The 4th one contains
the reset of the Idle state on run, which was probably the main
origin of the problem and allows to wake up the Scheduler
without moving the Task to the end of the queue.

Starting the SwDocIdle in StartIdeling() just reintroduces the
bug fixed in commit 401cba4c20fb ("tdf#116370 cleanup Writer idle
job handing"), so trading one bug for the other.

For the real solution we have to handle two states:
1. The SwDocIdle being active
2. The SwDocIdle being blocked

For the first state we can just use the active state of the Idle
itself. Since it's not a AutoIdle, it will be turned of, if
invoked. Either some Idle handler will want to be run it again or
some other thread might start it again, if needed.
Since we're now tracking the wanted Idle state via the active task
flag, we can drop the explicit mbStartIdleTimer handling.

As a result of the first change, we can't stop the Idle anymore
when blocking it. But the Idle itself checks its ready state via
IsDocIdle() in its UpdateMinPeriod function, so we have to add
the blocking state to IsDocIdle().

But we can't handle the correct state when blocking via a tasks
mbActive bool, as this also schedules the task and starts the
scheduler timer. So reintroduce a bool for the unblock state.

This should prevent fdo#73165, which I couldn't reproduce, but
just to be sure.

More importantly this patch resets the m_bStartOnUnblock when
the Idle job actually runs. This run should already determinates
if more Idle work needs to be done, and others can still call
BeginIdling() to ensure further processing.

Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/59536
(cherry picked from commit ce68889678bca3b51c258452f7bfdd21982e4a0d)
Reviewed-on: https://gerrit.libreoffice.org/59586
(cherry picked from commit 107f0e6dba57a5b27366a35a5cdb184079546df0)
Reviewed-on: https://gerrit.libreoffice.org/59692
(cherry picked from commit 771544544ee13ec98961f93b5313a7d2e29429cd)
Reviewed-on: https://gerrit.libreoffice.org/59730
(cherry picked from commit 3bd8316718fdfed454c01a9c4ae6af6beb34437d)

Change-Id: I2d4328f31644017b09786ff4cba45cf7643f0a4b
(cherry picked from commit f1fb30cf43eda45137ab96177238a29c3725789d)
Reviewed-on: https://gerrit.libreoffice.org/59757
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 20e46a6ca5b62f7177f799eae9e0f26e659fd03b)
Reviewed-on: https://gerrit.libreoffice.org/59769
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 3abec366a3fdb8657d69e24b69b4338121f80b22)
Reviewed-on: https://gerrit.libreoffice.org/60724

3 years agotdf#116370 cleanup Writer idle job handing
Jan-Marek Glogowski [Fri, 17 Aug 2018 21:10:00 +0000 (17 23:10 +0200)]
tdf#116370 cleanup Writer idle job handing

This prevents the start of the idle job, while processing itself,
so the fixed WinSalInstance::AnyInput of commit 3bf6c97029d2
("tdf#112975 WIN correctly handle VclInputFlags::OTHER") won't
report the timer events of the re-started idle job to process.

Fixes the early abort of the background job, which resulted in
the busy loop of the reported bug and this strange printing
behaviour.

P.S. I'm not sure, why this was just broken on Windows.

Change-Id: I6503dcd925c9a0ed843e794a31eea32a4a4b2889
Reviewed-on: https://gerrit.libreoffice.org/59279
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 401cba4c20fbc930f034168872642428d7459218)
Reviewed-on: https://gerrit.libreoffice.org/60723
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
3 years agotdf#120028 PPTX import: map shapes with multiple columns to table shapes
Miklos Vajna [Fri, 21 Sep 2018 09:50:57 +0000 (21 11:50 +0200)]
tdf#120028 PPTX import: map shapes with multiple columns to table shapes

This is a combination of 3 commits.

1st commit:

Longer term the core Impress shape has to be improved so that it can have
text in multiple columns.

Shorter term, map text with multiple columns to table shapes, that gives
correct layout in many cases and requires changes to the import filter
only.

(cherry picked from commit aef569ed83a3ccc02639e5b2a1c7cc131ba262fc)

Commit #2:

Related: tdf#120028 PPTX import: fix font size of multi-col shape text

Normal shapes have a TextFitToSize property for this, but table cell
content has to be scaled manually, as the rendering has no automatic
support for them. Luckily the file format has the info we need to scale
at import time.

(cherry picked from commit c8b2849d140677f7b35523096eb2bc715b3dc507)

Commit #3:

Related: tdf#120028 PPTX import: fix font color of multi-col shape text

Not just font color, anything defined via list styles were not imported.

(cherry picked from commit 800bf1071a30955ff70373b2fb5886eadce59dee)

Conflicts:
oox/inc/drawingml/textbodyproperties.hxx

Change-Id: Id7942b16882ab1f083ded2f0e577e8c9e128697c
Reviewed-on: https://gerrit.libreoffice.org/61244
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
3 years agoofz#10523 guard aginst 0 pF->nLCode
Caolán McNamara [Thu, 20 Sep 2018 15:03:24 +0000 (20 16:03 +0100)]
ofz#10523 guard aginst 0 pF->nLCode

Change-Id: I8ef476e06f54ddd57be907488a8a65314abda3ee
Reviewed-on: https://gerrit.libreoffice.org/60828
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
3 years agotdf#118502 Fix loading of eps images with replacement graphic
Samuel Mehrbrodt [Wed, 19 Sep 2018 10:51:00 +0000 (19 12:51 +0200)]
tdf#118502 Fix loading of eps images with replacement graphic

Change-Id: Iaf9c8e2ed72115e1f82d2541ae2a1d4803795a46
Reviewed-on: https://gerrit.libreoffice.org/60752
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 088af44063c3e2d1d0e7744a9f9bd7b37ff58a75)
Reviewed-on: https://gerrit.libreoffice.org/60768
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
3 years agoofz#10526 check with dynamic_cast its really a EMFPStringFormat
Caolán McNamara [Thu, 20 Sep 2018 08:39:26 +0000 (20 09:39 +0100)]
ofz#10526 check with dynamic_cast its really a EMFPStringFormat

Change-Id: Ifbe81b851b17858a915105c102af6f4d8f2c81fa
Reviewed-on: https://gerrit.libreoffice.org/60800
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
3 years agoupdate credits
Christian Lohmaier [Thu, 20 Sep 2018 09:35:19 +0000 (20 11:35 +0200)]
update credits

Change-Id: I1a8c8bc20ee7e97b47f0602dcfaa3cb1b771de8f
(cherry picked from commit bb26bd6148ef7c60d6280b4848c017ba63775242)

3 years agotdf#119881: Check if Unity/Gnome is separated by colon in XDG_CURRENT_DESKTOP
Xisco Fauli [Mon, 17 Sep 2018 15:41:41 +0000 (17 17:41 +0200)]
tdf#119881: Check if Unity/Gnome is separated by colon in XDG_CURRENT_DESKTOP

Change-Id: Ie29c2213d8efccd7750396325ce05b4909c09d02
Reviewed-on: https://gerrit.libreoffice.org/60592
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 79093cce6c3a65f84bbafd172b1e9e6702d3ce75)
Reviewed-on: https://gerrit.libreoffice.org/60678
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>