df-libreoffice:distro/collabora/cp-5.1

Last commit made on 2018-04-23
Get this branch:
git clone -b distro/collabora/cp-5.1 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:
distro/collabora/cp-5.1
Repository:
lp:df-libreoffice

Recent commits

1931563... by Andras Timar <email address hidden>

Bump version to 5.1-27

Change-Id: Id25601a27c794de19a4e4609e70e2ed55a412c57

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

ofz#6173 check index before use

Change-Id: I09d15ab324af0a8b3566f11868eb3266a68c4afe
Reviewed-on: https://gerrit.libreoffice.org/49499
Tested-by: Jenkins <email address hidden>
Reviewed-by: David Tardon <email address hidden>
(cherry picked from commit 1e9c954ffb1bca7f07509331802dd4ac85a7b11b)

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

ofz#5747 short->sal_Int32 like in StgDataStrm

Change-Id: I254c00b1142d7187beabe5d18532efec036de494
Reviewed-on: https://gerrit.libreoffice.org/48756
Tested-by: Jenkins <email address hidden>
Reviewed-by: Michael Stahl <email address hidden>
(cherry picked from commit 14b227e3707f041f31446d7eead0884ff8326a62)

4e01490... by Eike Rathke

CheckLinkFormulaNeedingCheck() for named expressions

 This is a combination of 3 commits.

CheckLinkFormulaNeedingCheck() for .ods named expressions

This is specifically necessary for named expressions that are used
in conditional format formulas, for which RPN is generated at a
later stage, not during import.

(cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2)

CheckLinkFormulaNeedingCheck() for .xls named expressions

(cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616)

CheckLinkFormulaNeedingCheck() for .xlsx named expressions

(cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c)

 Conflicts:
 sc/source/filter/oox/defnamesbuffer.cxx

e03cb5767c34f8157a492a6d6c3b0700d065052d
217c89822ab477a6c383d170ae739e44efd10fa3

Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc
Reviewed-on: https://gerrit.libreoffice.org/48858
Tested-by: Jenkins <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>

68a7e83... by Eike Rathke

CheckLinkFormulaNeedingCheck() for conditional format expressions

 This is a combination of 4 commits.

Prepare CheckLinkFormulaNeedingCheck() to use either RPN or tokenized code

Conditional format formulas aren't finally compiled until needed
so the check will have to operate on the tokenized expression
instead of RPN code.

(cherry picked from commit faa0305ba3d0dc698fce4915d4f3a1fb52422380)

CheckLinkFormulaNeedingCheck() for .ods conditional format expressions

(cherry picked from commit 2930ba2ac5d9423f2848b968edcd8ddc71966186)

CheckLinkFormulaNeedingCheck() for .xlsx conditional format expressions

(cherry picked from commit fef24d9f999ee54d7936900485d97ff26656f517)

CheckLinkFormulaNeedingCheck() for .xls conditional format expressions

(cherry picked from commit af2a2a0c72db312902e466c36697b5c198041e82)

45eb1ab5efa0ec9da2663f20427d2474ce300826
31ede1a23223a798141a0891deeabd8cf88fff58
afa112cc591b411d80ead48bf726788d361f6eb3

Change-Id: I68837e9bd33f125ab47b10b1a6fa18175abd1627
Reviewed-on: https://gerrit.libreoffice.org/48719
Tested-by: Jenkins <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>

b5e114e... by Eike Rathke

CheckLinkFormulaNeedingCheck() for .xls and .xlsx formula cells

 This is a combination of 3 commits.

Move implementation to CheckLinkFormulaNeedingCheck() for further reuse

(cherry picked from commit 55e484c7bcd3ef218e08d3fd93f97bf98fd8cb7f)

CheckLinkFormulaNeedingCheck() for .xlsx cell formulas

(cherry picked from commit f96dbc3dd9c33202f75e29ef49d962386595995d)

CheckLinkFormulaNeedingCheck() for .xls cell formulas

(cherry picked from commit 6bc48275558c3f76c4da25eb8af3c48583ac5599)

a6dd195f7eb4d43483e87eeca59f651e7bf2dcb8
2587fbc4fec39b6f2c8e733331815a2953dee308

Change-Id: I541d2b6e12a88371c064b901b00e71206ee0c18e
Reviewed-on: https://gerrit.libreoffice.org/48143
Tested-by: Jenkins <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>

1005021... by Andras Timar <email address hidden>

Bump version to 5.1-26

Change-Id: Ic1421c1c7d9f39618bd890e510c6359ffc42d356

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

handle ocWebservice similarly to ocDde

might have too much in here seeing as we don't need to worry about
ocWebservice calling into itself

Reviewed-on: https://gerrit.libreoffice.org/47819
Tested-by: Jenkins <email address hidden>
Reviewed-by: Eike Rathke <email address hidden>
(cherry picked from commit e1946d75a1095c2596d7815600454ff01fcd3270)
Signed-off-by: Andras Timar <email address hidden>

(cherry picked from commit 78c1ae24007d8098ee4f4add6d72e84411181785)

(cherry picked from commit a09ca6b29b16f29e21ea65658c112eaf1cf7d819)

Change-Id: I0145f38cc1c1f9ff514a496f7101d81cde9e7c67

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

Better handle ScDde formulas with missing dde-link entries

typically each ScDde formula has a matching table:dde-link which
results in a ScDdeLink getting inserted during the load. If that dde-link
is missing then no ScDdeLink exists and ScDde() will create a new one without
cached content. So detect that ScDde is used in the freshing loaded ods
and defer fetching new content until the right time.

only call GetHasMacroFunc to set SetHasMacroFunc

and bHasMacroFunc is not accessed any other way, so this is an oxbow

Reviewed-on: https://gerrit.libreoffice.org/47757
Tested-by: Jenkins <email address hidden>
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>
(cherry picked from commit b0597ba5d745974fce752e1b677451a19350d351)
Reviewed-on: https://gerrit.libreoffice.org/47818
Reviewed-by: Eike Rathke <email address hidden>
(cherry picked from commit 4ede45eb239b1604bca900c22481b7d13e4c2790)
Signed-off-by: Andras Timar <email address hidden>

(cherry picked from commit 3139914eb6379837fbf309642a63371128042db1)
(cherry picked from commit ef93fb5ae0691cba777c9d2b24a3180e14281cbc)

Change-Id: I016b53288076d83dd49e92e245346a5f7f560522

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

limit WEBSERVICE to http[s] protocols

and like excel...

'For protocols that aren’t supported, such as ftp:// or file://, WEBSERVICE
returns the #VALUE! error value.'

Change-Id: I0e9c6fd3426fad56a199eafac48de9b0f23914b3
(cherry picked from commit c6c3ed3c750a3c71cb57909c60773fde2c43cd2a)
(cherry picked from commit defb648f718c3ea52c719313986a7188c6a6eafd)