Author: Olivier Hallot
Author Date: 2019-11-18 23:07:32 UTC

Update git submodules

* Update helpcontent2 from branch 'master'
  - Add PDF Export Security Page screenshot

    Change-Id: Ic5ca4f1dbb1bab68914fd015808112b42cfe4951
    Reviewed-on: https://gerrit.libreoffice.org/83144
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

Author: Rb-henschel
Author Date: 2019-11-16 20:55:05 UTC

tdf#103092 export uses MeasureUnit not FieldUnit

ctor of SvXMLExport expects a util::MeasureUnit, but getMetric() from
XGlobalSheetSettings returns a FieldUnit. The conversion was missing.
So FieldUnit::MM (=1) was treated as MeasureUnit::MM_10TH (=1). But
that one has no unit string, so the 'translate' transformation got
numbers without unit, which then were wrongly interpreted.

Change-Id: I433c7534be21655887863005f14836d2b733cf1f
Reviewed-on: https://gerrit.libreoffice.org/83004
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
(cherry picked from commit 58ee73068fa881950e42cca22ed17cf5829b8d14)
Reviewed-on: https://gerrit.libreoffice.org/83099
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

Author: Tamás Zolnai
Author Date: 2019-11-18 13:36:51 UTC

SpellingPopup: Replace the tunneled context menu.

Send the menu structure instead using LOK_CALLBACK_CONTEXT_MENU.
We need to set commands for menu items to make fillPopupMenu()
method work.
We also need to check whether there is any selection during execution
of menu items. In case of LO core execution the suspicious text is
selected, however in case of LO online, there is no selection.

Change-Id: Id696ee9976d11f6b57e23a3bcc5b483a1d486639

Author: Caolán McNamara
Author Date: 2019-11-15 13:25:02 UTC

tdf#128495 measure preferred size of print preview relative to UI font

Change-Id: If04f50818fc94dd62263daaebc1c386b2d85c987
Reviewed-on: https://gerrit.libreoffice.org/82791
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/83068

Author: Caolán McNamara
Author Date: 2019-06-08 16:50:37 UTC

Resolves: tdf#120343 show pdf in async pdf export dialog callback

not after dialog async exec begins, but defer to during that response
callback

Change-Id: I316022c01a87cf251d57b1007ae93fefddada776
Reviewed-on: https://gerrit.libreoffice.org/73717
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit d3655c22aa393dd70459f42bee547c39306e4bf0)

Author: Luboš Luňák
Author Date: 2019-11-18 15:40:25 UTC

solve the Skia lerp() conflict differently

New versions of libstdc++ provide lerp() in the global namespace,
older ones don't, but it depends on the libstdc++ version and not
the c++ version. Since the function is local, just "rename" it.

Change-Id: I37896190c620350739fba9b8ce6544f945519244

Author: Tomaž Vajngerl
Author Date: 2019-11-17 23:34:43 UTC

widget theme: correct sizes of combobox/listbox

Combobox/listbox was clipped on the right side. Fixed this by
increasing the size of the widget by one and moving the button to
the right by one pixel.

Change-Id: If73e93d0c99c1daff9c0bab095169dba3c619450
Reviewed-on: https://gerrit.libreoffice.org/83043
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 9e7a0fc1573a95a1542207ac86a18e630c1fc835)
Reviewed-on: https://gerrit.libreoffice.org/83055
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>

Author: Vasily Melenchuk
Author Date: 2019-11-18 08:26:23 UTC

package: ignore unknown encryption parameters.

Do not throw an exception if there are encryption parameters,
but they are not supported in current output format.

Change-Id: I21e4cf2f73d7c218ab5444b2016e838695163ca3

Author: Caolán McNamara
Author Date: 2019-08-15 19:29:40 UTC

tdf#126007 tdf#122355 online help won't look into a dialog notebook

when the focus is on the help button, offline will through the help fallback
route, but online will just fire and forget and let the server side do a
fallback, which can't know what the current notebook page was.

so bodge it to look at the notebook page right from the start if there is one
and its the help button itself which starts the request

Change-Id: Ida1d3101d838d99639dda12c438414c16b1ccda5
Reviewed-on: https://gerrit.libreoffice.org/77550
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

Author: Mike Kaganski
Author Date: 2019-08-18 08:43:51 UTC

tdf#126989: always terminate shim after fallback complete

It seems that DSM may not send MSG_CLOSEDSREQ (or we may already have
unloaded DSM), so don't rely on it.

Change-Id: I3ed2e0e70f4dc79c89b430b4bad6954bf9224c71
Reviewed-on: https://gerrit.libreoffice.org/77659
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 53e4d5fe73d98b109d79fc2c1f5032faea88afb9)
Reviewed-on: https://gerrit.libreoffice.org/77664
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 704a9a86600a5a60d668140790fc916b5014bef9)
Reviewed-on: https://gerrit.libreoffice.org/77711
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

Author: Sbergman
Author Date: 2019-06-07 07:28:12 UTC

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

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23
Reviewed-on: https://gerrit.libreoffice.org/73860
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 87c418a98650ab6e4a62a0b4b72e02fee358dced)
Reviewed-on: https://gerrit.libreoffice.org/74290
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>

Author: Sbergman
Author Date: 2019-06-07 07:28:12 UTC

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
Reviewed-on: https://gerrit.libreoffice.org/74283
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>

Author: Xisco Faulí Tarazona
Author Date: 2017-10-30 10:13:06 UTC

mailmerge.py: Use strip in server name

Using spaces in the dialog might lead to incorrect server name
Reviewed-on: https://gerrit.libreoffice.org/44052
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

(cherry picked from commit 55ad93f29b1be106a7b475f92202ece3589584d8)

Change-Id: If057d0bf8dea55ccddfab8e0f21c8ef16d87dc92
Reviewed-on: https://gerrit.libreoffice.org/74187
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Michael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit 6a3c5250066188f127c5445ae1224e19e20ce33a)

Author: Sbergman
Author Date: 2019-06-07 07:28:12 UTC

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

Author: Sbergman
Author Date: 2019-06-07 07:28:12 UTC

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

Author: Sbergman
Author Date: 2019-06-07 07:28:12 UTC

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

Author: Sbergman
Author Date: 2019-06-07 07:28:12 UTC

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

Author: Matthias Seidel
Author Date: 2019-06-18 10:50:07 UTC

i128128 - Lost translations in database wizard

Fixing double slash and wrong paths

Author: Khaled Hosny
Author Date: 2019-06-16 00:38:02 UTC

tdf#121486: Correct scale of broken fonts on Windows

Some fonts have negative tmAveCharWidth which makes no sense (fonts can't have
negative glyph width, so the average can't be negative) and it would cause our
code to apply negative scale to the glyphs of these fonts making them drawn on
the flipped horizontally.

Fix this by using the absolute value so it is always positive.

Change-Id: I731e7aad80dae734847679a1b08c6ac78111e16c
Reviewed-on: https://gerrit.libreoffice.org/74109
Tested-by: Jenkins
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
(cherry picked from commit 8fffb56940c6eb81674000cdb718edc79603a6c5)
Reviewed-on: https://gerrit.libreoffice.org/74150
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

Author: Sbergman
Author Date: 2019-06-07 07:28:12 UTC

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

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

Author: Tomaž Vajngerl
Author Date: 2019-06-15 06:44:33 UTC

tdf#124907 vcl: react to pan gesture for listbox and other widgets

Reviewed-on: https://gerrit.libreoffice.org/74087
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 08f485c6e92bd56c8c26171316b842cd213a8a09)

Change-Id: I4579f8edd2bf24506b1d55a7291cd86e276f30a4
Reviewed-on: https://gerrit.libreoffice.org/74164
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

Author: Tamás Zolnai
Author Date: 2019-06-14 20:00:07 UTC

MSForms: Implement calculating the date text displayed in the date field

* Change ODF_FORMDATE_DATEFORMAT to store the date format in
a standard way (e.g. "MM.DD.YY")
* Also add a new attribute called ODF_FORMDATE_DATEFORMAT_LANGUAGE
to store the language for the date format.
* Set a default date format and language by insertion.
* Display the date in the field using the set format.
* Store the current date in a specific format, which will make
import / export easier (MSO DOCX format).

Change-Id: I852975bbf81556f0e21f8f85d1c293707fdf672e

Author: Michael Stahl
Author Date: 2019-05-22 09:40:54 UTC

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)

Author: Caolán McNamara
Author Date: 2019-06-11 08:44:40 UTC

Resolves: tdf#125808 empty labels in pivot table from registered data source

since...

commit 238cadd315901cbacfd9304bb1205e9f53f13eae
Date: Wed Apr 10 04:30:25 2019 +0530

    dpcache : use case-insensitive normalization of...

Change-Id: I19057bde268ec07561da323bc694536dcad03a95
Reviewed-on: https://gerrit.libreoffice.org/73821
Tested-by: Jenkins
Reviewed-by: Dennis Francis <dennis.francis@collabora.com>

Author: Mark Hung
Author Date: 2018-05-23 03:25:05 UTC

tdf#106390 Intersect the table borders with upper frames.

Also removes dead code because SwTabFramePainter::Insert()
is always called with a cell frame and IsTabFrame() always
returns false.

Reviewed-on: https://gerrit.libreoffice.org/54684
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e87cc12eaf53efa9b221eae7167ea15bc7896752)

Conflicts:
 sw/qa/extras/layout/layout.cxx
 sw/source/core/layout/paintfrm.cxx

(cherry picked from commit 948283caae76fa5c42216d10519c86bcbffb6d1d)

Change-Id: I2505d876d20e44ded1faf760bc3b7b1d34b0fd8d

Author: Balazs Varga
Author Date: 2019-06-04 08:11:29 UTC

Related: tdf#48041 Chart: vertical value axis labels

Do not duplicate vertical axis labels and gridlines
if same value labels follow each other, because of
the number format and rounding.
Supplement of commit: 7f373a4c88961348f35e4f990182628488878efe

Change-Id: I7a5d8196d4f16024c279fa4417a0c8809fb8aec7
Reviewed-on: https://gerrit.libreoffice.org/73432
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>

Author: Armin Le Grand
Author Date: 2019-06-03 19:36:34 UTC

WIP: Use ItemControlBlock as TypeInfo

Removed last big change to have a global static
ItemControlBlock registry. Thought about things
and what is needed/wanted is RTTI for the Items.
Instead of using typeid(T).hash_code() it is
equally possible to use the ItemControlBlock of
each Item - it exists once as global static
instance. So use it's address. That way e.g. the
ItemSet holding it *will* hjave a direct reference
to the ItemControlBlock, so no need for a global
registration.
Checked, tested, adapted, works.

Change-Id: I4c9b6bfe4ba6858b234238d6125793378574af87

Author: Miklos Vajna
Author Date: 2019-05-30 12:56:40 UTC

ODT export: fix lost <text:user-field-decl> for fields in frames in headers

This is similar to commit 6bb241ccc61c6904efec95978fa17e33c0eb1df3 (ODT
export: fix lost <text:user-field-decl> for fields in tables in headers,
2019-05-29), but here the container we want to ignore (between the
header and the field) is a text frame, not a table cell.

(cherry picked from commit 6f179ce5c5469d1c53e4bb7736384b2d9ce51926)

Conflicts:
 sw/inc/unoframe.hxx
 sw/source/core/unocore/unomapproperties.hxx

Change-Id: I6e8006fbd666802070cfeb88ca4528c66cc6d559
Reviewed-on: https://gerrit.libreoffice.org/73205
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

Author: Michael Meeks
Author Date: 2019-05-29 14:05:58 UTC

lok: don't be prejudiced against a single missing mime-type.

Change-Id: Ic5004c306cbd01071c397ed1a61ef094b439a48f

Author: Michael Stahl
Author Date: 2019-05-27 16:55:31 UTC

tdf#125475 sw: update SwTextFrames when SwTextLine cache shrinks

SwCache::DeleteObj() may decide to shrink the cache, and then the
SwTextFrame::mnCacheIndex goes stale, because only
SwCacheObj::m_nCachePos is updated.

In this bugdoc, this can happen *inside* SwTextFrame::Format(), where
first it succeeds to find an existing SwTextLine, then some footnotes
anchored in this paragraph are moved around and formatted, creating new
SwTextLines, and SwCache::DeleteObj is called. Later, any access of the
original frame's SwTextLine fails to find it and eventually some null
pointer crash happens.

Newly added SwTextLine::UpdateCachePos() requires that SwTextFrame lives
longer than its SwTextLine; there was another problem with that, because
SwTextFrame::FormatEmpty() was throwing away the mnCacheIndex, which
could then cause a second SwTextLine to be created for the same
SwTextFrame, and the first one is not deleted until it falls to the
bottom of the LRU list.

Apprently for this particular document the problem didn't happen before
commit 3d37463eec0c891243a8971a34903b2da01c9e24 and/or
commit 31ae7509003b1e650463ee1468c0b315ba13efe6 but that is mostly luck.

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

Change-Id: I7bef1b340a453d6dd44d51a1dc69ee5fd0b697db

Author: Szymon Kłos
Author Date: 2019-05-16 13:24:10 UTC

tdf#117480 fix crash in mailmerge

Catch exceptions and hide progress dialog.

b2d85f9207bc9bf7489d0a1fd9b35f062502639d
Reviewed-on: https://gerrit.libreoffice.org/65815
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>

Change-Id: Ie63c8d7e001c90f40cf7504fd8248a6742e9d244
Reviewed-on: https://gerrit.libreoffice.org/72413
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

Author: Caolán McNamara
Author Date: 2019-05-07 11:06:30 UTC

Resolves: tdf#125106 fix cell protect TriState toggles

and merge duplicated TriStateEnabled class

Reviewed-on: https://gerrit.libreoffice.org/71905
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 2376db068d8194d3455681a559369e50743e29f3)

Change-Id: I1f145558fe9d86682e03481fb2800386d04d2b1d
Reviewed-on: https://gerrit.libreoffice.org/71994
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Author: Jim MacArthur
Author Date: 2019-05-07 17:03:13 UTC

Add 'Resolved comments' option on View menu

Change-Id: Ie13f5abf94e10780116359b77feb7d2db614ea19

Author: Michael Stahl
Author Date: 2019-05-02 08:59:01 UTC

libpng: upgrade to release 1.6.37

Fixes CVE-2019-7317.

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

Change-Id: I3374f5cbd6552e2c1569d63ee680d0c1d9389621

Author: Christian Lohmaier
Author Date: 2019-05-02 20:07:21 UTC

bump product versionto 6.1.6.3.0+

Change-Id: Ia3540373c2e364f5819845d6c323d94e4c8840c8

Author: Michael Stahl
Author Date: 2019-05-02 08:59:01 UTC

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)
Reviewed-on: https://gerrit.libreoffice.org/71669
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

Author: Marco Cecchetti
Author Date: 2019-04-29 11:59:49 UTC

[DRAFT] - lok: AT - get current paragraph with formatting - 2

Author: Katarina Behrens
Author Date: 2019-04-23 09:59:40 UTC

Skip clipboard queries while the document is still loading

Use-case here is .ods document with 16k tracked changes. For every
tracked change, Calc generates a formula cell. For every formula
cell, clipboard content is queried (via ScDocument::IsClipboardSource,
ScModule::GetClipDoc respectively). This is dog-slow on Windows

Therefore don't query clipboard content while the document is in
the process of being loaded. Instead return from ScDocument::
IsClipboardSource early and return 'false' because at this point
of time it can't be reliably determined whether this doc is a clipboard
source anyway

Change-Id: If5aa62cbfb62fb326a3c73b4d9be839127d3c03b
Reviewed-on: https://gerrit.libreoffice.org/71121
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 9c8aa1c217f016fae9a57c6a4feca43551e5068e)

Author: Christian Lohmaier
Author Date: 2019-04-10 10:11:50 UTC

bump product version to 6.2.3.2.0+

Change-Id: I7cfee8b3a836cf4980a88c8e78ea528626b54ac4

Author: Katarina Behrens
Author Date: 2019-03-21 12:27:03 UTC

Nested list L must be a child of parent's LBody

Implement this as
https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf#G13.2259746
describes. The example implementation in Annex H8.2
https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf#G21.1021285
where nested L is a sibling of its parent LI contradicts the
specification and is prolly wrong

Change-Id: I2bd4a6692ac0cbe02ff6f1746656f104de3fe1f2

Author: Christian Lohmaier
Author Date: 2019-03-15 19:59:17 UTC

bump product version to 6.2.2.2.0+

Change-Id: I395cbb22314da4d4b2d333edd6bbe567ddc9d5c1

Author: Tor Lillqvist
Author Date: 2019-02-21 08:15:11 UTC

Don't use the non-public fdatasync() API when sandboxed on macOS

Change-Id: I9e36cb78e3e945f6531a31e0ddf73d9c8d655f7d

Author: Christian Lohmaier
Author Date: 2019-02-26 15:42:00 UTC

bump product version to 6.2.1.2.0+

Change-Id: Iba8efa37df53e8fafa3e2297fbebe195881b78de

Author: Samuel Mehrbrodt
Author Date: 2019-02-19 09:39:52 UTC

Bump version to 5.1.7.1

Author: tml
Author Date: 2018-11-22 19:02:20 UTC

For some reason drawing the SVG logo takes several minutes so don't do it then

For some reason it does not happen in the TDF build of 6.1, but does
happen in the LibreOffice Vanilla build. Whatever. This fixes the
problem.

Change-Id: Ie7a3587ece5de8ca0561ad61811c7511f43cad01

Author: Michael Stahl
Author Date: 2019-02-06 11:18:58 UTC

curl: add patches for CVE-2018-16890 and CVE-2019-3822

The third one (CVE-2019-3823) isn't relevant because SMTP is disabled.

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

Change-Id: I2383c1a7b0c67c586402d4098092cee565edcdda
Reviewed-on: https://gerrit.libreoffice.org/67509
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

Author: Katarina Behrens
Author Date: 2019-02-04 10:54:27 UTC

PPTX import of shape description

(cherry picked from commit dc1d26e5a3f0b75e729b58d5848493a48cb532bd)

Change-Id: I7fcd5608a8cdbeea9ea15c9c9aa32c9020154750

Author: Christian Lohmaier
Author Date: 2019-01-30 17:57:21 UTC

bump product version to 6.1.5.2.0+

Change-Id: Ia658286ea54400c6c7283047445f6ae6d7334846

Author: Olivier Hallot
Author Date: 2019-01-24 10:59:58 UTC

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-2-0'
  - 6.2 features video last update of 1/20/2019

    as per msg in marketing priv list of 1/20/2019

    Change-Id: Ifc8cba99206c5872bebfd0a4da140d4f4bab5ae1
    Reviewed-on: https://gerrit.libreoffice.org/66859
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
    (cherry picked from commit ec2affa7289a7964f5291d5368dc31a1d2ae0961)
    Reviewed-on: https://gerrit.libreoffice.org/66956
    Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
    Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>

Author: Jan-Marek Glogowski
Author Date: 2019-01-25 20:56:41 UTC

Just define the __clang_major___WORKAROUND_GUARD

Change-Id: I84e969005ac2a96da449b5434ee5fdb37fc9b432

Author: Jean-Sebastien Bevilacqua
Author Date: 2019-01-18 09:31:53 UTC

bump product version to 6.1.5.1.M6

Change-Id: I92c2179ca91f40a3425c65b8b78d07f26878cf92

Author: Michael Stahl
Author Date: 2018-12-21 10:56:30 UTC

sw_redlinehide: adapt ToX Update

The ToX exists only once in the model, so it either has to have the
content corresponding to redlines being shown, or hidden.

Adapt Update based on current layout setting.

Change-Id: Ibf5ec092632cf3a5f513965afdb840fd8239a7fd

Author: Thorsten Behrens
Author Date: 2018-12-17 23:36:24 UTC

sw_redlinehide: fix tdf#113479 by removing nag dialog

No need to suggest showing redlines beyond 250 changes anymore.

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

Author: Christian Lohmaier
Author Date: 2018-12-12 22:00:10 UTC

bump product version to 6.1.4.2.0+

Change-Id: Iebbf6d899a003dd0423530d8ac8f74e7008d6080

Author: Michael Stahl
Author Date: 2018-11-30 17:00:19 UTC

HACK: ODF import: always hide redlines

Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df

Author: Michael Stahl
Author Date: 2018-11-30 15:28:04 UTC

sw_redlinehide_4a: MoveDeletedPrevFrames() should only move

... frames from a layout with hidden redlines.

Change-Id: I8f5d5bbbc5bfd49a8a52579a1c34157b9c5c4515
(cherry picked from commit c1d7cc390c6e095d6e58b856758ba86f7666195f)

Author: Samuel Mehrbrodt
Author Date: 2018-12-05 15:19:53 UTC

Bump version to 6.0.8.2

Change-Id: I87c43774689b6722e1a1ad1dcb9cebf40752081f

Author: Andras Timar
Author Date: 2018-11-29 13:47:24 UTC

Bump version to 5.3-61

Change-Id: I0753c83b554dca20de6650d7947b3112d177df90
(cherry picked from commit cd2475c52a096b001a7e3179f02e11cbc8a5615f)

Author: Sbergman
Author Date: 2018-10-08 09:21:45 UTC

tdf#121778: Work around odd macOS 10.14 graphicsContextWithWindow failure

Although Stephan's original commit message below talks mainly about a
unit test, this change helps at least in tdf#121778, too, and possibly
other cases.

It is interesting that wihout this change, a lot of these warnings are
printed before the crash:
warn:vcl.quartz:42670:52899343:vcl/quartz/salvd.cxx:312: No context

Original commit message:

When running on macOS 10.14, both master and libreoffice-6-1 (at least) started
to fail CppunitTest_vcl_bitmap_render_test with

> /Users/stephan/Software/lo2/core/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx:90: Assertion
> Test name: BitmapRenderTest::testTdf113918
> equality assertion failed
> - Expected: mcBlueOrIndex: 255, mcGreen: 255, mcRed: 255, mcAlpha: 0
> - Actual : mcBlueOrIndex: 1, mcGreen: 112, mcRed: 15, mcAlpha: 0

in --enable-debug/--enable-dbgutil builds.

I tracked that down to the OSL_DEBUG_LEVEL>0--only call to
Scheduler::ProcessEventsToIdle in test::BootstrapFixture::setUp
(test/source/bootstrapfixture.cxx). If that call is also included in non-debug
(i.e., OSL_DEBUG_LEVEL=0) builds, or if it is removed from all builds and
instead an unsuspecting

  [NSApp nextEventMatchingMask: 0 untilDate: nil inMode: NSDefaultRunLoopMode dequeue: NO];

is added directly before the call to

  pVDev->SetOutputSizePixel(Size(2480, 3508));

at the start of BitmapRenderTest::testTdf113918
(vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx:76), the test always fails.

What happens is that, after such a nextEventMatchingMask call done, the call to
NSGraphicsContext graphicsContextWithWindow in AquaSalVirtualDevice::SetSize (as
called from the SetOutputSizePixel call in the test) returns nil, for unclear
reasons.

Until those underlying reasons are understood, change the code of SetSize to
"fall back to a bitmap context" also in case the graphicsContextWithWindow call
returned nil.

Reviewed-on: https://gerrit.libreoffice.org/61519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit e659c6a1857fbb8e5a6e8ff60fe241483eea32dd)

Change-Id: I604ebd2c444b58610e4ed73ec70af87b0a08e864

Author: Daniel Silva
Author Date: 2018-11-28 21:28:26 UTC

Prepare to rebase

Change-Id: I27b17e27d56a236d5d3bf59e1ce1f452fe36cce0
Reviewed-on: https://gerrit.libreoffice.org/64197
Tested-by: Jenkins
Reviewed-by: Daniel Silva <danielfaleirosilva@gmail.com>

Author: Thorsten Behrens
Author Date: 2018-11-27 23:38:40 UTC

Disable the GL based 3D charts

KDE5 currently does not support GL windows properly, so lets disable
that - this is the gist of 026e2623f7f498432e6dc970fb06145dfc77dc45
but with minimal footprint for easier branch maintenance.

Change-Id: I88113596e460c6300a826f821d918a761632047e

Author: Mark Hung
Author Date: 2018-05-23 03:25:05 UTC

tdf#106390 Intersect the table borders with upper frames.

Also removes dead code because SwTabFramePainter::Insert()
is always called with a cell frame and IsTabFrame() always
returns false.

Reviewed-on: https://gerrit.libreoffice.org/54684
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e87cc12eaf53efa9b221eae7167ea15bc7896752)

Conflicts:
 sw/qa/extras/layout/layout.cxx
 sw/source/core/layout/paintfrm.cxx

Change-Id: I2505d876d20e44ded1faf760bc3b7b1d34b0fd8d

Author: Michael Stahl
Author Date: 2018-11-14 14:45:51 UTC

sw: GSE_INP is dead since CVS import, remove it

Change-Id: Ib0713df614e63c20965979e7e34f7481fe8ed838

Author: Ashod Nakashian
Author Date: 2018-11-04 16:45:45 UTC

LOK: custom widgets: simplify and correct colors

Also remove macroni.

Change-Id: I0b2914e9f0e2aba9d8ca10338b515b598126e315

Author: Xisco Fauli
Author Date: 2018-10-30 16:55:21 UTC

bump product version to 6.0.7.3.0+

Change-Id: I62ed62a0373c4e2f5a74105073d6c4590aba2189

Author: Oliver-brinzing
Author Date: 2018-10-27 15:32:38 UTC

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>

Author: Christian Lohmaier
Author Date: 2018-10-29 19:56:17 UTC

bump product version to 6.1.3.2.0+

Change-Id: I1dea874f7ac5edacfaa54541ca59f26f68b5364c

Author: Björn Michaelsen
Author Date: 2018-10-28 18:55:47 UTC

compiles

Change-Id: Ief5a8074882666e6f2ac9a250f0be39894ac6c10

Author: Samuel Mehrbrodt
Author Date: 2018-10-26 14:58:59 UTC

Release 5.2.7.8

Change-Id: I5ae9b7772f8e10a52cc95d90f2b10f44931713a6

Author: Andras Timar
Author Date: 2018-10-22 07:00:24 UTC

Bump version to 5.0-46

Change-Id: Idc22b8308e71a0a5eb37d009f343f8abae320994

Author: Mark Hung
Author Date: 2018-05-23 03:25:05 UTC

tdf#106390 Intersect the table borders with upper frames.

Also removes dead code because SwTabFramePainter::Insert()
is always called with a cell frame and IsTabFrame() always
returns false.

Reviewed-on: https://gerrit.libreoffice.org/54684
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e87cc12eaf53efa9b221eae7167ea15bc7896752)

Conflicts:
 sw/qa/extras/layout/layout.cxx
 sw/source/core/layout/paintfrm.cxx

Change-Id: I2505d876d20e44ded1faf760bc3b7b1d34b0fd8d

Author: Jan-Marek Glogowski
Author Date: 2018-09-28 23:17:03 UTC

Window Iterator without parent vector

Author: Thorsten Behrens
Author Date: 2018-09-27 20:07:33 UTC

Revert "framework: mutex locking revision"

 Revert "framework: remove solarmutex blocking since we are using own mutex"
 Revert "framework: fix compile error of b98bef638e7352918dd487c6dd0769e9e896a61e"
 Revert "Revert "debug: let's disable dispatch interceptors for a while""
 Revert "framework: use own mutex for interceptors call"
 Revert "debug: let's disable dispatch interceptors for a while"

Author: Christian Lohmaier
Author Date: 2018-09-20 09:45:17 UTC

bump product version to 6.1.2.1.0+

Change-Id: I075a191bee24d95951c3e7b918d02a945c985835

Author: Michael Stahl
Author Date: 2018-09-18 14:21:44 UTC

sw: rework annoying GetFrameOfModify/getLayoutFrame parameters

The bCalcFrame is only evaluated if a pPoint is given; this is
surprising and should be more visible in the interface, so people don't
go on a goose chase to find places that may do formatting in
inappropriate places.

So put these parameters into a pair instead, which doesn't have
particularly good ergonomics in C++, particularly since compilers
warn about taking the address of a temporary object...

Change-Id: I101c6eeb5bd6baf83c2bd9a6cb91ccaa04036cc3

Author: Thorsten Behrens
Author Date: 2018-09-14 14:58:10 UTC

Fix build

Followup to b6310c1e403b80e2c6b87f2cfc1ab9132ecd90e0

Change-Id: I83b52168a6a05f9bcc05e10bc75b748010295368

Author: Eike Rathke
Author Date: 2017-09-13 11:42:29 UTC

icu: do not include non-standardized xlocale.h if U_PLATFORM_IS_LINUX_BASED

... should be more platforms ... but be conservative.
U_PLATFORM_IMPLEMENTS_POSIX does not hold what it promises.

"The file and this data structure is not standardized. Don't rely on it. It
can go away without warning."

...

And since glibc 2.26 it's gone.

https://ssl.icu-project.org/trac/ticket/13329

(cherry picked from commit 9e399bc613bb4ea1470bd52c64af920d4e9bc39b)

Change-Id: I4c1f6130571f5d094cb35ce70e4d333763cee32a

Author: Christian Lohmaier
Author Date: 2018-09-10 20:09:26 UTC

bump product version to 6.1.1.2.0+

Change-Id: I5077c7e7356aebc524c435dec0aa0a1e75e3766e

Author: Armin Le Grand
Author Date: 2018-08-24 11:01:08 UTC

Support buffering SystemDependent GraphicData

Note: This is the backport to LO52bp version

This is a first step to allow buffering of system
dependent data, especially (but not only) for the
system-dependent implementations of graphic output.
For example, for B2DPolygon and Win output, it allows
buffering the Gdiplus::GraphicsPath instead of re-
creating it all the time.
To support that, the change includes forwarding the
current transformation to the renderers in SalGraphics.
The current state in VCL is to transform all and
everything to device coordinates at every single
paint.
I have currently started to do this for ::drawPolyLine
implementations. The fallbacks for all systems will
at the start of that method just transform the data
to device coordinates, so all works as before.
This may also be done for FilledPolygon paint in a later
step, but most urgent is FatLine painting.
An arrangement of shared_ptr/weak_ptr is used so that
either the instance buffering (in the example B2DPolygon)
or the instance managing it can delete it. The instance
managing it currently uses a 1s Timer and a cycle-lifetime
management, but that can be extended in the future
to e.g. include size hints, too.
The mechanism it designed to support multiple Data per
buffering element, e.g. for B2DPolygon at the same time
system-dependent instances of Gdiplus and Cairo can be
buffered, but also PDF-data.
This is achieved semi-automatic by using
typeid(class).hash_code() as key for organization.
The mechanism will be used for now at B2DPolygon, but
is not limited to. There is already a similar but less
general buffer (see GdiPlusBuffer) that can and will
be converted to use this new mechanism.

Added vcl/headless Cairo renderer to support given
ObjectToDevice transformation (not to transform given
B2DPolygon)
Added support for CairoPath buffered at B2DPolygon,
seems to work well. Need to do more tests

Moved usage to templates suggested by Noel Grandin
(Noel Grandin <noelgrandin@gmail.com>), thanks for
these suggestions. Adapted Win usage to that, too.

Converted Win-specific GdiPlus BitmapBuffer to new
mechanism, works well. Checked, the manager holds
now a mix of bitmap and path data under Win

Added a cleanup mechanism to flush all buffered data
at DeInitVCL() using flushAll() at
SystemDependentDataBuffer

Adapted Linux-versions of ::drawPolyLine to support
PixelSnapHairline, for now in a simplified version
that still allows buffering. This will also be used
(and use buffering) for the Cairo-fallback in
X11SalGraphics

Change-Id: I88d7e438a20b96ddab7707050893bdd590c098c7
Reviewed-on: https://gerrit.libreoffice.org/59555
Tested-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>

Author: Thorsten Behrens
Author Date: 2018-07-18 16:06:44 UTC

Default OpenGL to off on all platforms

Change-Id: Ide04d3b37b9fabb64d514fd87acbdfe9e49e6727

Author: Andras Timar
Author Date: 2018-08-08 11:00:11 UTC

nss: upgrade to release 3.38

Fixes CVE-2018-0495 and "the ASN.1 code".

Change-Id: I96ec90aaee7e4a803ebde1508951c55db4577e9e
(cherry picked from commit b01ee1682286a52cda1ee14597257e1f862d4e16)

Author: Christian Lohmaier
Author Date: 2018-08-02 19:55:41 UTC

bump product version to 6.1.0.3.0+

Change-Id: Ifa7e4a984c4ca657da8a745a499df5ca699baca5

Author: Christian Lohmaier
Author Date: 2018-07-27 13:16:41 UTC

bump product version to 6.0.6.2.0+

Change-Id: I5a88b75561bdc7e36aa8f734c3509e9f418790ba

Author: Thorsten Behrens
Author Date: 2018-07-02 16:11:47 UTC

./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)

Author: Tor Lillqvist
Author Date: 2018-05-18 11:16:31 UTC

Use Tango as default icon theme when Breeze is not included

Change-Id: Id81c2355abfbdf29599842f06ad8b3c754db708b
(cherry picked from commit d62acf55f17f5b1213f150fb4fb0fd2e8bb0b9b0)
Reviewed-on: https://gerrit.libreoffice.org/56418
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>

Author: Caolán McNamara
Author Date: 2016-10-28 12:37:33 UTC

unify color selectors

Note: this removes the use of auto-color from writer's asian text grid, because
its always invisible as far as I can see in practice.

(cherry picked from commit 43bc3031483d172eccd72c3804e2d4fc2ef37de4)

 Conflicts:
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
 chart2/source/controller/inc/dlg_View3D.hxx
 cui/source/inc/border.hxx
 cui/source/inc/chardlg.hxx
 cui/source/inc/cuitabarea.hxx
 cui/source/inc/cuitabline.hxx
 cui/source/inc/numpages.hxx
 cui/source/options/optcolor.cxx
 cui/source/tabpages/border.cxx
 cui/source/tabpages/borderconn.cxx
 cui/source/tabpages/chardlg.cxx
 cui/source/tabpages/numpages.cxx
 cui/source/tabpages/tpgradnt.cxx
 cui/source/tabpages/tphatch.cxx
 cui/source/tabpages/tpline.cxx
 cui/source/tabpages/tppattern.cxx
 cui/source/tabpages/tpshadow.cxx
 cui/uiconfig/ui/gradientpage.ui
 cui/uiconfig/ui/hatchpage.ui
 cui/uiconfig/ui/patterntabpage.ui
 include/sfx2/controlwrapper.hxx
 include/svx/PaletteManager.hxx
 include/svx/colorwindow.hxx
 include/svx/float3d.hxx
 include/svx/fontwork.hxx
 include/svx/sidebar/AreaPropertyPanelBase.hxx
 include/svx/svxids.hrc
 include/svx/tbcontrl.hxx
 sc/source/ui/condformat/colorformat.cxx
 sc/source/ui/condformat/condformatdlgentry.cxx
 sc/source/ui/dbgui/scendlg.cxx
 sc/source/ui/inc/scendlg.hxx
 sc/source/ui/optdlg/opredlin.cxx
 sc/source/ui/optdlg/tpview.cxx
 sc/uiconfig/scalc/ui/conditionalentry.ui
 sd/inc/sdabstdlg.hxx
 sd/qa/unit/dialogs-test.cxx
 sd/source/ui/animations/CustomAnimationDialog.cxx
 sd/source/ui/dlg/copydlg.cxx
 sd/source/ui/dlg/sddlgfact.cxx
 sd/source/ui/dlg/sddlgfact.hxx
 sd/source/ui/func/fucopy.cxx
 sd/source/ui/inc/copydlg.hxx
 sd/source/ui/sidebar/SlideBackground.cxx
 sd/source/ui/sidebar/SlideBackground.hxx
 sd/uiconfig/simpress/ui/sidebarslidebackground.ui
 svtools/source/control/ctrlbox.cxx
 svx/source/dialog/bmpmask.hrc
 svx/source/dialog/bmpmask.src
 svx/source/dialog/fontwork.cxx
 svx/source/engine3d/float3d.cxx
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx
 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
 svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
 svx/source/tbxctrls/PaletteManager.cxx
 svx/source/tbxctrls/tbcontrl.cxx
 svx/uiconfig/ui/sidebararea.ui
 sw/source/ui/config/optpage.cxx
 sw/source/ui/frmdlg/column.cxx
 sw/source/ui/misc/pgfnote.cxx
 sw/source/ui/misc/pggrid.cxx
 sw/source/uibase/inc/column.hxx
 sw/source/uibase/inc/optpage.hxx
 sw/source/uibase/inc/pgfnote.hxx
 sw/source/uibase/inc/pggrid.hxx
 sw/source/uibase/sidebar/PageStylesPanel.cxx
 sw/source/uibase/sidebar/PageStylesPanel.hxx
 sw/uiconfig/swriter/ui/optredlinepage.ui
 sw/uiconfig/swriter/ui/pagestylespanel.ui

Change-Id: Ie850790d740a4d56c43015e493e093678cef3b4e

Author: Ashod Nakashian
Author Date: 2018-06-20 19:55:07 UTC

vcl: remove swapping logic from GraphicObject to support lazy-loading

Change-Id: I286a9b6ee75f07744232771263c26579ad9653e7

Author: Christian Lohmaier
Author Date: 2018-06-19 22:28:16 UTC

bump product version to 6.0.5.2.0+

Change-Id: I988ea25b234a4a6b063a0135af7adcd45ce43104

Author: Ashod Nakashian
Author Date: 2018-06-09 19:31:42 UTC

vcl: maintain shared PdfData across swap-in and -out

Change-Id: I6e434e5b5db0ddcd2fb4d1e522ffdb1c963c1f34

Author: Caolán McNamara
Author Date: 2018-06-11 08:10:50 UTC

coverity#1436014 silence Dereference null return value

Change-Id: I5ba1f864b5fcf69e3437792f99d24367f5f5a44d
Reviewed-on: https://gerrit.libreoffice.org/55603
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Author: Michael Stahl
Author Date: 2018-05-07 15:44:44 UTC

hack in Show - not sure if...

Change-Id: I6ca49cfe9c61b3562e87ca994b284e056c2bab54

Author: Ashod Nakashian
Author Date: 2018-06-07 02:41:51 UTC

svx: fixup! don't include what we don't use

svdpdf.hxx was accidentally included in
745afeac6a067ce9cd84b6ea64dde56e2a0089bf

Change-Id: I878e15bcb674ce237884d093138b3a405d083ecb

Author: Ashod Nakashian
Author Date: 2018-06-06 04:51:10 UTC

vcl: svx: misc improvements to pdfium importing

Change-Id: I58f2fd973a731b148f40b37139cd74bac097a7d2

Author: Ashod Nakashian
Author Date: 2018-05-28 12:02:06 UTC

vcl: fix pdf rendering regression

Reviewed-on: https://gerrit.libreoffice.org/54921
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 4a3457907546b4cde3adaf0ba6a6d258fe1b54b7)

Change-Id: I6c2c48c033facb317b4ca7ed2af07348d6386b98

Author: Jean-Sebastien Bevilacqua
Author Date: 2018-05-23 09:34:13 UTC

bump product version to 5.4.7.2.M6

Author: Tor Lillqvist
Author Date: 2018-05-22 08:00:35 UTC

Open template read-only

Otherwise when creating a new docuent based on a template, the
template document file is opened read-write eventually (after first
being opened read-only five times, and closed again...). Sure,
LibreOffice probably doesn't actually write anything to it, but still,
just opening read-write when you are going to only read is silly.

Stack trace from the read-write opening:

 #0 0x00007f063dea0047 in openFilePath(char const*, void**, unsigned int, unsigned int) (cpFilePath=0x7ffeacc7d610 "/ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott", pHandle=0x342af78, uFlags=3, mode=438)
    at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1039
 #1 0x00007f063dea027b in openFile(_rtl_uString*, void**, unsigned int, unsigned int) (ustrFileURL=0x33ff7e0, pHandle=0x342af78, uFlags=3, mode=4294967295) at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1071
 #2 0x00007f063dea01a8 in osl_openFile(rtl_uString*, oslFileHandle*, sal_uInt32) (ustrFileURL=0x33ff7e0, pHandle=0x342af78, uFlags=3)
    at /ssd1/lo/fedora/sal/osl/unx/file.cxx:1050
 #3 0x00007f060aec5f1a in osl::File::open(unsigned int) (this=0x342af78, uFlags=3) at /ssd1/lo/fedora/include/osl/file.hxx:975
 #4 0x00007f060aec5a8f in fileaccess::ReconnectingFile::open(unsigned int) (this=0x342af78, uFlags=3)
    at /ssd1/lo/fedora/ucb/source/ucp/file/filrec.cxx:50
 #5 0x00007f060aee0324 in fileaccess::XStream_impl::XStream_impl(rtl::OUString const&, bool) (this=0x342af10, aUncPath="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott", bLock=true) at /ssd1/lo/fedora/ucb/source/ucp/file/filstr.cxx:58
 #6 0x00007f060aee8bac in fileaccess::TaskManager::open_rw(int, rtl::OUString const&, bool) (this=0x2c5ded0, CommandId=231, aUnqPath="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott", bLock=true)
    at /ssd1/lo/fedora/ucb/source/ucp/file/filtask.cxx:766
 #7 0x00007f060ae9ba9b in fileaccess::BaseContent::open(int, com::sun::star::ucb::OpenCommandArgument2 const&) (this=0x3428810, nMyCommandIdentifier=231, aCommandArgument=...) at /ssd1/lo/fedora/ucb/source/ucp/file/bc.cxx:937
 #8 0x00007f060ae99dfa in fileaccess::BaseContent::execute(com::sun::star::ucb::Command const&, int, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&) (this=0x3428810, aCommand=..., CommandId=231, Environment=uno::Reference to (ucbhelper::CommandEnvironment *) 0x341d088) at /ssd1/lo/fedora/ucb/source/ucp/file/bc.cxx:331
 #9 0x00007f060ae9d001 in non-virtual thunk to fileaccess::BaseContent::execute(com::sun::star::ucb::Command const&, int, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&) () at /ssd1/lo/fedora/instdir/program/../program/libucpfile1.so
 #10 0x00007f06337395da in ucbhelper::Content_Impl::executeCommand(com::sun::star::ucb::Command const&) (this=0x3427f70, rCommand=...)
    at /ssd1/lo/fedora/ucbhelper/source/client/content.cxx:1258
 #11 0x00007f063373be55 in ucbhelper::Content::openWriteableStream() (this=0x7ffeacc7f030)
    at /ssd1/lo/fedora/ucbhelper/source/client/content.cxx:751
 #12 0x00007f06333f56c0 in utl::MediaDescriptor::impl_openStreamWithURL(rtl::OUString const&, bool) (this=0x7ffeacc801d0, sURL="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott", bLockFile=true)
    at /ssd1/lo/fedora/unotools/source/misc/mediadescriptor.cxx:666
 #13 0x00007f06333f3e01 in utl::MediaDescriptor::impl_addInputStream(bool) (this=0x7ffeacc801d0, bLockFile=true)
    at /ssd1/lo/fedora/unotools/source/misc/mediadescriptor.cxx:521
 #14 0x00007f06333f4051 in utl::MediaDescriptor::addInputStreamOwnLock() (this=0x7ffeacc801d0)
    at /ssd1/lo/fedora/unotools/source/misc/mediadescriptor.cxx:490
 #15 0x00007f05b132f0bf in filter::config::TypeDetection::impl_openStream(utl::MediaDescriptor&) (this=0x33caa10, rDescriptor=...)
    at /ssd1/lo/fedora/filter/source/config/cache/typedetection.cxx:1127
 #16 0x00007f05b132e9ac in filter::config::TypeDetection::impl_askDetectService(rtl::OUString const&, utl::MediaDescriptor&) (this=0x33caa10, sDetectService="com.sun.star.comp.filters.StorageFilterDetect", rDescriptor=...) at /ssd1/lo/fedora/filter/source/config/cache/typedetection.cxx:981
 #17 0x00007f05b132b7a4 in filter::config::TypeDetection::impl_detectTypeFlatAndDeep(utl::MediaDescriptor&, std::__debug::vector<filter::config::FlatDetectionInfo, std::allocator<filter::config::FlatDetectionInfo> > const&, bool, std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> >&, rtl::OUString&) (this=0x33caa10, rDescriptor=..., lFlatTypes=std::__debug::vector of length 168, capacity 256 = {...}, bAllowDeep=true, rUsedDetectors=std::__debug::vector of length 1, capacity 1 = {...}, rLastChance="")
    at /ssd1/lo/fedora/filter/source/config/cache/typedetection.cxx:934
 #18 0x00007f05b1329b7c in filter::config::TypeDetection::queryTypeByDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, unsigned char) (this=0x33caa10, lDescriptor=uno::Sequence of length 6 = {...}, bAllowDeep=1 '\001')
    at /ssd1/lo/fedora/filter/source/config/cache/typedetection.cxx:429
 #19 0x00007f05b132d321 in non-virtual thunk to filter::config::TypeDetection::queryTypeByDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, unsigned char) () at /usr/bin/../lib/gcc/x86_64-redhat-linux/8/../../../../include/c++/8/bits/stl_pair.h:331
 #20 0x00007f060df5acdd in framework::LoadEnv::impl_detectTypeAndFilter() (this=0x7ffeacc80c48)
    at /ssd1/lo/fedora/framework/source/loadenv/loadenv.cxx:739
 #21 0x00007f060df58796 in framework::LoadEnv::startLoading() (this=0x7ffeacc80c48) at /ssd1/lo/fedora/framework/source/loadenv/loadenv.cxx:357
 #22 0x00007f060df57280 in framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference<com::sun::star::frame::XComponentLoader> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (xLoader=uno::Reference to (framework::Desktop *) 0x282bf98, xContext=uno::Reference to (cppu::ComponentContext *) 0x145b790, sURL="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott", sTarget="_default", nFlags=0, lArgs=uno::Sequence of length 4 = {...}) at /ssd1/lo/fedora/framework/source/loadenv/loadenv.cxx:160
 #23 0x00007f060dfaef40 in framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (this=0x282bf20, sURL="file:///ssd1/lo/fedora/instdir/share/template/common/officorr/Modern_business_letter_sans_serif.ott", sTargetFrameName="_default", nSearchFlags=0, lArguments=uno::Sequence of length 4 = {...})
    at /ssd1/lo/fedora/framework/source/services/desktop.cxx:617
 #24 0x00007f060dfaeffb in non-virtual thunk to framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) () at /ssd1/lo/fedora/include/rtl/stringutils.hxx:170
 #25 0x00007f06381ee762 in SfxTemplateManagerDlg::OpenTemplateHdl(ThumbnailViewItem*) (this=0x310e160, pItem=0x33925d0)
    at /ssd1/lo/fedora/sfx2/source/doc/templatedlg.cxx:690

Change-Id: Iaa5cc2bd4c80bc239b8f1bf7ed8aa62d89151d62

Author: Ashod Nakashian
Author Date: 2018-05-21 02:31:36 UTC

sd: disable pdf import tests

Change-Id: Iaee679d2ff322c67d081185588103d5685fa970a

Author: Björn Michaelsen
Author Date: 2018-05-10 08:51:42 UTC

dont use SwClient/SwModify in unocore: NumberingRules

Change-Id: I20ee1662310f33831757015659a70d3ffd855b3e

Author: Christian Lohmaier
Author Date: 2018-05-09 10:28:12 UTC

bump product version to 5.4.7.2.0+

Change-Id: I7a1f9aa57baef2a7a4442762b61cc16e54bdac6a

Author: Michael Stahl
Author Date: 2018-05-08 13:01:22 UTC

OFFICE-3776 xmloff: adapt ODF import to renamed text:sender-initials

ODF TC decided to rename the element to meta:creator-initials, so adapt
the import so it can read this in addition to the 2 element names
produced by current and past LO versions.

Also add a test.

Unfortunately it turned out that the ODF validator had a bug in checking
character data in foreign elements, which is triggered by the test
document, see https://issues.apache.org/jira/browse/ODFTOOLKIT-475
... so update the validator jar as well.

Change-Id: I1de1e8772b41f8937f043d9a0d150e169f25ffd4
Reviewed-on: https://gerrit.libreoffice.org/53979
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit b09889a158cbc839ebc8a6061b0b261fa74930e6)
Reviewed-on: https://gerrit.libreoffice.org/54007
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>