LibreOffice.git
4 years agotdf#109281 add fallback to GDI back when we can't bind a DClibreoffice-5-4-0
Tomaž Vajngerl [Tue, 25 Jul 2017 10:16:34 +0000 (25 12:16 +0200)]
tdf#109281 add fallback to GDI back when we can't bind a DC

Change-Id: Ideae3a5bcacfaadd2cb9d6b014a449d423d332dc
Reviewed-on: https://gerrit.libreoffice.org/40399
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
5 years agobump product version to 5.4.0.3.0+
Christian Lohmaier [Fri, 21 Jul 2017 14:25:37 +0000 (21 16:25 +0200)]
bump product version to 5.4.0.3.0+

Change-Id: I1400fc984d392cf366f8c232165269cd9ef7cc04

5 years agoupdate credits - with aliases fixed
Christian Lohmaier [Fri, 21 Jul 2017 14:19:21 +0000 (21 16:19 +0200)]
update credits - with aliases fixed

Change-Id: I486428da5459e758d23dd58b189b539896886c4c
(cherry picked from commit c48f659a38af4da57cd1c978f17f2598de19156a)
(cherry picked from commit ad287a1f4fae8a890faa475f0500097680bcf2b2)

5 years agotdf#107166 improve AA mode selection, retry, more checks
Tomaž Vajngerl [Fri, 21 Jul 2017 07:15:27 +0000 (21 09:15 +0200)]
tdf#107166 improve AA mode selection, retry, more checks

Major problem when setting the render mode and the text antialias
mode is that when you set the render mode to something that isn't
compatible with the text antialias mode, then every next call will
cause an error (invalid parameters). So we need to be sure that we
never set incompatible modes. Additionally we just need to set it
one time when we create the surface and not every time we draw.

If we get the D2DERR_RECREATE_TARGET we can create a new render
target and retry the whole call. Somethimes this is not possible
so we try 3 times and the give up.

We need to add more checks where we exit early or not continue with
some calls as any additional calls could taint the draw state and
some things wouldn't be drawn. For example if we calculate the
sizes of 0 glyphs we shouldn't continue with binding the hDC with
an "empty" rectangle. This will fail and cause some text that is
called afterwards to not draw.

Change-Id: I8f802da2e7ece0bf16d665f2e5011ffaa5267fca
Reviewed-on: https://gerrit.libreoffice.org/40260
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit e197b4a88c421201e157552f94e7eaaa00a76269)
Reviewed-on: https://gerrit.libreoffice.org/40274
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
5 years agotdf#107166 BindDC doesn't handle 0 width/height rect consistently
Tomaž Vajngerl [Thu, 13 Jul 2017 11:30:20 +0000 (13 13:30 +0200)]
tdf#107166 BindDC doesn't handle 0 width/height rect consistently

When binding a GDI device context to D2D we need to provide a
rectangle where the surface will have effect. When we just need
some font information we need to bind the DC too, but we aren't
really interested what the rectangle is, so we just provided a
0,0,0,0 rectangle in that case. This sometimes fails with a
"out of memory" result and is dependent on the renderer.

Instead of 0,0,0,0 rectangle we rather define a 0,0,1,1 rectangle
which should never fail. This is not problematic as for actual
rendering we later rebind with an actual rectangle.

Change-Id: I79c7f0cf4d69f213370ed26a811a908ed16070ff
Reviewed-on: https://gerrit.libreoffice.org/39902
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 35f8c78b5fbdbb3619b1c0f9fdee5f84ac1a6f73)
Reviewed-on: https://gerrit.libreoffice.org/40273
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
5 years agoupdate credits
Christian Lohmaier [Fri, 21 Jul 2017 12:04:09 +0000 (21 14:04 +0200)]
update credits

Change-Id: I3d2a7bd97c085c68dc5036b6cb3731c24ed63aa2
(cherry picked from commit 8f338d85a576dcc636907ce036cb34559e9c7e36)
(cherry picked from commit 2cf15209811b79566b4813071dc4e67dd6a11e41)

5 years agoUpdated core
Christian Lohmaier [Fri, 21 Jul 2017 11:34:41 +0000 (21 13:34 +0200)]
Updated core
Project: translations  db8f14aab056249579137c81c59fbf7d00e6c552

update translations for 5.4.0 rc3

and force-fix errors using pocheck

Change-Id: I44afb116fdeb5809a82cf8647cd28e34351d8e9c
(cherry picked from commit f9619b996bb12965acf934c8d8debf24dc4ad1e3)

5 years agotdf#73873 Fix missing embeddings in word/embeddings directory
Bartosz Kosiorek [Sat, 3 Jun 2017 10:31:32 +0000 (3 12:31 +0200)]
tdf#73873 Fix missing embeddings in word/embeddings directory

In commit:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=ad90e22f1970d019e1f2a1e8ba8020c0f0cb36c4
the refactor was made. Unorfunately due to mistake
the embedding was always resetting.
As a result only one embedding document was added,
and the OOXML files were pernamentely corrupted.
This simple fix is resolving mentioned issue.

Change-Id: Ie268b1bf8906ac7b8e061526a9186b3b4b46bef6
Reviewed-on: https://gerrit.libreoffice.org/38369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Reviewed-on: https://gerrit.libreoffice.org/39787
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
5 years agotdf#109197 crash when deleting user field variables in sw
Noel Grandin [Thu, 20 Jul 2017 15:10:50 +0000 (20 17:10 +0200)]
tdf#109197 crash when deleting user field variables in sw

regression from:
commit a706bb06d5326e7a997dd1d71f3f947bd0ad28e6
"new loplugin: useuniqueptr: sw part 1"

Change-Id: I57f9c9e6d7eeccc033b71d7182c960f3d79df73c
Reviewed-on: https://gerrit.libreoffice.org/40244
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 8f232771e84ba0369acb27085813d5810b15724b)
Reviewed-on: https://gerrit.libreoffice.org/40247
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
5 years agoBlind fix tdf#108612 explicitly checking for and against clipboard document
Eike Rathke [Thu, 6 Jul 2017 15:06:14 +0000 (6 17:06 +0200)]
Blind fix tdf#108612 explicitly checking for and against clipboard document

 This is a combination of 2 commits.

Attempt to blind fix tdf#108612 explicitly checking for clipboard document

It seems that for some yet unknown reason in an (un)certain constellation
ScDocument::IsClipboardSource() returns true because ScModule::GetClipDoc()
does not return the clipboard document but the actual document instead, so
destroying the clipboard document executes ScDocument::ClosingClipboardSource()
and (or in earlier versions) ScDocument::ForgetNoteCaptions() on the actual
document instead.

Check also that ScDocument::bIsClip is set, hopefully curing the symptom, the
real cause is something else.

(cherry picked from commit d5020f35aec54f0241fa58557dc6caadc149f5a9)

Another attempt to blind fix tdf#108612

Oddly in that scenario on Windows there are two clipboard documents alive when
destroying one, so the destroyed one erroneously is said to be a clipboard
source and then detachs the comments' caption information.

There's no legit case where a clipboard document could actually be the real
original source of another clipboard document, so bail out if the caller
already is one.

(cherry picked from commit 52e09f2c03f7cc024b2973c4806283c324fc23df)

0f8d240d8ec13bf91b77176dc6439a541cf14eaa

Change-Id: I5ffd0706592d2737808e7004630a56c53115295b
Reviewed-on: https://gerrit.libreoffice.org/40250
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
5 years agorepaint whole range for range based cond formats, tdf#105696
Markus Mohrhard [Thu, 16 Mar 2017 21:43:43 +0000 (16 22:43 +0100)]
repaint whole range for range based cond formats, tdf#105696

The range based cond formats need to be repainted across the whole
range. This ensures that a change in condition which affects all cells
causes a repaint.

Change-Id: Ie6dd10088a1c11c1bafd1faa9c429a35a6469ff2
Reviewed-on: https://gerrit.libreoffice.org/35302
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 49922897d68835ae4e5c850b3c55107157fe7548)
Reviewed-on: https://gerrit.libreoffice.org/39713
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 6ed7a3085216caf29f9066154fccc6ee2f1b953d)
Reviewed-on: https://gerrit.libreoffice.org/39925
Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Eike Rathke <erack@redhat.com>
5 years agoResolves: tdf#75650 reset boolean number format to General for new formula
Eike Rathke [Mon, 17 Jul 2017 09:36:29 +0000 (17 11:36 +0200)]
Resolves: tdf#75650 reset boolean number format to General for new formula

Change-Id: Iec2feefcbb5a92c64f182d93b4055fc009dbe1e5
(cherry picked from commit 1c1783864a356a4394f80dec28db939f4cf572cd)
Reviewed-on: https://gerrit.libreoffice.org/40054
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
5 years agoResolves: tdf#104186 spaces between function name and ( not allowed in OOXML
Eike Rathke [Mon, 17 Jul 2017 18:13:07 +0000 (17 20:13 +0200)]
Resolves: tdf#104186 spaces between function name and ( not allowed in OOXML

(cherry picked from commit 7232980be6a4d67ed28a21b74ef3544cacb29d6a)

 Conflicts:
formula/source/core/api/FormulaCompiler.cxx

Backported.

Change-Id: I6f6fcdab24a426d0f62052fa2d31f4098d1d893a
Reviewed-on: https://gerrit.libreoffice.org/40087
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
5 years agotdf#108758 : do not write to undo document when...
Dennis Francis [Thu, 13 Jul 2017 06:05:41 +0000 (13 11:35 +0530)]
tdf#108758 : do not write to undo document when...

...updating references during a block move, for formula cells
that are in the target range of the move operation.

The fix is for formula cells that are not grouped. For the
grouped case, it was already doing correctly.

Added two unit tests in ucalc_formula.cxx for grouped formula
and non-grouped formula cases.

Change-Id: I9f4d988f5e154f56670bd1c0cc366ee6704fb858
Reviewed-on: https://gerrit.libreoffice.org/39883
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 2caaf9bfe8d3f81517467daf36de0bd8ddd6b543)
Reviewed-on: https://gerrit.libreoffice.org/39923
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
5 years agoResolves: tdf#108903 avoid recurse to death
Caolán McNamara [Thu, 13 Jul 2017 15:23:32 +0000 (13 16:23 +0100)]
Resolves: tdf#108903 avoid recurse to death

Change-Id: Iadde719a024c5fce97aa0f4c58947a5012639a84
Reviewed-on: https://gerrit.libreoffice.org/39920
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit e2075593e4d13b6e7c0b32b23912fdeed1ada6bf)
Reviewed-on: https://gerrit.libreoffice.org/39989
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
5 years agodon't use memset on structure with std::shared_ptr member
Markus Mohrhard [Sun, 16 Jul 2017 01:17:29 +0000 (16 03:17 +0200)]
don't use memset on structure with std::shared_ptr member

Change-Id: Ie6033b9820435bb6a45aa70f9a48115000571e0f
Reviewed-on: https://gerrit.libreoffice.org/40004
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit c7fe625c8d41f648f89765abc40bb7b8fd4ed12a)
Reviewed-on: https://gerrit.libreoffice.org/40010
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
5 years agoFix crash when saving new spreadsheet as dBase/.dbf, tdf#108789 follow-up
Eike Rathke [Wed, 19 Jul 2017 19:24:06 +0000 (19 21:24 +0200)]
Fix crash when saving new spreadsheet as dBase/.dbf, tdf#108789 follow-up

... as there is no input stream.

Regression from

    commit 7f1465a9599e9665159dd2d823a6e9064cca5703
    Date:   Sun Jun 25 17:21:45 2017 +0200

Change-Id: Ib97a4878fe8cf28e5d0f1dc6cc07800ea1635e68
(cherry picked from commit 22ae038a56b85e86219922c2759544545f2d813d)
Reviewed-on: https://gerrit.libreoffice.org/40208
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
5 years agotdf#106359: use SvFileStream to read iqy; fixes *nix compatibility
Mike Kaganski [Wed, 12 Jul 2017 13:07:50 +0000 (12 16:07 +0300)]
tdf#106359: use SvFileStream to read iqy; fixes *nix compatibility

Change-Id: I42dc6559a57eaedcc64d2a4e59e16677b9dfeb1c
Reviewed-on: https://gerrit.libreoffice.org/39862
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit f19fbadd00370820d026d9c29a7bc231e6fa49f0)
Reviewed-on: https://gerrit.libreoffice.org/39872
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 71a5bda1f65fa1b87a290f15c24034d25a9f1f25)
Reviewed-on: https://gerrit.libreoffice.org/39886
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
5 years agoPartially revert c1723a3b6
Varun Dhall [Mon, 17 Jul 2017 19:58:40 +0000 (18 01:28 +0530)]
Partially revert c1723a3b6
The loop behavior was changed by the original commit
instead of starting from 1 it started from 0 due to which
it ends up saving Default Style and missed an important custom style

Change-Id: I4853b70fbb6a24c9ccbd0b5713c6dbe4215830a6
Reviewed-on: https://gerrit.libreoffice.org/40093
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 315b6afc90298ac23de7d24449feae6beaade17a)
Reviewed-on: https://gerrit.libreoffice.org/40129
(cherry picked from commit 9b6542dbeea01aedd3570d84231383c0dc34812f)
Reviewed-on: https://gerrit.libreoffice.org/40137
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-by: Varun Dhall <varun.vd1994@gmail.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
5 years agoDefer also loading of the English CalendarWrapper, tdf#109045 follow-up
Eike Rathke [Mon, 17 Jul 2017 19:59:38 +0000 (17 21:59 +0200)]
Defer also loading of the English CalendarWrapper, tdf#109045 follow-up

Always constructing the en-US CalendarWrapper defeats the original intention
that not for every construction of SvNumberFormatter a calendar is needed, plus
if no en-US is requested constructing such calendar is just wasted.

Since

commit 2a22696546ace75c38a72ad13f7383aedd00e06a
Date:   Mon Jul 10 15:56:32 2017 +0200

tdf#109045: store en calendar separately in OnDemandCalendarWrapper

Change-Id: I06e13754f03fc1fe4fbf48b76ccb82c917606480
(cherry picked from commit 21394b08475d1d869aa62c1dbb46c3dcc93ae3f0)
Reviewed-on: https://gerrit.libreoffice.org/40097
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
5 years agogpg4libre: Wrap PGPOwner in own namespace
Samuel Mehrbrodt [Mon, 17 Jul 2017 11:13:06 +0000 (17 13:13 +0200)]
gpg4libre: Wrap PGPOwner in own namespace

as recommended by W3C: https://www.w3.org/TR/xmldsig-core/#sec-PGPData

Reviewed-on: https://gerrit.libreoffice.org/40058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 9127706ab39cd39da7a8b9a13acb553a77968890)

Change-Id: I2cc0ae24eefc9137d2e3432da1d65e44245c7616
Reviewed-on: https://gerrit.libreoffice.org/40068
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 20d4c21c7f167559998526e36fb4859b41f2bf1f)
Reviewed-on: https://gerrit.libreoffice.org/40114
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agogpg4libre: Import public key payload if verification result != valid
Katarina Behrens [Mon, 17 Jul 2017 14:00:12 +0000 (17 16:00 +0200)]
gpg4libre: Import public key payload if verification result != valid

it is essential to look closer at the results of verification (code
doing that was removed by commit bdbebda1d80f538f946b14042) to be
able to proceed with importing public key payload from the file if
needed

I've also killed one more instance of xmlStrlen being used on binary
data

Change-Id: I8cd45fe963c8dde91727471ddbebe6943374a121
Reviewed-on: https://gerrit.libreoffice.org/40066
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 53be53b35e18230004b5f173c961fb8aa7162b09)
Reviewed-on: https://gerrit.libreoffice.org/40073
(cherry picked from commit 4ca03b46b53818a25636a96b5e42b3a0b116bc35)
Reviewed-on: https://gerrit.libreoffice.org/40101
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
5 years agotdf#109045: store en calendar separately in OnDemandCalendarWrapper
Aron Budea [Mon, 10 Jul 2017 13:56:32 +0000 (10 15:56 +0200)]
tdf#109045: store en calendar separately in OnDemandCalendarWrapper

When working with pivot cache there's alternating use of
locale dependent and locale indepentent formats, which
causes unnecessary loading of calendars due to constant
switching.

OnDemandLocaleDataWrapper already does this, now do
something similar in OnDemandCalendarWrapper.

Reviewed-on: https://gerrit.libreoffice.org/39762
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 2a22696546ace75c38a72ad13f7383aedd00e06a)

Change-Id: I3d64dbe8afa929cf416d87678762e82b45561d63
Reviewed-on: https://gerrit.libreoffice.org/39834
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
5 years agogpg4libre: use full SHA1 hash for key identification
Thorsten Behrens [Mon, 17 Jul 2017 00:17:16 +0000 (17 02:17 +0200)]
gpg4libre: use full SHA1 hash for key identification

Read and write full 20 bytes/40 hex chars of SHA1 key hash,
instead of some abridged versions. See also
https://lists.debian.org/debian-devel/2016/08/msg00215.html

Change-Id: I741afc94ac7cf559880fe55ff02420723e13310d
Reviewed-on: https://gerrit.libreoffice.org/40027
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 40f181207574827827d2bf1b4ad72d46fc8ff1fb)
Reviewed-on: https://gerrit.libreoffice.org/40028
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/40047
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
5 years agotdf#108831 PGP signature shown as invalid
Samuel Mehrbrodt [Tue, 11 Jul 2017 14:18:19 +0000 (11 16:18 +0200)]
tdf#108831 PGP signature shown as invalid

It was valid, but not trusted.
We need to show the owner trust in another place.

gpg4libre

Change-Id: I344a7b064a22c16b647c73d52f7abd91cfc86be9
Reviewed-on: https://gerrit.libreoffice.org/39959
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
5 years agogpg4libre: Show whether pgp keys are trusted or not
Samuel Mehrbrodt [Fri, 14 Jul 2017 13:48:57 +0000 (14 15:48 +0200)]
gpg4libre: Show whether pgp keys are trusted or not

Owner trust levels considered valid keys:
  Marginal
  Full
  Ultimate

Owner trust levels considered invalid keys:
  Unkown
  Undefined
  Never

Change-Id: I7338b587acfd105ca24e40b45960cea8d2c04ded
Reviewed-on: https://gerrit.libreoffice.org/39958
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
5 years agogpg4libre: search for _all_ local keys in getCertificate()
Thorsten Behrens [Sun, 16 Jul 2017 22:56:06 +0000 (17 00:56 +0200)]
gpg4libre: search for _all_ local keys in getCertificate()

Otherwise, newly-imported ones will not show up, which is
bad when trying to figure out how much we trust a key in
DocumentDigitalSignatures::ImplVerifySignatures()

Change-Id: I771cf71b5e0ddb5cc76db94d7ada4c5291fe56f1
Reviewed-on: https://gerrit.libreoffice.org/40023
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 59960eab5370477c809babdbfae9668dfa845e2d)
Reviewed-on: https://gerrit.libreoffice.org/40025
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit df84297026ddd16353456cb6b55f81d2ae7f9772)
Reviewed-on: https://gerrit.libreoffice.org/40046
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
5 years agogpg4libre: unconditionally use binary IO
Thorsten Behrens [Sun, 16 Jul 2017 22:40:17 +0000 (17 00:40 +0200)]
gpg4libre: unconditionally use binary IO

Regardless of changing gpgme defaults, we don't want
ascii armor anywhere.

Change-Id: Ic1e80e134b8f24d05d6549ef19c5a82220718f1f
Reviewed-on: https://gerrit.libreoffice.org/40024
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 8778e956d0e85b50dbf2512634e292c5360ba96d)
Reviewed-on: https://gerrit.libreoffice.org/40044
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
5 years agogpg4libre: Don't use xmlStrlen on binary data
Katarina Behrens [Fri, 14 Jul 2017 12:03:31 +0000 (14 14:03 +0200)]
gpg4libre: Don't use xmlStrlen on binary data

Odd things happen inside gpgme if the buffer is prematurely
truncated due to \n char and valid signature is then evaluated
as invalid

Change-Id: I24d4d22af06a3dde6eb7fdfc12953cf1b5f19c1e
Reviewed-on: https://gerrit.libreoffice.org/39945
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 02bb4ebf2b0dd656bfb0e8185e702267606a7e64)
Reviewed-on: https://gerrit.libreoffice.org/39964
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#108852: Put signature infobar into the right frame
Katarina Behrens [Fri, 7 Jul 2017 15:26:27 +0000 (7 17:26 +0200)]
tdf#108852: Put signature infobar into the right frame

and thus avoid crash when user clicks 'show signatures' button
in a window where signature bar shouldn't even be

Change-Id: I5eba8d1ddd8c76dd10acedfa03d732df586748de
Reviewed-on: https://gerrit.libreoffice.org/39705
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit bc882e977144d60b850288045e3f6aab7cbad6f7)
Reviewed-on: https://gerrit.libreoffice.org/39971
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
5 years agotdf#109046 Show correct signature type for OpenPGP
Samuel Mehrbrodt [Mon, 10 Jul 2017 08:38:26 +0000 (10 10:38 +0200)]
tdf#109046 Show correct signature type for OpenPGP

gpg4libre

Change-Id: I9c05f68e16928d14a29058f5bb9aa35c90b8f48b
Reviewed-on: https://gerrit.libreoffice.org/39744
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit efb24fc7bab19840d4959d22706719981dc8bac0)
Reviewed-on: https://gerrit.libreoffice.org/39911
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#108977 Show signature info for keys we don't have locally
Samuel Mehrbrodt [Mon, 10 Jul 2017 08:02:10 +0000 (10 10:02 +0200)]
tdf#108977 Show signature info for keys we don't have locally

gpg4libre

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

Change-Id: I89593224590007e61bce95c14922c08551282067
Reviewed-on: https://gerrit.libreoffice.org/39793
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agofix getrandom check in expat's configure
Christian Lohmaier [Thu, 13 Jul 2017 13:23:32 +0000 (13 15:23 +0200)]
fix getrandom check in expat's configure

https://github.com/libexpat/libexpat/issues/52

fixes /usr/include/sys/random.h:37:22: error: expected ')'
misdetection of random.h feature, already fixed upstream:
https://github.com/libexpat/libexpat/commit/602e6c78ca750c082b72f8cdf4a38839b312959f

(cherry picked from commit f78ed1ec528604f6db9bdd2a07462c5e99e0ab99)

Change-Id: I65e4aebaa838d2931a60cb34806d87b88861c4d8
(cherry picked from commit 5ff5e093aac0726e19962cd3622e54877d7acd51)

5 years agoUpdated core
Christian Lohmaier [Wed, 12 Jul 2017 15:39:22 +0000 (12 17:39 +0200)]
Updated core
Project: translations  77c44f36436e1f1f5c31a049636845e7174cdf4e

update translations

and force-fix errors using pocheck

also update po files for low-completion-ratio (<10% in UI) langs

Change-Id: I5c1d8fc0368c79a8d1d732cc21258214c7a39502
(cherry picked from commit d317414f8297e51842dc450bfaf5eeff5cb164ff)
(cherry picked from commit c1ee41a84f22743ce1c9c3435ce48372fef1bdac)

5 years agoRelated tdf#108977 Fix crash when vieweing non-existing certificate
Samuel Mehrbrodt [Mon, 10 Jul 2017 08:26:40 +0000 (10 10:26 +0200)]
Related tdf#108977 Fix crash when vieweing non-existing certificate

gpg4libre

Change-Id: If72c2ee818b67b48753ee293de4f02b4832b9d96
Reviewed-on: https://gerrit.libreoffice.org/39743
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/39792
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
5 years agoUpdated core
Andras Timar [Fri, 7 Jul 2017 06:01:22 +0000 (7 08:01 +0200)]
Updated core
Project: translations  725e2d62450e1929429547d3c6de62c5a002dae8

Updated Slovenian translation

Change-Id: Ibcfa731fec2385a067911c5dc95b8291d37505db
(cherry picked from commit 17f8b5b75785d2d309966171b7d7383de50ed411)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
5 years agobump product version to 5.4.0.2.0+
Christian Lohmaier [Thu, 6 Jul 2017 21:31:27 +0000 (6 23:31 +0200)]
bump product version to 5.4.0.2.0+

Change-Id: I20326cc20c31daec87ead5de6b3b92326562c83d

5 years agoBranch libreoffice-5-4-0
Christian Lohmaier [Thu, 6 Jul 2017 21:24:46 +0000 (6 23:24 +0200)]
Branch libreoffice-5-4-0

This is 'libreoffice-5-4-0' - the stable branch for the 5.4.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.4.x release,
please use the 'libreoffice-5-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I3593a0085b25667f2ad43411a2f5115bafc0622e

5 years agotdf#106990 set cleartype setting / force to use GDI render mode
Tomaž Vajngerl [Mon, 3 Jul 2017 13:00:21 +0000 (3 15:00 +0200)]
tdf#106990 set cleartype setting / force to use GDI render mode

With this we read the system setting for cleartype and set it to
the render target we are using.

Additionally we set the GDI like rendering mode which forces that
the text is rendered similar as this was done with GDI.

Change-Id: If6fb72bc371accf50278c968c94e625aee3f0953
Reviewed-on: https://gerrit.libreoffice.org/39602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit a5a3e82e99e7a60ec65c339dd0463af5c680cead)
Reviewed-on: https://gerrit.libreoffice.org/39647
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
5 years agotdf#108873 fix merge data handling in fields
Jan-Marek Glogowski [Tue, 4 Jul 2017 15:15:14 +0000 (4 17:15 +0200)]
tdf#108873 fix merge data handling in fields

This is a regression from tdf#70346 /
  commit 4851cde7b98226b0f82ae2b191c290173e9b06c6

It added the whole DB row as variables to the SwCalc hash set.
This works correct for conditionals when hiding sections, but not
for conditionals used in fields - actually they break.

Previously the field would do a fallback to query the DB again, if
no variable was in the dict and the only possible variables in the
dict could have been user-defined fields.

This handles the added variables correctly for fields.

Also fixes a bug to store the DB number values as number variables
and adds the record number, as SwCalc::VarLook does.

Change-Id: Ib0dbeda68234e671768ede55b2012235a3680276
Reviewed-on: https://gerrit.libreoffice.org/39509
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit f54c6938f73b94fb6f722f3ea68454fee424e62e)
Reviewed-on: https://gerrit.libreoffice.org/39612
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
5 years agoofz: stay inside string
Caolán McNamara [Thu, 6 Jul 2017 07:51:01 +0000 (6 08:51 +0100)]
ofz: stay inside string

Change-Id: Ia0d0ddfce4ee3d5f8763be6804fe52c514375bb3
Reviewed-on: https://gerrit.libreoffice.org/39629
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 073a2b2aef5c0b579aea8ed203dd9c1c5790b650)
Reviewed-on: https://gerrit.libreoffice.org/39644
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
5 years agotdf#108923 : Use display string for generating chart labels
Dennis Francis [Wed, 5 Jul 2017 06:14:58 +0000 (5 11:44 +0530)]
tdf#108923 : Use display string for generating chart labels

Use display string for generating chart labels in
PivotTableDataProvider::collectPivotTableData as chart2
does not seem to use number format for labels although it
does for the data.

Added unit test PivotChartTest::testPivotChartWithDateRowField()
for this fix.

Change-Id: I668d4c9d7cf8bbb7e4213cce7a6e7cd4d7d07cbe
Reviewed-on: https://gerrit.libreoffice.org/39548
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 5eeed755a2eadbadd7a2e0c06216258af028a96e)
Reviewed-on: https://gerrit.libreoffice.org/39654
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
5 years agoofz#2452 use shared_ptr for cshape
Caolán McNamara [Thu, 6 Jul 2017 11:25:58 +0000 (6 12:25 +0100)]
ofz#2452 use shared_ptr for cshape

Change-Id: Icf576c08b3502ea3e24fa4b3685b55f794e844db
Reviewed-on: https://gerrit.libreoffice.org/39649
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
5 years agoDisplay string results in the Function Wizard quoted
Eike Rathke [Wed, 5 Jul 2017 16:52:14 +0000 (5 18:52 +0200)]
Display string results in the Function Wizard quoted

To distinguish number strings from numeric results.

Change-Id: I68e044e839b2d5d2e87835dd0002f42aa0fc8192
(cherry picked from commit 14f562b109042ebde90261f93952b4c730e1427d)
Reviewed-on: https://gerrit.libreoffice.org/39608
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
5 years agoWatermark: tdf#91687 correct size in the .doc
Szymon Kłos [Mon, 19 Jun 2017 13:32:16 +0000 (19 15:32 +0200)]
Watermark: tdf#91687 correct size in the .doc

Export:
* Watermarks saved using Writer were very small in the MSO.
  Export fUsegtextFStretch property in the Geometry Text
  Boolean Properties.
* tdf#91687: SnapRect contains size of Watermark after rotation.
  We have to export size without rotation.

Import:
* When import set height depending on used font and width.
  Text will keep the ratio. Remember the padding for export.

* added unit test
* introduced enum to avoid magic numbers for stretch and best fit
  properties.

Change-Id: I3427afe78488d499f13c543ca401c096161aaf34
Reviewed-on: https://gerrit.libreoffice.org/38979
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit d72e0cadceb0b43928a9b4f18d75c9d5d30afdda)
Reviewed-on: https://gerrit.libreoffice.org/39607
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
5 years agoUpdated core
Olivier Hallot [Fri, 23 Jun 2017 01:41:41 +0000 (22 22:41 -0300)]
Updated core
Project: help  c2bea45cca3f5afa702b8b92ad744e0c9f8320db

Rearrange help page for VBA functions

Save work for translators.

Change-Id: I2072d85443ba32f10235123f3ba2b681182127d2
Reviewed-on: https://gerrit.libreoffice.org/39139
Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot@edx.srv.br>
5 years agoUpdated core
Olivier Hallot [Tue, 27 Jun 2017 21:25:50 +0000 (27 18:25 -0300)]
Updated core
Project: help  61c61f1181927a3dd78447cd36581682395ccf2d

Fixes for help pages after translation review.

Thanks to all translators for pinpointing these mistakes.

Change-Id: I3746d3d81ded2af1e012cb38cdd20e9e529c2667
Reviewed-on: https://gerrit.libreoffice.org/39331
Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot@edx.srv.br>
5 years agosw: fix use-after-free in SwAccessibleMap::FireEvents()
Michael Stahl [Tue, 4 Jul 2017 20:46:15 +0000 (4 22:46 +0200)]
sw: fix use-after-free in SwAccessibleMap::FireEvents()

As seen when running JunitTest_sw_unoapi_3 against "make debugrun",
the damn thing can call itself recursively via an odd corner case in
GetContext():

0  in SwAccessibleEventList_Impl::~SwAccessibleEventList_Impl() (this=0x9a6a170, __in_chrg=<optimized out>) at sw/source/core/access/accmap.cxx:498
1  in SwAccessibleMap::FireEvents() (this=0x8198bb0) at sw/source/core/access/accmap.cxx:3023
2  in SwAccessibleMap::InvalidateCursorPosition(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> const&) (this=0x8198bb0, rAcc=uno::Reference to (SwAccessibleParagraph *) 0x9a439d8) at sw/source/core/access/accmap.cxx:1069
3  in SwAccessibleMap::GetContext(SwFrame const*, bool) (this=0x8198bb0, pFrame=0x825ca10, bCreate=true) at sw/source/core/access/accmap.cxx:1925
4  in SwAccessibleMap::GetContextImpl(SwFrame const*, bool) (this=0x8198bb0, pFrame=0x825ca10, bCreate=true) at sw/source/core/access/accmap.cxx:1936
5  in SwAccessibleContext::InvalidateChildPosOrSize(sw::access::SwAccessibleChild const&, SwRect const&) (this=0x405a350, rChildFrameOrObj=..., rOldFrame=SwRect = {...}) at sw/source/core/access/acccontext.cxx:1196
6  in SwAccessibleMap::FireEvent(SwAccessibleEvent_Impl const&) (this=0x8198bb0, rEvent=...) at sw/source/core/access/accmap.cxx:898
7  in SwAccessibleMap::FireEvents() (this=0x8198bb0) at sw/source/core/access/accmap.cxx:3018
8  in SwViewShellImp::FireAccessibleEvents() (this=0x7744dc0) at sw/source/core/view/viewimp.cxx:460
9  in SwLayIdle::SwLayIdle(SwRootFrame*, SwViewShellImp*) (this=0x7ffc63395e30, pRt=0x7745120, pI=0x7744dc0) at sw/source/core/layout/layact.cxx:2267

Presumably all of mpEvents, mpEventMap and mpShapes must live until
the outermost FireEvents() completes.

Change-Id: I4e5a053035bf7fc12d9407913437d721889950ae
(cherry picked from commit ddf8d9a150e3e1725de65577c48d47918b4b11a8)
Reviewed-on: https://gerrit.libreoffice.org/39566
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
5 years agoUpdated core
Christian Lohmaier [Tue, 4 Jul 2017 22:17:24 +0000 (5 00:17 +0200)]
Updated core
Project: translations  80709c6b726465cc0b3859ec42a50c10845ccc70

update translations for 5.4.0 rc2

and force-fix errors using pocheck

Change-Id: Ia9fda2cbbf1e572cbf585a8284fffbada72d0da2
(cherry picked from commit 60225a1ba7744aef045da360e5dbbfe3261636c2)

5 years agofix m68k build (again)
Rene Engelhard [Mon, 26 Jun 2017 20:18:41 +0000 (26 22:18 +0200)]
fix m68k build (again)

This reverts commit d5d6ee3b3e7cf3d93f892a452244051e4294fe6d and applies
the patch cleanly again. somehow it got mis-applied.

Change-Id: Id199d9086fb8e2e52bb810c8ddcbdd7fa7060676
Reviewed-on: https://gerrit.libreoffice.org/39279
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
Reviewed-on: https://gerrit.libreoffice.org/39511
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
5 years agoUpdated core
Aron Budea [Mon, 19 Jun 2017 22:36:16 +0000 (20 00:36 +0200)]
Updated core
Project: dictionaries  dc0d08d9dcd75895bf1b454330ca14d051cc9f3e

tdf#108439: update Scottish Gaelic dictionary to 3.3

Change-Id: Id08f755bd6e4001d91a5c6129c0d07522d9cefec
Reviewed-on: https://gerrit.libreoffice.org/38986
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
5 years agoSet error on more than max params (255) per function
Eike Rathke [Tue, 4 Jul 2017 13:22:23 +0000 (4 15:22 +0200)]
Set error on more than max params (255) per function

Parameter count is size byte, so.. SUM(1,1,1,...) with 256 arguments resulted
in 0 (uint8 wrapping around).

(cherry picked from commit 209cc5c211260a6c20cc6fb5ac02fd5a88100314)

Change-Id: Ib9997ad0d0d13d4c5171f276148b6c5cad570d5b
Reviewed-on: https://gerrit.libreoffice.org/39505
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
5 years agoBreak solenv/bin/assemble-flatpak.sh out of dev-tools flatpak/build.sh
Stephan Bergmann [Tue, 4 Jul 2017 15:09:16 +0000 (4 17:09 +0200)]
Break solenv/bin/assemble-flatpak.sh out of dev-tools flatpak/build.sh

,,,in preparation of moving to a flatpak-builder manifest.json approach

Change-Id: Ie9e90a85cc6e94ff7191161085c6e607512db0c4
(cherry picked from commit 19c13650c81ae7e0ad6cf0d7b8661f8440ee7892)
Reviewed-on: https://gerrit.libreoffice.org/39508
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
5 years agoxmlsecurity: implement support for building against system-xmlsec
Miklos Vajna [Wed, 21 Jun 2017 19:59:11 +0000 (21 21:59 +0200)]
xmlsecurity: implement support for building against system-xmlsec

The only remaining difference is that in the system-xmlsec case we work
with the default key manager, not with the one that's only added by our
xmlsec patches.

This works for me for the uses I know of (see
<https://lists.freedesktop.org/archives/libreoffice/2017-February/076947.html>
for the motivation): signing and verifying of different signatures (bad
signature, good with non-trusted CA, good with trusted CA) with
software-based certificates all behave as expected.

Change-Id: If3f3e2b8373ab7397db3f98070a5a2ce51fa7c06
Reviewed-on: https://gerrit.libreoffice.org/39075
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/39274
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
5 years agoxmlsecurity nss: adopt the private key of the signing certificate explicitly
Miklos Vajna [Tue, 20 Jun 2017 19:47:38 +0000 (20 21:47 +0200)]
xmlsecurity nss: adopt the private key of the signing certificate explicitly

xmlsec1-customkeymanage.patch.1 of our bundled xmlsec extends
xmlSecNssKeyDataX509VerifyAndExtractKey(), so that it calls
xmlSecNssPKIAdoptKey() for the private key of the signing certificate.
Make this explicit in xmlsecurity/ code, so we don't depend on the
patched xmlSecNssKeyDataX509VerifyAndExtractKey().

This is harmless for the patched xmlsec, but it prevents this error:

warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48: keys.c:1246: xmlSecKeysMngrGetKey() '' 'xmlSecKeysMngrFindKey' 1 ' '
warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48: xmldsig.c:790: xmlSecDSigCtxProcessKeyInfoNode() '' '' 45 'details=NULL'
warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48: xmldsig.c:503: xmlSecDSigCtxProcessSignatureNode() '' 'xmlSecDSigCtxProcessKeyInfoNode' 1 ' '
warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48: xmldsig.c:286: xmlSecDSigCtxSign() '' 'xmlSecDSigCtxSignatureProcessNode' 1 ' '

when xmlsec is not patched.

(This is needed, but not enough to build against system xmlsec.)

Change-Id: I5d68a8be7aefcb529566213f9b9c2985eab6a80a
Reviewed-on: https://gerrit.libreoffice.org/39023
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/39273
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
5 years agotdf#105095 DOCX import: conditionally ignore leading tab in footnotes
Miklos Vajna [Tue, 4 Jul 2017 06:51:53 +0000 (4 08:51 +0200)]
tdf#105095 DOCX import: conditionally ignore leading tab in footnotes

Commit b38629ae210b204a6d24d6e9c5c62eaaf563d494 (cp#1000017 DOCX/RTF
import: avoid fake tab char in footnotes, 2013-12-05) added code to
strip leading tabs from footnote text to improve odt->docx->odt rountrip
experience.

Turns out that this is correct only in case the gap between the footnote
number and the content is provided by a paragraph margin. In case there
is no such margin, then the tab is wanted; so only conditionally ignore
such leading tab characters.

(cherry picked from commit abc440a691efb872afac385ce5ed28cd5db56c8c)

Change-Id: I9d419bf2fd3b4899208489210cbe9809a2ab0736
Reviewed-on: https://gerrit.libreoffice.org/39494
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
5 years agonotify the clipboard terminate listener before any other terminate listener
Markus Mohrhard [Fri, 30 Jun 2017 21:23:36 +0000 (30 23:23 +0200)]
notify the clipboard terminate listener before any other terminate listener

Otherwise we may have destroyed a service that is needed to generate
one of the clipboard formats requested by the system clipboard.

Change-Id: Id05de3ac569e3ed38cd97efc4c48326bc6a8db0b
Reviewed-on: https://gerrit.libreoffice.org/39429
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 7250bc4721b334714bb0fa1345211c83330f94b2)
Reviewed-on: https://gerrit.libreoffice.org/39489
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
5 years agotdf#107505: Impress - crash with two people co-editing one slide
Tamás Zolnai [Sat, 1 Jul 2017 12:48:22 +0000 (1 14:48 +0200)]
tdf#107505: Impress - crash with two people co-editing one slide

In tiledrendering mode cursor inside shapes are not handled very well now.
Different LO instances manipulates the same cursor instead of having
one separate cursor for all instances (as in case of simple text editing
in Writer).

Crashes caused by that one cursor is owned (created and destroyed) by one
LO instance but used by an other instance in the meantime. We can avoid
this by not making this cursor available to the other instances. Cursor is
hidden anyway so don't need to have it set to the corresponding Window.

Change-Id: Id78f79e73eda88f3c2c6aa7f534c32f3f8aba174
Reviewed-on: https://gerrit.libreoffice.org/39432
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 258df6f41d89a606a980942df6337d446634c0a6)
Reviewed-on: https://gerrit.libreoffice.org/39435
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agoResolves: tdf#108452 gtk3 xbm cursors invisible on black bg
Caolán McNamara [Thu, 22 Jun 2017 10:47:29 +0000 (22 11:47 +0100)]
Resolves: tdf#108452 gtk3 xbm cursors invisible on black bg

Change-Id: I5c9b27862da6ac76ae38542f85a51f9aefdd013d
Reviewed-on: https://gerrit.libreoffice.org/39112
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#108836 sw: don't enable Undo if Steps configured to 0
Michael Stahl [Thu, 29 Jun 2017 13:04:04 +0000 (29 15:04 +0200)]
tdf#108836 sw: don't enable Undo if Steps configured to 0

It doesn't work.

Change-Id: Iafc3eb50f481faffee60592aa3b6fd2ed4387b90
(cherry picked from commit 5c4a9dfdc01606e0a35c5e2809571d0f6f03df39)
Reviewed-on: https://gerrit.libreoffice.org/39390
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#108863 svx: fix use-after-free in SdrEditView::DeleteMarkedObj()
Michael Stahl [Fri, 30 Jun 2017 10:43:21 +0000 (30 12:43 +0200)]
tdf#108863 svx: fix use-after-free in SdrEditView::DeleteMarkedObj()

The sdr::ViewSelection has multiple vectors with pointers to the same
SdrObjects, and those are only cleared in
sdr::ViewSelection::SetEdgesOfMarkedNodesDirty(), so deleting SdrObjects
that are marked must be delayed until after that is called.

(cherry picked from commit a54ba50db2c341f0f0e47d77dbe64a6e588bc911)

loplugin:unusedvariablecheck

leftover from a54ba50db2c341f0f0e47d77dbe64a6e588bc911 "tdf#108863 svx: fix use-
after-free in SdrEditView::DeleteMarkedObj()"
(cherry picked from commit 77f98204ba2fbb51b0a0bb2ac94b839249eec9a4)

Change-Id: I7ab18cb2116164a71dce29bf10eca974061ab424
Reviewed-on: https://gerrit.libreoffice.org/39418
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#108838 accessibility: fix horrible memory leak in AccessibleTabBarBase
Michael Stahl [Fri, 30 Jun 2017 13:23:15 +0000 (30 15:23 +0200)]
tdf#108838 accessibility: fix horrible memory leak in AccessibleTabBarBase

Reproducing tdf#108833 failed because applying the Master Page takes
> 2 hours; the time is spent calling vcl::Window listeners, of which
there were some 39525 after a couple minutes, almost all of which
AccessibleTabBarBase.

AccessibleTabBarBase::WindowEventListener() has an inverted condition
that suppresses the event that is generated from TabBar::Clear()
and thus when DrawViewShell::ResetActualPage() calls Clear() no
AccessibleTabBarPage is removed but then the InsertPage() calls create
duplicate objects that again register as listeners.

The condition is obviously inverted given the CVS commit message:

1.2.88.1
log
@#135353# do not pass VCLEVENT_TABBAR_PAGEREMOVED (all) to objects other than AccessibleTabBarPageList
@
text
a69 8

        if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) &&
            ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TAB_PAGE_NOTFOUND ) &&
            ( dynamic_cast< AccessibleTabBarPageList *> (this) != NULL ) )
        {
            return 0;
        }

Change-Id: I2a3b86bbd0f0251a966f41b316a3b313517df24f
(cherry picked from commit b2b085441dc79fb78607dbf1969c12a40db58214)
Reviewed-on: https://gerrit.libreoffice.org/39419
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#108833 sd: don't unconditionally enable Undo after import
Michael Stahl [Fri, 30 Jun 2017 14:13:06 +0000 (30 16:13 +0200)]
tdf#108833 sd: don't unconditionally enable Undo after import

Change-Id: Id637e649ccf3782658832d909b3a7150a0606229
(cherry picked from commit 3d59018b1ed816b4399cad4c2c4818cf25d4f4a1)
Reviewed-on: https://gerrit.libreoffice.org/39420
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#108863 sd: disable Undo earlier if no Undo Steps
Michael Stahl [Fri, 30 Jun 2017 10:39:26 +0000 (30 12:39 +0200)]
tdf#108863 sd: disable Undo earlier if no Undo Steps

If 0 Undo Steps, the Undo is disabled by a timer somewhere calling
SfxShell::SetUndoManager().  This seems a bit risky, so disable it
already when the sd::UndoManager is created.

Change-Id: I9caf14fe32251d1f92cb5fa0683838316275eab3
(cherry picked from commit 495284716f49072e432b8425944cc67dfe0df0e0)
Reviewed-on: https://gerrit.libreoffice.org/39417
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#101821 sw: fix layout footnote use-after-free
Michael Stahl [Wed, 21 Jun 2017 10:26:19 +0000 (21 12:26 +0200)]
tdf#101821 sw: fix layout footnote use-after-free

After inserting a header in the bugdoc, during SwFrame::Calc of a
SwTextFrame that is in a footnote, it decides move forward to the next
page.  This deletes the SwFootnoteFrame and SwFootnoteContFrame that
lcl_FormatContentOfLayoutFrame() are iterating over.

For want of a more elegant solution, use a big hammer to prevent the
problem and try to clean up so that no empty SwFootnoteFrame and
SwFootnoteContFrame remain (as that is known to crash in other places,
see commit c9fb347642729017ad0c613fe26310befd021db8)

Invalid read of size 8
   at 0x414E1F96: SwFrame::GetNext() (frame.hxx:485)
   by 0x41AFDD07: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:646)
   by 0x41AFDCC0: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:642)
   by 0x41AFDCC0: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:642)
   by 0x41AFDEA7: SwObjectFormatterTextFrame::FormatAnchorFrameAndItsPrevs(SwTextFrame&) (objectformattertxtfrm.cxx:696)
   by 0x41AAA680: SwFlyAtContentFrame::MakeAll(OutputDevice*) (flycnt.cxx:415)
   by 0x41A7F211: SwFrame::PrepareMake(OutputDevice*) (calcmove.cxx:346)
   by 0x41B75758: SwFrame::Calc(OutputDevice*) const (trvlfrm.cxx:1761)
   by 0x41AA8927: SwFlyFrame::Calc(OutputDevice*) const (fly.cxx:2559)
   by 0x41ADB36B: SwLayAction::FormatLayoutFly(SwFlyFrame*) (layact.cxx:1414)
   by 0x41AF9658: SwObjectFormatter::FormatObj_(SwAnchoredObject&) (objectformatter.cxx:321)
   by 0x41AFCB6E: SwObjectFormatterTextFrame::DoFormatObj(SwAnchoredObject&, bool) (objectformattertxtfrm.cxx:126)
   by 0x41AF9A6A: SwObjectFormatter::FormatObjsAtFrame_(SwTextFrame*) (objectformatter.cxx:443)
   by 0x41AFD275: SwObjectFormatterTextFrame::DoFormatObjs() (objectformattertxtfrm.cxx:328)
   by 0x41AF924A: SwObjectFormatter::FormatObjsAtFrame(SwFrame&, SwPageFrame const&, SwLayAction*) (objectformatter.cxx:191)
   by 0x41ADC213: SwLayAction::FormatContent(SwPageFrame const*) (layact.cxx:1633)
   by 0x41AD88DE: SwLayAction::InternalAction(OutputDevice*) (layact.cxx:760)
   by 0x41AD7080: SwLayAction::Action(OutputDevice*) (layact.cxx:351)
   by 0x41ADE32E: SwLayIdle::SwLayIdle(SwRootFrame*, SwViewShellImp*) (layact.cxx:2133)
   by 0x41FFC97E: SwViewShell::LayoutIdle() (viewsh.cxx:711)
 Address 0x505541a8 is 72 bytes inside a block of size 272 free'd
   at 0x4C2F21A: operator delete(void*) (vg_replace_malloc.c:576)
   by 0x41AD371A: SwFootnoteFrame::~SwFootnoteFrame() (ftnfrm.hxx:52)
   by 0x41B5B74C: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:391)
   by 0x41A97294: SwFlowFrame::CutTree(SwFrame*) (flowfrm.cxx:406)
   by 0x41A979AE: SwFlowFrame::MoveSubTree(SwLayoutFrame*, SwFrame*) (flowfrm.cxx:592)
   by 0x41ACFB69: SwContentFrame::MoveFootnoteCntFwd(bool, SwFootnoteBossFrame*) (ftnfrm.cxx:2756)
   by 0x41A9B78E: SwFlowFrame::MoveFwd(bool, bool, bool) (flowfrm.cxx:1813)
   by 0x41A85864: SwContentFrame::MakeAll(OutputDevice*) (calcmove.cxx:1681)
   by 0x41A7F211: SwFrame::PrepareMake(OutputDevice*) (calcmove.cxx:346)
   by 0x41B75758: SwFrame::Calc(OutputDevice*) const (trvlfrm.cxx:1761)
   by 0x41AFDCFB: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:644)
   by 0x41AFDCC0: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:642)
   by 0x41AFDCC0: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:642)
   by 0x41AFDCC0: lcl_FormatContentOfLayoutFrame(SwLayoutFrame*, SwFrame*) (objectformattertxtfrm.cxx:642)
   by 0x41AFDEA7: SwObjectFormatterTextFrame::FormatAnchorFrameAndItsPrevs(SwTextFrame&) (objectformattertxtfrm.cxx:696)
   by 0x41AAA680: SwFlyAtContentFrame::MakeAll(OutputDevice*) (flycnt.cxx:415)
   by 0x41A7F211: SwFrame::PrepareMake(OutputDevice*) (calcmove.cxx:346)
   by 0x41B75758: SwFrame::Calc(OutputDevice*) const (trvlfrm.cxx:1761)
   by 0x41AA8927: SwFlyFrame::Calc(OutputDevice*) const (fly.cxx:2559)
   by 0x41ADB36B: SwLayAction::FormatLayoutFly(SwFlyFrame*) (layact.cxx:1414)
   by 0x41AF9658: SwObjectFormatter::FormatObj_(SwAnchoredObject&) (objectformatter.cxx:321)
   by 0x41AFCB6E: SwObjectFormatterTextFrame::DoFormatObj(SwAnchoredObject&, bool) (objectformattertxtfrm.cxx:126)
   by 0x41AF9A6A: SwObjectFormatter::FormatObjsAtFrame_(SwTextFrame*) (objectformatter.cxx:443)
   by 0x41AFD275: SwObjectFormatterTextFrame::DoFormatObjs() (objectformattertxtfrm.cxx:328)
   by 0x41AF924A: SwObjectFormatter::FormatObjsAtFrame(SwFrame&, SwPageFrame const&, SwLayAction*) (objectformatter.cxx:191)
   by 0x41ADC213: SwLayAction::FormatContent(SwPageFrame const*) (layact.cxx:1633)
   by 0x41AD88DE: SwLayAction::InternalAction(OutputDevice*) (layact.cxx:760)
   by 0x41AD7080: SwLayAction::Action(OutputDevice*) (layact.cxx:351)
   by 0x41ADE32E: SwLayIdle::SwLayIdle(SwRootFrame*, SwViewShellImp*) (layact.cxx:2133)
   by 0x41FFC97E: SwViewShell::LayoutIdle() (viewsh.cxx:711)

Change-Id: I656cc2303eeccd5eef68ad3b8e81bb0fd47b94fb
(cherry picked from commit 9dcb767c5bdccdf6606240afd6aa2c6bd3dcc9f4)
Reviewed-on: https://gerrit.libreoffice.org/39102
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#108826 sw: also handle RES_REMOVE_UNO_OBJECT in SwCallMouseEvent
Michael Stahl [Wed, 28 Jun 2017 14:30:28 +0000 (28 16:30 +0200)]
tdf#108826 sw: also handle RES_REMOVE_UNO_OBJECT in SwCallMouseEvent

This is sent from SwUndoFlyBase::DelFly(); the SwFrameFormat isn't
deleted in this case but it's no longer part of the document, so
an UI class like SwCallMouseEvent should stop pointing to it.

Change-Id: I05349271d14bb1948ea30528cd85c68ed638f28e
(cherry picked from commit e7c6301e707fcc461bdda5ac74c7499f568ff716)
Reviewed-on: https://gerrit.libreoffice.org/39362
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#101821 sw: layout: don't move endnotes into footnotes' container
Michael Stahl [Mon, 19 Jun 2017 09:40:12 +0000 (19 11:40 +0200)]
tdf#101821 sw: layout: don't move endnotes into footnotes' container

The bugdoc has a single 1-column section from start to end, no
footnotes but lots of endnotes, and the section has the settings
"Footnotes - collect at end of text" unchecked and "Endnotes - collect
at end of section" checked.

This means that the SwFootnoteContFrame for footnotes would be put
directly below the SwPageFrame (so that multiple sections on a single
page can share it), but the SwFootnoteContFrame for the endnotes is
put below the SwColumnFrame (which is created despite only 1 column)
below the SwSectionFrame.

Hence content in endnotes has the mbInfSct flag set, and the crash
happens because the endnotes are moved from below the SwSectionFrame to
a new SwFootnoteContFrame that is directly below a SwPageFrame, without
clearing the mbInfSct flag.

Fix the wrong call in SwFootnoteBossFrame::MoveFootnotes_() to
FindFootnoteBossFrame() that resulted in the wrong (unsuitable for
endnotes) SwFootnoteContFrame to be used as the target for the move.

Change-Id: I64f6b86441e5ac1f16433f005e97c274a1c69dfa
(cherry picked from commit 4c0b3520b66477334a7971dbed7ffcdcd265e749)
Reviewed-on: https://gerrit.libreoffice.org/39101
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agoRevert "Workaround to call /app/bin/xdg-open when run under flatpak"
Stephan Bergmann [Mon, 3 Jul 2017 16:12:47 +0000 (3 18:12 +0200)]
Revert "Workaround to call /app/bin/xdg-open when run under flatpak"

This reverts commit 28a03248b1d1649e157b788e43dfe8326f165379 (and removes a
stry empty line).  There is no more need for our own /app/bin/xdg-open, as
xdg-open in the freedesktop.org (and thus also GNOME) runtime (see
<https://github.com/flatpak/flatpak-xdg-utils/blob/master/src/xdg-open.c>) by
now knows to ask the Desktop portal, too.

Change-Id: Ie4141d02ba5f43c0264afcfae9edfc2d3a8cdb16
(cherry picked from commit da5356b099c2504b3e9238f1afce410233847f9d)
Reviewed-on: https://gerrit.libreoffice.org/39483
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
5 years agotdf#108789: branch 5.4 only
Lionel Elie Mamane [Sun, 25 Jun 2017 15:21:45 +0000 (25 17:21 +0200)]
tdf#108789: branch 5.4 only

 - Calc: make the complete "what encoding to use" decision before
         calling the connectivity driver, so that the driver has
         no ambiguity about whether it should override our setting
         or not.

         To this end, factorise the part of the driver that reads
         the encoding from the file header into dbtools.

- Calc: don't ask for encoding when the file's header give the encoding.

- don't confuse CP850 (the default) and "don't know", including:
  * don't ignore CP850 user setting
  * don't overwrite user setting with CP850

Cherry-pick:
- https://cgit.freedesktop.org/libreoffice/core/commit/?id=7f1465a9599e9665159dd2d823a6e9064cca5703
- https://cgit.freedesktop.org/libreoffice/core/commit/?id=857d64ed3ebbeb0ee4e8a75bfeaa4eb406944571
- https://cgit.freedesktop.org/libreoffice/core/commit/?id=9170d10cc57c3f0f3e82b27ce4b2cd9c897e669d

Change-Id: Id80b7c505858b88f717b0ce6bd890527909e5fd1
Reviewed-on: https://gerrit.libreoffice.org/39451
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Jenkins <ci@libreoffice.org>
5 years agotdf#108609 rtl mode set on ruler when it should be ltr
Noel Grandin [Mon, 3 Jul 2017 14:04:58 +0000 (3 16:04 +0200)]
tdf#108609 rtl mode set on ruler when it should be ltr

regression from
commit 8ccbc16b5e3f94b8db105232d7085a8553e6bc03
"convert SvxFrameDirection to scoped enum"

Change-Id: I2063ddf4344fb41b54f2ad96a471df4d3205406d
Reviewed-on: https://gerrit.libreoffice.org/39478
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit eb104a28daf5b17f24c95da637fc292593eea99b)
Reviewed-on: https://gerrit.libreoffice.org/39485
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
5 years agohandle SID_ENCRYPTIONDATA for shared password protected docs, tdf#56173
Markus Mohrhard [Wed, 28 Jun 2017 00:15:04 +0000 (28 02:15 +0200)]
handle SID_ENCRYPTIONDATA for shared password protected docs, tdf#56173

Change-Id: Iadfe880b7be3186410a08568844d8812f176005d
Reviewed-on: https://gerrit.libreoffice.org/39332
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 669c12d59b6131f44945f166c77ae98df52ebb9e)
Reviewed-on: https://gerrit.libreoffice.org/39336
Reviewed-by: Eike Rathke <erack@redhat.com>
5 years agofix crash on windows with nullptr in operator<<
Markus Mohrhard [Fri, 30 Jun 2017 12:39:08 +0000 (30 14:39 +0200)]
fix crash on windows with nullptr in operator<<

E.g. http://crashreport.libreoffice.org/stats/crash_details/8962b764-6550-45c9-b08b-e99f5c968d61

Change-Id: I1153c0ab35266006ada10611e79b770ef1c0cd4f
Reviewed-on: https://gerrit.libreoffice.org/39413
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-on: https://gerrit.libreoffice.org/39424
Reviewed-by: Eike Rathke <erack@redhat.com>
5 years agoalways import page scaling, tdf#65848
Markus Mohrhard [Wed, 28 Jun 2017 02:16:51 +0000 (28 04:16 +0200)]
always import page scaling, tdf#65848

Change-Id: If5bad2336443280dd33d750b1b2749a06f2b5101
Reviewed-on: https://gerrit.libreoffice.org/39334
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit fef72f9623bac7f9aa50b4f2606e6ec6282cfe1f)
Reviewed-on: https://gerrit.libreoffice.org/39339
Reviewed-by: Eike Rathke <erack@redhat.com>
5 years agowe need gpgme header, too
Lionel Elie Mamane [Wed, 28 Jun 2017 01:55:00 +0000 (28 03:55 +0200)]
we need gpgme header, too

not only gpgmepp headers

Change-Id: I46723ce751d631e165982c6c7bc2f820f9a5d0a8
Reviewed-on: https://gerrit.libreoffice.org/39484
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
5 years agotdf#108622: use correct type for last check timestamp during autocorrect
Aron Budea [Fri, 30 Jun 2017 21:57:35 +0000 (30 23:57 +0200)]
tdf#108622: use correct type for last check timestamp during autocorrect

It's only supposed to check the files once every 2-mins, with
mismatching type that happens each time.

Change-Id: Ie9243cf928d952e28989dd981508de86cb7dbddb
Reviewed-on: https://gerrit.libreoffice.org/39428
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 51f616ddd7a2e3310e1b30dbd73d90e5138980ea)
Reviewed-on: https://gerrit.libreoffice.org/39443

5 years agopBASM can be nullptr in copy docs, e.g. during insert sheet from doc
Markus Mohrhard [Fri, 30 Jun 2017 11:59:57 +0000 (30 13:59 +0200)]
pBASM can be nullptr in copy docs, e.g. during insert sheet from doc

Found through http://crashreport.libreoffice.org/stats/crash_details/3bd264ba-ec12-476a-9bb4-e832caca3445

Change-Id: I0a4e6dddca61a2538c0fe6bbc51770a9886c464d
Reviewed-on: https://gerrit.libreoffice.org/39411
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit caf1ddedbef77ac648d8b8b35978a0613aa77da6)
Reviewed-on: https://gerrit.libreoffice.org/39423
Reviewed-by: Eike Rathke <erack@redhat.com>
5 years agofix SDK paths (especially cat/sed) in bin/distro-install-sdk
Rene Engelhard [Mon, 26 Jun 2017 19:18:00 +0000 (26 21:18 +0200)]
fix SDK paths (especially cat/sed) in bin/distro-install-sdk

wonder how that ever worked. cat and sed are in /bin, not /usr/bin.
Appparetly the BSDs have them there, though, so generalize though this
is for distros and it probably shouldn't matter.

Change-Id: I6efb3e92b8f8d15f3671090a3eaa9d8836f9998f
Reviewed-on: https://gerrit.libreoffice.org/39276
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
Reviewed-on: https://gerrit.libreoffice.org/39447
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
5 years agoUpdated core
Olivier Hallot [Mon, 3 Jul 2017 01:10:08 +0000 (2 22:10 -0300)]
Updated core
Project: help  610919cb26ee24329ca3ba90d0b3074fcc1acef1

tdf#108871 Fix embed of RAWSUBTRACT in Help

Fix also COLOR.

Change-Id: I159b20f36e1452864fa466584ff2de283251f11c
Reviewed-on: https://gerrit.libreoffice.org/39459
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
5 years agoxmlsecurity: avoid crash on empty security context
Thorsten Behrens [Sat, 1 Jul 2017 08:22:06 +0000 (1 10:22 +0200)]
xmlsecurity: avoid crash on empty security context

This should prevent 8cf224c2-f9b9-44e1-9cb0-fc452e570886

Change-Id: I1ad4d8437923eb677d574c2c469cc62378c9c7a6
Reviewed-on: https://gerrit.libreoffice.org/39430
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 01985fd8fccf46749b74ee733391ce8b6ec1f1f8)
Reviewed-on: https://gerrit.libreoffice.org/39444

5 years agoResolves: tdf#108796 let ScViewData::InsertTabs() insert the correct amount
Eike Rathke [Wed, 28 Jun 2017 16:51:16 +0000 (28 18:51 +0200)]
Resolves: tdf#108796 let ScViewData::InsertTabs() insert the correct amount

... at the correct position. This only ever worked by chance, if at all, and
now surfaced after

    commit 73dec49802ef8fc42c5719efaa42a33cde68e569
    Date:   Tue Mar 7 10:46:12 2017 +0100

Change-Id: I9bd0aeb5a471bd644c1497306effe9045c1daa97
(cherry picked from commit c9591f3b6153614c9849b8afbdcacbecc99c1f7c)
Reviewed-on: https://gerrit.libreoffice.org/39373
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
5 years agotdf#108794 gpg4libre: Use key id to get the right key
Samuel Mehrbrodt [Tue, 27 Jun 2017 14:33:59 +0000 (27 16:33 +0200)]
tdf#108794 gpg4libre: Use key id to get the right key

Change-Id: I5950d192e19e652cbb7680db426bfbd28907a1cb
Reviewed-on: https://gerrit.libreoffice.org/39308
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 0d7b437260ec991ee70769e7fb1002973e431f12)
Reviewed-on: https://gerrit.libreoffice.org/39346
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
5 years agoDon't let m_nGrabLevel become negative, tdf#108705 related
Eike Rathke [Thu, 29 Jun 2017 12:02:58 +0000 (29 14:02 +0200)]
Don't let m_nGrabLevel become negative, tdf#108705 related

... which then later leads to 2 Giga loops on the next GtkSalFrame dtor call,
for example on the second AutoFilter button popup in Calc.

Fall-out from

    commit 9b32355ea6d8d5e34363ba0c57e74d75d7a7b1b7
    Date:   Fri Jun 23 12:48:12 2017 +0100

        Resolves: tdf#108705 remove grabs on widget before destroying it

that brought this to surface.

Change-Id: I0edb7eec9384c716800f07ef1ed91fc8f1d7c119
(cherry picked from commit 637d917d7551fed19c9685f974fb3e732a8f97e2)
Reviewed-on: https://gerrit.libreoffice.org/39387
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
5 years agotdf#100075 DOCX frame height rule updated
Vasily Melenchuk [Tue, 20 Jun 2017 11:20:31 +0000 (20 14:20 +0300)]
tdf#100075 DOCX frame height rule updated

According to "[MS-OE376]: Office Implementation Information for
ECMA-376 Standards Support" Word treats default value for
hRule attribute in a different way: if frame height is missing it
is "auto" (as in specification), but if frame height exist, then
default value for hRule is "atLeast".

Change-Id: I0ce30b61d1a6b85febbbd8a6bf5af3eb1bb2767f
Reviewed-on: https://gerrit.libreoffice.org/39065
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit d5b19100ca4d3670d1b5367e8000739af60a6892)
Reviewed-on: https://gerrit.libreoffice.org/39384
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
5 years agogpg4libre: Don't call production code inside an assert()
Samuel Mehrbrodt [Wed, 28 Jun 2017 07:12:35 +0000 (28 09:12 +0200)]
gpg4libre: Don't call production code inside an assert()

Won't work in non-debug builds

Change-Id: I64f9c416890ddd02ec8efc0f59ded145cc17896a
Reviewed-on: https://gerrit.libreoffice.org/39345
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 9a884b3d055ffdedbadb64c7f14e6d38078dedb1)
Reviewed-on: https://gerrit.libreoffice.org/39353
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
5 years agotdf#108798 Make CanSignWithGPG work with PDF docs
Samuel Mehrbrodt [Tue, 27 Jun 2017 14:37:06 +0000 (27 16:37 +0200)]
tdf#108798 Make CanSignWithGPG work with PDF docs

Change-Id: I09aa030bed3d6ce51ef71d8bab905b01fab5b699
Reviewed-on: https://gerrit.libreoffice.org/39309
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 84dfff475c1f25319bc22c7b6ad437d5501a7dc4)
Reviewed-on: https://gerrit.libreoffice.org/39349
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
5 years agoUpdated core
Andras Timar [Wed, 28 Jun 2017 08:25:59 +0000 (28 10:25 +0200)]
Updated core
Project: translations  f3390ac0c16dcebcdd148cf7d1549c77995b90ea

Updated Slovenian translation

Change-Id: I4a3d7f470adb8ca01da3208ff8b56de752c48c27

5 years agotdf#108692 gpg4libre: List all gpg keys
Samuel Mehrbrodt [Fri, 23 Jun 2017 08:18:01 +0000 (23 10:18 +0200)]
tdf#108692 gpg4libre: List all gpg keys

Change-Id: I7300da36215233fa91b7a04a42b1c9bf907ad78b
(cherry picked from commit 91ffe409e35479d024f629fe1b5ce474993a0f54)
Reviewed-on: https://gerrit.libreoffice.org/39163
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
5 years agotdf#108711 GPG key selection should only be possible for ODF >= 1.2 documents
Samuel Mehrbrodt [Mon, 26 Jun 2017 10:32:48 +0000 (26 12:32 +0200)]
tdf#108711 GPG key selection should only be possible for ODF >= 1.2 documents

gpg4libre

Change-Id: I6dbdaefddacf55c9381d156ada20cb3f25d4b3cb
Reviewed-on: https://gerrit.libreoffice.org/39263
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit e2378bbf4539455e445205ad868c43246ec423ed)
Reviewed-on: https://gerrit.libreoffice.org/39287
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
5 years agoResolves: tdf#108708 set a min width for calc dropdown combobox button
Caolán McNamara [Fri, 23 Jun 2017 15:17:29 +0000 (23 16:17 +0100)]
Resolves: tdf#108708 set a min width for calc dropdown combobox button

Change-Id: I002350170cf30a3347ed0c4e4885109ef194458e
Reviewed-on: https://gerrit.libreoffice.org/39179
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
5 years agotdf#108814 sfx2: fix crash in sidebar when XUpdateModel not implemented
Michael Stahl [Tue, 27 Jun 2017 15:32:16 +0000 (27 17:32 +0200)]
tdf#108814 sfx2: fix crash in sidebar when XUpdateModel not implemented

com.sun.star.ui.XUpdateModel was added in 5.1 so pre-existing extensions
don't implement it.

(regression from 0635208edf1cdee4235ea87666a473ac81007555)

Change-Id: I6749a9cf2fc82b9cd90d85a682247104e369e167
(cherry picked from commit d109948f0dd4190d7aca1e0fa7e2706ef3f40a6c)
Reviewed-on: https://gerrit.libreoffice.org/39311
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
5 years agogpg4libre: import public key payload if initial validation fails
Thorsten Behrens [Fri, 23 Jun 2017 23:55:36 +0000 (24 01:55 +0200)]
gpg4libre: import public key payload if initial validation fails

Since maybe we don't know the key yet?

Change-Id: I8b7e3f472d4731d9fb8bb675d81bdad257aa9230
Reviewed-on: https://gerrit.libreoffice.org/39194
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 2274deda0185f2f4b153a16f46a6a668394d3458)
Reviewed-on: https://gerrit.libreoffice.org/39236
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
5 years agogpg4libre: save some space, extract binary key/sign data
Thorsten Behrens [Fri, 23 Jun 2017 22:50:31 +0000 (24 00:50 +0200)]
gpg4libre: save some space, extract binary key/sign data

Since callers will base64-encode this anyway, again

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

Change-Id: I0962d102fa0f2b95eaa2e608539cc291125f0321
Reviewed-on: https://gerrit.libreoffice.org/39237
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
5 years agogpg4libre: Warn before removing document signatures
Katarina Behrens [Mon, 19 Jun 2017 13:08:20 +0000 (19 15:08 +0200)]
gpg4libre: Warn before removing document signatures

simple version, no "do not show this message again" checkbox

Change-Id: Iba8ac8cda51acac748174c864aa5c205f2efcc8f
Reviewed-on: https://gerrit.libreoffice.org/38962
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 7be0d5490517d41c20f99a006edb9fa651ce3d85)
Reviewed-on: https://gerrit.libreoffice.org/39147
Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
Reviewed-by: Sophie Gautier <gautier.sophie@gmail.com>
5 years agogpg4libre: Show certificate kind OpenPGP vs. X509 as 1 table column
Katarina Behrens [Tue, 20 Jun 2017 12:21:06 +0000 (20 14:21 +0200)]
gpg4libre: Show certificate kind OpenPGP vs. X509 as 1 table column

Shuffled the columns around a little bit

Change-Id: Ib0a979458db680d712737ff997e1c3b4e4564f3f
Reviewed-on: https://gerrit.libreoffice.org/38984
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 72f84c1a0efbce8da02cbf6d5947d2ddfd45c533)
Reviewed-on: https://gerrit.libreoffice.org/39148
Reviewed-by: Sophie Gautier <gautier.sophie@gmail.com>
Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
5 years agoofz#2392 restored props don't match saved props
Caolán McNamara [Mon, 26 Jun 2017 12:21:49 +0000 (26 13:21 +0100)]
ofz#2392 restored props don't match saved props

Change-Id: Idb198f0121ac9c6b4083b157af07c5eb1cda66cb
Reviewed-on: https://gerrit.libreoffice.org/39266
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
5 years agogpg4libre: base64-encode and decode SignatureValue
Thorsten Behrens [Fri, 23 Jun 2017 22:40:05 +0000 (24 00:40 +0200)]
gpg4libre: base64-encode and decode SignatureValue

which xmldsig-core actually requires

Change-Id: I92a6e192865919d844009be042dad36106a19fc8
Reviewed-on: https://gerrit.libreoffice.org/39192
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 52b3ae1c08803fe370960f80668e3fb715617358)
Reviewed-on: https://gerrit.libreoffice.org/39231
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
5 years agogpp4libre: error handling, proper key extraction
Thorsten Behrens [Fri, 23 Jun 2017 22:17:04 +0000 (24 00:17 +0200)]
gpp4libre: error handling, proper key extraction

Change-Id: I1cb219f825393309219a4ebfb406482050b91228
Reviewed-on: https://gerrit.libreoffice.org/39191
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 879fea59a0bcc1a439e51ab0923e1cc41dff5bfb)
Reviewed-on: https://gerrit.libreoffice.org/39230
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
5 years agotdf#98800 Enable Next button on the third page of the MM Wizard
Gabor Kelemen [Thu, 8 Jun 2017 05:18:53 +0000 (8 07:18 +0200)]
tdf#98800 Enable Next button on the third page of the MM Wizard

This seems to enable and disable the Next button even if the
'This page shall' checkbox is already enabled after a previous run.

Change-Id: I9cba7649b9cd1df110c5a120d4eea3d97b3afcf1
Reviewed-on: https://gerrit.libreoffice.org/38553
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 511c16bd8c8671f43d2ff93f845209e733c6ae4d)
Reviewed-on: https://gerrit.libreoffice.org/39207

5 years agotdf#108732 ListBox: in absence of a field, treat data as string
Lionel Elie Mamane [Sat, 24 Jun 2017 13:10:59 +0000 (24 15:10 +0200)]
tdf#108732 ListBox: in absence of a field, treat data as string

so that one meaningfully compare it; default is DataType::OTHER,
which is not comparable

Change-Id: Ifc1e1c9b801f45d0a95a83d30cc205b91e647880
Reviewed-on: https://gerrit.libreoffice.org/39212
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
5 years agoupload poppler 0.56.0
David Tardon [Sat, 24 Jun 2017 08:08:54 +0000 (24 10:08 +0200)]
upload poppler 0.56.0

Change-Id: If61037a2df12fd7389f46913d96f4b386460fc76
Reviewed-on: https://gerrit.libreoffice.org/39205
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 8222d14cb5fc8f7b46e068b4b3f86cc867e05972)
Reviewed-on: https://gerrit.libreoffice.org/39233
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>