df-libreoffice:libreoffice-5-4-6

Last commit made on 2018-03-14
Get this branch:
git clone -b libreoffice-5-4-6 https://git.launchpad.net/df-libreoffice
Members of The Document Foundation can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
libreoffice-5-4-6
Repository:
lp:df-libreoffice

Recent commits

1df027e... by Christian Lohmaier <email address hidden>

bump product version to 5.4.6.2.0+

Change-Id: I597f72e1181798d7b050e5a8bdb4e545889caed1

6bfe682... by Michael Stahl <email address hidden>

tdf#115429 xmloff: ODF import: fix handling of unknown attributes

... in SvXMLLegacyToFastDocHandler::startElement(), so that it does not
create invalid "-1" tokens that end up stored as empty-string
attribute names in SvXMLAttrCollection and ultimately exported
as invalid XML.

One surprising aspect is that the maNamespaceURL in struct
UnknownAttribute stores the namespace prefix in the libreoffice-5-4
branch, as it lacks commit bb59a80ee6000d3922fa95262f67e291fd9d8ee2.

The attributes are read and converted again in
SvXMLImportContext::startUnknownElement().

Change-Id: Id081c677286a77ec50d9884cdbd9135cf4f6e5b6
Reviewed-on: https://gerrit.libreoffice.org/50583
Tested-by: Jenkins <email address hidden>
Reviewed-by: Miklos Vajna <email address hidden>
(cherry picked from commit dab0220f91bcd2dab85309c14bcd10c27639544d)
Reviewed-on: https://gerrit.libreoffice.org/51260
Reviewed-by: Christian Lohmaier <email address hidden>
Reviewed-by: Eike Rathke <email address hidden>
Tested-by: Eike Rathke <email address hidden>

102292b... by Miklos Vajna <email address hidden>

test: add assertXPathNSDef()

Partial backport of Miklos' master commit
f8da775795052ad2eb879970c115d2e2a2fe8c81
without the EPUB changes.

Change-Id: Ic9dd105249a59200dba03bb30eda350a95aff263
Reviewed-on: https://gerrit.libreoffice.org/50582
Tested-by: Jenkins <email address hidden>
Reviewed-by: Miklos Vajna <email address hidden>
(cherry picked from commit 15cf7d30d475271b394ead3bb2458c1dc791a97c)
Reviewed-on: https://gerrit.libreoffice.org/51288
Reviewed-by: Michael Stahl <email address hidden>
Reviewed-by: Eike Rathke <email address hidden>
Tested-by: Eike Rathke <email address hidden>
Reviewed-by: Christian Lohmaier <email address hidden>

da85e53... by Michael Stahl <email address hidden>

tdf#115142 Revert "slideshow: clip shapes in secondary screen window"

This reverts commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.

This is bogus as it actually does scaling and not clipping, and the
actual clipping bug is in the VCL canvas, see following commit.

Also should fix tdf#115652 and tdf#116196.

Change-Id: Ief7be653a38626c9902ab5c7c453a133c2b9f882
(cherry picked from commit 0408a590311c837d5f0ab1abfb72a564a266ddac)
Reviewed-on: https://gerrit.libreoffice.org/50887
Tested-by: Jenkins <email address hidden>
Reviewed-by: Thorsten Behrens <email address hidden>
(cherry picked from commit cbc114a8d86d94743562c2eec7a8eef23d2d2297)
Reviewed-on: https://gerrit.libreoffice.org/50930
Reviewed-by: Christian Lohmaier <email address hidden>
Reviewed-by: Mike Kaganski <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>

3f7fa0c... by Michael Stahl <email address hidden>

VCL canvas: fix clipping of gradients (related: tdf#115142)

When using the presenter console, the secondary screen has
a small view of the current slide, which is called a "Pane" in sdext.

Clipping for this is done by sd::presenter::PresenterCanvas, which wraps
the full-screen VCL canvas and has a MergeViewState() to intersect
the clip region.

The VCL canvas has a bug in its gradientFill() implemenation where it
overrides the existing clip on the OutputDevice instead of intersecting
it.

This properly fixes the bug that was wrongly and badly attempted
to be fixed by commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.

Change-Id: Id02678c2f134fe7b190866d6a6fff5b2e5e3aaff
(cherry picked from commit 5d710cf7dda27e78f237211fd92418be4dd1c551)
Reviewed-on: https://gerrit.libreoffice.org/50888
Tested-by: Michael Stahl <email address hidden>
Reviewed-by: Thorsten Behrens <email address hidden>
(cherry picked from commit c59c43ecfb7b858557c82bb3733ba72f0f23d3df)
Reviewed-on: https://gerrit.libreoffice.org/50931
Reviewed-by: Christian Lohmaier <email address hidden>
Reviewed-by: Mike Kaganski <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>

30e3c1c... by Noel Grandin <email address hidden>

tdf#115432 footnote separator position wrong (3rd attempt)

My second attempt in

   commit dedf5e4f9000e271683dea9a0488e1b45b91176c
   "tdf#115432 footnote separator position wrong (2nd attempt)"

managed to lose part of the change because of incorrect rebasing.

Change-Id: I7b18f3e1602c617d1cb414ef0eb2ee456aeb58ee
Reviewed-on: https://gerrit.libreoffice.org/50901
Reviewed-by: Michael Stahl <email address hidden>
Tested-by: Jenkins <email address hidden>
(cherry picked from commit dcd95c6fff548c7ac46688244e44b95464fb297d)
Reviewed-on: https://gerrit.libreoffice.org/50912
(cherry picked from commit 95bf328d76352c4a2745ece21ccf99ac41693fb8)
Reviewed-on: https://gerrit.libreoffice.org/50917
Reviewed-by: Noel Grandin <email address hidden>
(cherry picked from commit 4ecd9b10345d5cc89692592a9180999550e9c019)
Reviewed-on: https://gerrit.libreoffice.org/50929
Reviewed-by: Christian Lohmaier <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>

33e1030... by Noel Grandin <email address hidden>

tdf#115432 footnote separator position wrong (2nd attempt)

the first attempt (d4a8d91abd40dee7f7bd739a678a502a6e34cb59)
incorrectly changed the type of a UNO property defined in a
published IDL file.

Change-Id: I75bc75dead0954d1faa6dfb6adab9f4c42c67cfc
Reviewed-on: https://gerrit.libreoffice.org/50827
Tested-by: Jenkins <email address hidden>
Reviewed-by: Noel Grandin <email address hidden>
(cherry picked from commit 1163bcd5da3063e7e988ebf49d9b60dfd6f6c703)
Reviewed-on: https://gerrit.libreoffice.org/50898
Reviewed-by: Michael Stahl <email address hidden>
Reviewed-by: Christian Lohmaier <email address hidden>
Reviewed-by: Mike Kaganski <email address hidden>
Tested-by: Mike Kaganski <email address hidden>

b327393... by Thorsten Behrens <email address hidden>

VCL canvas: fix another clipping mistake (related: tdf#115142)

Follow-up to 5d710cf7dda27e78f237211fd92418be4dd1c551 -
setupOutDevState() tends to set a clip, better not overwrite that.

Change-Id: I52aa7db3ef12e9c2902016460e1bf4914328dc7c
Reviewed-on: https://gerrit.libreoffice.org/50920
Tested-by: Jenkins <email address hidden>
Reviewed-by: Michael Stahl <email address hidden>
(cherry picked from commit e8ed3dfc35975b9e57da7803168f3e2a117a4004)
Reviewed-on: https://gerrit.libreoffice.org/50940
Tested-by: Michael Stahl <email address hidden>
(cherry picked from commit 5acef0c01a38cb9217bef5b38ba521c23c304e0f)
Reviewed-on: https://gerrit.libreoffice.org/50956
Reviewed-by: Christian Lohmaier <email address hidden>
Reviewed-by: Thorsten Behrens <email address hidden>
Tested-by: Thorsten Behrens <email address hidden>

0f36da9... by =?utf-8?q?Caol=C3=A1n_McNamara?= <email address hidden>

tdf#115866 comments inside StringArray blocks drop translations

Change-Id: I422d87bd51e581eebafe961d308923a27c004f42
Reviewed-on: https://gerrit.libreoffice.org/50353
Tested-by: Jenkins <email address hidden>
Reviewed-by: Eike Rathke <email address hidden>
(cherry picked from commit ba9572cb7a5e9e5bde8175e56f9b684919bfd2cb)
Reviewed-on: https://gerrit.libreoffice.org/50770
Reviewed-by: Christian Lohmaier <email address hidden>
Reviewed-by: Michael Stahl <email address hidden>
Tested-by: Michael Stahl <email address hidden>

8f056b8... by Christian Lohmaier <email address hidden>

update credits

Change-Id: If08d6a65d35b3c1d7226e004933bffc3769ba398
(cherry picked from commit e993d98e29faee0947588a326fe9454c8f987ef7)
(cherry picked from commit ca873d83261bba84c557dfef5f3301b4ad495a5e)