Change-Id: Ib59953225480e6923e418b966cce289f07f863b5
(cherry picked from commit f16f8ee5)

Conflicts:
	ure/Package_install.mk

Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a
(cherry picked from commit d6785e16)

Change-Id: I517ed7ac43b0655c7e571e0b9fead32c4f2e7948
(cherry picked from commit ec51b41b)

(cherry picked from commit c5d91c02)

Conflicts:
	scp2/source/ooo/file_ooo.scp

Change-Id: Ib047b763bfeff9dbf43db8fc11e6fd7f1fa179f8

Change-Id: Iaccda39ddf651f6b2ef326c9b3903670c25bcdde

Change-Id: Iea185bc216e92baee9f97157b8ac13a9a64f99b5

Change-Id: I74283234834b5057857620ed2466068e88628585

Change-Id: Idd01299ef4592b43e573c3b0996d4822664c6bcf

probably left-over from OUString transition

Change-Id: I29f8f34ad44828608aa16b0b0a0759e887e280af

Change-Id: I83c35b7a71d0becb98e739f076f42ce58b9e1cd8

Change-Id: Ieaad3145c01dc4ea7b3e7eb7859db89ebd1d7fe1

Change-Id: Ia26cf182ddc7c903d86bf74a8175858adb88121c

SyntaxError: ('invalid syntax', ('//usr/lib64/libreoffice/program//uno.py',
368, 77, "            return _ConstantGroup({c.Name.split('.')[-1]:
c.ConstantValue for c in td.Constants})\n"))

Change-Id: Ie87c21fbfd83fc4d6f918eb55128db235c2220a8
Reviewed-on: https://gerrit.libreoffice.org/22863Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

Change-Id: I7d48c1543b0d3239c8e646ca0765421f933cfecc

...so no need to add dead log areas here (as questionably introduced with
f59136a2 "tdf#91794 remove OSL_DEBUG_LEVEL > 1
conditionals")

Change-Id: Id0544a76f9c426bc06e327f0f2ec2d421da1fa50

(f59136a2 "tdf#91794 remove OSL_DEBUG_LEVEL > 1
conditionals" had changed it from OSL_DEBUG_LEVEL > 1 to > 0)

Change-Id: I40714993fb55ec27b80d225cec28c64f2959ab73

Change-Id: I60bb1e303f7a26b4324cccf2858258a375b53f34

Change-Id: I13047e59fc10ab169072f84c75ba88c569d16bd6

Change-Id: I91cc5614fb0db76eabd46cbe7e39ae33227728b7

Change-Id: Iac84adff096c5b847b2a63ac57ddf5b2f5e34e11

Change-Id: I9eb58884e41d9669d2413f7b5b63bddf6a4b4320

Change-Id: I18a80d7695f081c6f274dd7de68bd4dee1054be4

Change-Id: I94026a7b66a0cac01a1e42d8eee0ec7b4d5fc513

...and where appropriate use CPPUNIT_ASSERT_EQUAL to have no need to always
print out certain values

Change-Id: Iad2ccb235b09852fffd3f010cf069c45b36e2d4b

Change-Id: I027f4d53e3aa793bd61bf110899e464a9b6430ec
Reviewed-on: https://gerrit.libreoffice.org/22891Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

it was pretty bad idea not to save it for rich-formatted cells
(tdf#92296) as there is more to cell format than just a font

Change-Id: I0e5e7d7187c69519bb8f4de2b627e385fccd3d46
Reviewed-on: https://gerrit.libreoffice.org/22762Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

Change-Id: I419aba8728b3a65fca69c82a4f950daaf4815187

Change-Id: Ie8a1d015242450094928863013030b4cb0bb1f4e

Change-Id: I8a945f3e83559f421aa1a0b4fbfcec1b25932ef7

Fails with e.g. commit 963264a4
(xmlsecurity OOXML export: don't loose old signatures when adding a new
one, 2016-03-03) reverted.

Change-Id: Ia2b0f3d8914bca14075481f5ac8cd4c0033d26c1

When adding a signature, first we export it to a temp. storage, then
read it back, show the verification to the user, and then later we do or
do not write the temp. storage back to the original one.

This means the signature gets exported two times, and MSO only considers
the final result valid. So when caching signatures (to avoid a real
export based on our data model), don't cache the one we just added to
the temp. storage, but do a real export second time as well.

With this, MSO considers our appended signature (next to an existing
one) valid, too.

Change-Id: I4d615298463e037ea4e654ff5c3addcef8b0a094

We append a new signature to a document by re-exporting the existing
ones, then writing the new signature. Given that existing signatures
aren't canonicalized before hashing, write them back as-is.

With this, our own signature verification is happy about the export
result, containing an existing and a newly created signature.

Change-Id: I0ff57a2266c6070a945f0c45ca5793406678be60

Change-Id: I4813488d94e6ae2877cdaf39a3849bccb83c389d

The previous solution had problems. InfoPlist.strings were empty,
because localization has not been working since the CFBundleTypeIconFile
entries were removed from Info.plist. Icon file basename was the key
in documents.ulf. So we packaged 0 bytes long files. The second problem
was that we used LibreOffice language codes, and OS X language codes are
different in some cases. This caused problems such as French strings on
English UI (e.g. Open/Save dialogs), because the system did not
recognize en-US.lproj and en-GB.lproj, and fell back to the next one: fr.

Conflicts:
	Makefile.in

(cherry picked from commit 91902ef1)

Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134

Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f
(cherry picked from commit 53c396c7)

So no need for the related entitlements.

Change-Id: I54ba7c0586ee77f30096b50755a9a85bbb7965a5
(cherry picked from commit a1379c6d)
(cherry picked from commit d78c567c)

Conflicts:
	lo.xcent.in

Change-Id: I3bc499b15c31724dca2d49123dcdbec8dfd934f6
(cherry picked from commit fc01d27e)

Creating the pipe fails when sandboxed. This caused us to not start
the OfficeIPCThread, and that then meant that the file open requests
coming in through VCL_NSApplication's application:openFile: method in
vclnsapp.mm were not processed properly.

The OS takes care of not starting multiple LO apps simultaneously
anyway, so we don't really need any pipe, I hope.

Conflicts:
	desktop/source/app/officeipcthread.cxx

Change-Id: Ia920520ce2928787313f83199028f9c9942f61f3
(cherry picked from commit e2f4c9ea)

I doubt end-users will miss gengal.bin, regview, or regmerge.
We need the gengal program at build time. But don't bother shipping
it on OS X, at least not in the sandboxed (App Store) case.

Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24

Change-Id: Ia8f18666c766cafa63cc702bfdfa69e971cf0e71