pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to 6.4.0.0.beta1:

Browse Source 
* Various features for 6.4 libreoffice series
- Remove upstreamed patch mdds-1-5.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=838
This commit is contained in:
Tomáš Chvátal 2019-12-03 14:00:06 +00:00 committed by Git OBS Bridge
parent fad7574e92
commit 226adfd0ca
17 changed files with 75 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libreoffice-6.3.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d40ee5b29c9a0c2f0df2681f993b04a9f64e13d785fa7b7a1e8349b84149e5cf
size 224944844

16
libreoffice-6.3.3.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2wZXUACgkQ9DSh76/u
rqOpfA/9E+ClpDubbqYDuRbA4Rt6P0Iey0rvJF1Rt6ySSRQ2dKWaIva7H9+/W1tx
xvpHyBqNHcz7IrFHbuebTLAYTqsq0bx3yWST5vVo3UXxFq0h2mv7Z2YWfYLD8j6K
LEVaFWn7JK2KzM+u8wjicg4K2q4HqrvulJZHh5puo1W8g0IxXbfAoMEcEbzu1JoV
1+gZFEMMQA8DXeA5Z8DvuEJNv//MpOaisdMnlIDfhkF6hwWelP+QsGeotuQJu5X6
SEhhyQAiIH1IjfbK7PtK5KaPqNses301sMfcGo8AtaoUkrgnbX8Ma1sdpt1oolme
AOwFiisrktdYWycWWHKSeE+UG3Bfzhid3rAIUpiElaRt5rX+Dzd3U5E1QWVH0OkZ
46dVPdgnpqTGA4MBx3ql3T399Z0/MIjW2vNWpjuu4IAJd8pZhR+vOT5ClUdf+7CW
LMxwkWIKrDyNi/uNAl7W3Euu6/dK/PPfj1ftpSFqWwM0WWD+M6cFZai7m7nJbn6t
9cu4/TVK7CV0VmshF1AAwCWuPRh7zfMTHw7SnO1UUnmhPACrwLk8uoEN2ZxGLLdL
Bi2ICyluGjFvkv7GqV9PpA4bArq6Hwofcnrz0ncOsj8IKpcLk2NY0wDWYcbl1WVr
SIGL4zcNgnE6c/QmWzRYnvs0xmbktOut88veFIzIM+zA0RWf3+U=
=Z3WC
-----END PGP SIGNATURE-----

3
libreoffice-6.4.0.0.beta1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:661d822a0317d9861da0252bb3a4341860d5c2596e08a92342600333c0e28156
size 230848284

16
libreoffice-6.4.0.0.beta1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl3MUbgACgkQ9DSh76/u
rqNMwxAAt5PkCjO3RkcHcrQEVYFehgq9JhdRNIbQB+t0MsYEX+wEwyQ1My+JXH0h
yEVwvo+vUYMuVHB/ss0TKqsjBNulmBo8sF1a2ZPTmfcnCBikzDFZe1Hxn5g/P/KT
dBUGMdTznKosjykuFO6eCHOBV+lcVIiUUl/MFkFJRENt4Ldwg1pRgxFwQLQUX84J
AkFmL7ZPD1F9g4uYz2YqNabxXcSyB7Z0tfhOZBoUI4/3aNSqJxxR3xdYAeaSTNB2
vj5zdTr1IRpOSxEKau5gfBZe5zQs5bRAJynUoNNlpUSeSaiQKRxpeOibX+/Ud0Jj
mAcG7V5N5GuGoKdsUni0CBsDSvb5WFsUWNspKeJCB66YuAmw4bUaYXmVNxVO6Yvn
fmsi1coF/D5Yy6340zLrDoJzt5hNyW3mcbsja/cQt939dYWB942EyJEM/fzGU+gz
mNGCagsMXO5k/reAjSFZ0N4yxpgiFrimHaeyDvHrL+X/kg9xnc4BOHwHFw69AlmI
AwB+SYXQP4N1ki+hIEova+F4TKjOXUh5z+Otau+Lj7DwwDeZKw33sEJXWxEIu8Rd
hv+oZzT18EXDygSqPefDPmNlEG50AM/GkeQ0GKqKuHUX7MKTuUt/s4R7651co9Gd
xoipV+jvrHjn8oc2Ffn9F23EApR0pZB4/NYQF09e7/vfDORKHkE=
=nn/M
-----END PGP SIGNATURE-----

3
libreoffice-help-6.3.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab83460b6383bf592f588a452b1ccc7a01a6da7347fef5442c2089f05ac63ffe
size 13192080

16
libreoffice-help-6.3.3.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2wZXkACgkQ9DSh76/u
rqMVSA/+JlQ8Q+AwA3XmVehncD3eCofEYPszMeEuUuLlnTzPeQTlqMQbR3uufH/i
ytjUrRfkM6C/BOPTtUrL2q2k5vFrz9xHFyhdyctopjgLAONvrwpXnaoRghApZNSZ
BlbAdEN72L929szhGF8ZIZTuDrNqqNiHXnAB5CBHZkL5Q9BMc93sUwWR/Fadh8SE
8XOnyXVy6CQDuR6Tqq/3y5fY8N//dzg4JJ0oLBNZeQcswVnLrpkpgHPrRsjy4DMA
C+dDYzWSaovp7c7ihx3uQq7gh/In/Nwf6Xw8C7WvOvTrigwxCYzvjUCH3GF6IZk0
k0SPSNKSpG66hA+sE1nPl27gwYO5zxHdY51QiGP5kaQ3tX8bvtlAwDqBZM3i4UU4
h3ZRccFtelSTZyNs82nkyDukwfb4cTkhQFAdAQzeM2oYlkHlCaDFJAmfy7AodBcW
BzSY2Q6oODPdbKk0/ZEwfhwxGqzuf9XNHgAPTtN1IwR4WmRv1Uo2YZEmCkmqNXGF
C1HyP8q587WIAw7+CayaMNL9aV6pO0x/mmpc+2A+NI45MIvT2lchS5IVXrXkhdBB
C+ZRZtD/DkPDecgiZHs5klvVzvai5GnMN4B5adspWnDieipedu951aTAnhnLxOOP
UCCN96TuGckIXj+PQaR24ndR5GCxHN5ZnRCilrSHlGiipptT8+Y=
=vXTa
-----END PGP SIGNATURE-----

3
libreoffice-help-6.4.0.0.beta1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:006146c53402bd5a4be3600f318f3a53a7f90122119b9751163c156a131f044d
size 63925264

16
libreoffice-help-6.4.0.0.beta1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl3MUcMACgkQ9DSh76/u
rqM8uQ//WC1DzU1NZboFE8ugwbp2C2yVzlcYU3/Jg3jlNnMswf5OmS0bilLtxv0M
fQTtb183GilAL1htmliQVFobhfoOmwp8U7FUoMesTMPKYrypFMz947i8xhwVTeoN
G0NMG1c6sdFRJ709EHgM+dAI3xeHO7E1X4toaU92KHisSwzK5aCLSpt4mHsxCKzm
43K7Ws0ZyNfOeHnr0GuNmSA8PzzsN76FB7G5pH9m5bPcIx0o4XtzSBluIpAF0/an
+kgCtfxLD221V+WLyHUekxhoX8EOMJAutWn1hcWUKuB7Xsq5Jh37Z9mvff+ZpPTN
vbklBuwoNZX5YLJx/W9L/lJy3AVIWvlFH2zWNeQCXcLdoZEsmZh+zkPr++w1xdn4
WoZpQKX6Q503KIA7bG4OQkfgz5Bq0SFDPRhaHarArGHEYjo7KdoDKbJOln3AOcVq
uKFJ0BW1J/jMUYuEzKrHenOtL8ttuWJNpLfFfareqje/PZ4Xk4n3y/m9SL9BxPlg
ErxWzltSAdosT/hxsFAEaIEA5zdtqIv0RtVVQpNeng5PmxSFDmxvNlviMKz+EwbM
RzGgL9W+b+oBlwKB1m0BSUvUaddiwgSvaI20FZIYPm6XeU9Iq4ITJQD80GmlJlt0
+FgKqqQ9utnkXCBRp9Os9ZsYBVVNC0GxiQwKCMvBqVg3lDaACEc=
=YdSd
-----END PGP SIGNATURE-----

3
libreoffice-translations-6.3.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:721b760b7a9dc88e7d278dab89a2148a4e9239047f7b8f9ee6741c0f8f84b2fb
size 146440936

16
libreoffice-translations-6.3.3.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2wZXkACgkQ9DSh76/u
rqM+wRAA0900iveud2XZDR8B8GXo20EW+/K6ainAHlX835sFzyhaW3GhDgVB84IG
2H1WDMxDxljhdwXuCTwk8f3A9mWZN7kIbwdf15CXO/RPIVaQ6vLYX8tG1iwjtYjU
daES9HHYvsxPMW7DdP7k/aiScMBNjjScfGJoxdORitJhCNgE2pNa8O0ZmpEr8DsG
ofnwCYCZSEVy55CXdfOVr6gQKVtGru5hHEDFzmTT1eDtp68Vt/lLNQ9GaDbV0O/j
p4EAsFBi1fRDG/si6OdqtaT3wINz/HvAX1Z0JDhK4MwoFUe46gWpzDu1H0r9rUx8
t/SeSLXnUuE+JJarFtQSgVuZo/SuqEY7sECDNtsA59R81Scfbtl9jioJFbXPyjz6
Wrsn1DvpdgEk7OX69t3Y6H7aE88Rvc6x3pAp7vVH/AH0p3pwoWdlWqSZBYGfPbXP
qbM8waPaiZrPHLJLQ4ujJHdRYQyN8geKZRONNKzmBUebrXgPkYB7GnI2yRxBLZC/
WC3f8hC9LdyOBwxDzAqUqDtRX6865KHzYO46qjKwcEQL6feOsfnoXJvSI1IhQwlp
pYEiRrRQ2NEd1k1Rr93tKBJLS6tcJfAhlA61OQg8Ivv5Q5mAj9L5eXzsnVpoMceB
IgR2MfCBd6Mw87QpohIoF89IlL9whS3hMnTBkz7H01BEZB8axew=
=Byp4
-----END PGP SIGNATURE-----

3
libreoffice-translations-6.4.0.0.beta1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7f824c281cffd96c63c59561a6a9600147a39c9ffe1316fedc0c9202ada57e5
size 170023172

16
libreoffice-translations-6.4.0.0.beta1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl3MUcQACgkQ9DSh76/u
rqOhnw//ZQD7xNlCj0abrXznib8p6bwVFeXCiUc3qWufkhd/tjBplRfxI92SkWsN
j4HvQVbhthm+UBS56xOpvS6DGWarQtYChQ/35iiL5DYEbwI1BQ3V1wskxApVnXMZ
ZN+VG1sEsPmrykOdX5vsL1E7PUJr4zdXZcU8qrArak/2zKfJGKvvS6Vjb3JIlJcq
cXSz4wtDmwmldHjzx9H58X5GYE2o+FcU2BirURiKJUdaeKgd2I82uJokoeLf47fi
PYYmuAAnZlTQFk+YeQJ/RwyBmz/DGMIbHAxkS3kqxAfqWakfKQmw6myvWyIUFx8y
N0Q/Wn+U1Rz78BGjs0sqJhHxF4RrlhL8pFeVGbaCSCq2xBHyUlI6M3AMtbZXXylB
ooo6hPtHluELIruLHJBKRsPD3rqU85a1nd6Ffz4nYNgjYUSpbn1iHrf8N2V/390s
iqOOub4hFnqZ/1Mk76lxbCjVLrzPjxxS5lfCIJ8ASlYuX9IHNHjop48Yz253bWJp
BNu1UPS+K7PbeKmcyj4jLkDQpjnoC09BZnSS+BThg9h0mrHpyL+Tdqj90UGLYWLf
rimS2b4mngp+BnpyrsgchSWvBOe7gfSLXFpSMmYehJy5Kr2Fft+ix/5GkeQNNJi6
UWHOfB8bFO0k4lEI6SAOOOqgLJmqckmkkYu0c/5CpdIoFkYnBoQ=
=M0sG
-----END PGP SIGNATURE-----

7
libreoffice.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Dec 3 08:58:06 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 6.4.0.0.beta1:
* Various features for 6.4 libreoffice series
- Remove upstreamed patch mdds-1-5.patch
-------------------------------------------------------------------
Wed Oct 30 11:37:48 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

18
libreoffice.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libreoffice
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%define numbertext_version 0.9.5
# Urls
%define external_url https://dev-www.libreoffice.org/src/
#%define tarball_url https://download.documentfoundation.org/libreoffice/src/6.1.0
#%%define tarball_url https://download.documentfoundation.org/libreoffice/src/6.4.0
%define tarball_url https://dev-builds.libreoffice.org/pre-releases/src/
# LTO needs newer toolchain stack only
%if 0%{?suse_version} >= 1500
@ -50,7 +50,7 @@
%bcond_with system_gpgme
%endif
Name: libreoffice
Version: 6.3.3.2
Version: 6.4.0.0.beta1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -90,7 +90,7 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
Source2006: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
# PDFium is bundled everywhere
Source2008: %{external_url}/pdfium-3794.tar.bz2
Source2008: %{external_url}/pdfium-3963.tar.bz2
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build
Patch1: scp2-user-config-suse.diff
@ -98,7 +98,6 @@ Patch1: scp2-user-config-suse.diff
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
Patch5: mdds-1-5.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep
@ -151,6 +150,7 @@ BuildRequires: pentaho-reporting-flow-engine
BuildRequires: pkgconfig
BuildRequires: python3-lxml
BuildRequires: python3-xml
BuildRequires: qrcodegen-devel
BuildRequires: sac
BuildRequires: ucpp
BuildRequires: unixODBC-devel
@ -218,7 +218,7 @@ BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends)
BuildRequires: pkgconfig(serf-1) >= 1.1.0
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.28
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xt)
Requires: liberation-fonts
@ -953,7 +953,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%endif # Leap 42/SLE-12
%patch2
%patch3
%patch5 -p1
%patch990 -p1
%patch991 -p1
@ -1053,16 +1052,15 @@ export NOCONFIGURE=yes
--with-external-tar="$RPM_SOURCE_DIR" \
--disable-epm \
--disable-online-update \
--disable-gstreamer-0-10 \
--enable-gstreamer-1-0 \
--enable-gtk3 \
--disable-gtk \
%if %{with kdeintegration}
--disable-gtk3-kde5 \
--enable-kde5 \
--enable-kf5 \
--enable-qt5 \
%else
--disable-kde5 \
--disable-kf5 \
--disable-qt5 \
%endif
--enable-introspection \

245
mdds-1-5.patch
View File

@ -1,245 +0,0 @@
From 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei@libreoffice.org>
Date: Mon, 12 Aug 2019 13:57:34 -0400
Subject: Switch mdds to 1.5.0 and liborcus to 0.15.0.
Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265
Reviewed-on: https://gerrit.libreoffice.org/77482
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
---
RepositoryExternal.mk | 4 ++--
configure.ac | 4 ++--
download.lst | 8 +++----
.../0001-Prevent-unsigned-integer-underflow.patch | 27 ----------------------
external/liborcus/ExternalPackage_liborcus.mk | 8 +++----
external/liborcus/ExternalProject_liborcus.mk | 4 ++--
external/liborcus/Library_orcus-parser.mk | 2 ++
external/liborcus/Library_orcus.mk | 7 ++++++
external/liborcus/UnpackedTarball_liborcus.mk | 3 ---
external/liborcus/version.patch.0 | 11 ---------
sc/inc/mtvelements.hxx | 8 +++----
sc/inc/orcusxml.hxx | 1 +
sc/qa/unit/dataproviders_test.cxx | 1 +
sc/source/core/tool/scmatrix.cxx | 8 +++----
sc/source/filter/inc/orcusinterface.hxx | 2 ++
sc/source/filter/orcus/interface.cxx | 8 +++++--
sc/source/filter/orcus/orcusfiltersimpl.cxx | 4 ++--
sc/source/filter/orcus/xmlcontext.cxx | 9 +++++++-
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 6 +++++
svl/source/misc/gridprinter.cxx | 2 +-
20 files changed, 58 insertions(+), 69 deletions(-)
delete mode 100644 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch
delete mode 100644 external/liborcus/version.patch.0
diff --git a/configure.ac b/configure.ac
index 1510daf..d0e6759 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9291,7 +9291,7 @@ AC_SUBST(SYSTEM_BOOST)
dnl ===================================================================
dnl Check for system mdds
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.5 >= 1.5.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
dnl ===================================================================
dnl Check for system glm
@@ -9597,7 +9597,7 @@ AC_SUBST(ENABLE_FUZZERS)
dnl ===================================================================
dnl Orcus
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0])
if test "$with_system_orcus" != "yes"; then
if test "$SYSTEM_BOOST" = "TRUE"; then
# ===========================================================
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 407f039..382fb4d 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -52,9 +52,9 @@ const mdds::mtv::element_t element_type_formula = mdds::mtv::element_type_user_s
const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_start + 5;
/// Mapped standard element types (for convenience).
-const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric;
+const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_double;
const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty;
-const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort;
+const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_uint16;
/// Custom element blocks.
@@ -66,8 +66,8 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_edittext, Edit
typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFormulaCell> formula_block;
/// Mapped standard element blocks (for convenience).
-typedef mdds::mtv::numeric_element_block numeric_block;
-typedef mdds::mtv::ushort_element_block uint16_block;
+typedef mdds::mtv::double_element_block numeric_block;
+typedef mdds::mtv::uint16_element_block uint16_block;
/// This needs to be in the same namespace as CellTextAttr.
MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block)
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index ced991e..5db292c 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -69,6 +69,7 @@ struct ScOrcusImportXMLParam
{
ScAddress maPos;
std::vector<OString> maFieldPaths;
+ std::vector<OString> maRowGroups;
};
typedef std::vector<CellLink> CellLinksType;
diff --git a/sc/qa/unit/dataproviders_test.cxx b/sc/qa/unit/dataproviders_test.cxx
index 1e9cf97..a9b6b11 100644
--- a/sc/qa/unit/dataproviders_test.cxx
+++ b/sc/qa/unit/dataproviders_test.cxx
@@ -156,6 +156,7 @@ void ScDataProvidersTest::testXMLImport()
aRangeLink.maPos = ScAddress(0,0,0);
aRangeLink.maFieldPaths.push_back("/bookstore/book/title");
aRangeLink.maFieldPaths.push_back("/bookstore/book/author");
+ aRangeLink.maRowGroups.push_back("/bookstore/book");
aParam.maRangeLinks.push_back(aRangeLink);
createFileURL("test1.", "xml", aFileURL);
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 04660ab..2c03fe0 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1935,8 +1935,8 @@ public:
{
case mdds::mtm::element_numeric:
{
- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data);
- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data);
+ double_element_block::const_iterator it = double_element_block::begin(*node.data);
+ double_element_block::const_iterator itEnd = double_element_block::end(*node.data);
for (; it != itEnd; ++it, ++miPos)
*miPos = *it;
}
@@ -2012,8 +2012,8 @@ public:
{
case mdds::mtm::element_numeric:
{
- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data);
- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data);
+ double_element_block::const_iterator it = double_element_block::begin(*node.data);
+ double_element_block::const_iterator itEnd = double_element_block::end(*node.data);
for (; it != itEnd; ++it, ++miPos)
{
if (GetDoubleErrorValue(*miPos) == FormulaError::ElementNaN)
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index 9d090b7..7c7c4f2 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -332,6 +332,8 @@ public:
virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
+ virtual void fill_down_cells(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::row_t range_size) override;
+
SCTAB getIndex() const { return mnTab; }
const sc::SharedFormulaGroups& getSharedFormulaGroups() const;
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 833fb27..23f17a1 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -61,8 +61,7 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
case orcus::spreadsheet::formula_grammar_t::ods:
eGrammar = formula::FormulaGrammar::GRAM_ODFF;
break;
- case orcus::spreadsheet::formula_grammar_t::xlsx_2007:
- case orcus::spreadsheet::formula_grammar_t::xlsx_2010:
+ case orcus::spreadsheet::formula_grammar_t::xlsx:
eGrammar = formula::FormulaGrammar::GRAM_OOXML;
break;
case orcus::spreadsheet::formula_grammar_t::gnumeric:
@@ -1188,6 +1187,11 @@ orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
return ret;
}
+void ScOrcusSheet::fill_down_cells(os::row_t /*row*/, os::col_t /*col*/, os::row_t /*range_size*/)
+{
+ // TODO : implement this.
+}
+
const sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() const
{
return maFormulaGroups;
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index cdfb70d..8e9b0b1 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -139,10 +139,10 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con
try
{
- std::string content = orcus::load_file_content(path);
+ orcus::file_content content(path);
ScOrcusFactory aFactory(rDoc);
ScOrcusStyles aStyles(aFactory);
- orcus::import_ods::read_styles(content.c_str(), content.size(), &aStyles);
+ orcus::import_ods::read_styles(content.data(), content.size(), &aStyles);
}
catch (const std::exception& e)
{
diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
index 2548f5b..71c44bc 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -269,10 +269,17 @@ void ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam)
std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter));
+ std::for_each(rLink.maRowGroups.begin(), rLink.maRowGroups.end(),
+ [&filter] (const OString& rRowGroup)
+ {
+ filter.set_range_row_group(rRowGroup.getStr());
+ }
+ );
+
filter.commit_range();
}
- std::string content = orcus::load_file_content(path);
+ orcus::file_content content(path);
filter.read_stream(content.data(), content.size());
aFactory.finalize();
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 95e8006..26b0cbc 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -533,6 +533,12 @@ void ScXMLSourceDlg::OkPressed()
// Go through all its child elements.
getFieldLinks(aRangeLink, aParam.maNamespaces, *mxLbTree, *rEntry);
+ // Add the anchor node as a grouping node, which will be used as a
+ // row position increment point.
+ OUString aThisEntry = getXPath(*mxLbTree, *rEntry, aParam.maNamespaces);
+ aRangeLink.maRowGroups.push_back(
+ OUStringToOString(aThisEntry, RTL_TEXTENCODING_UTF8));
+
aParam.maRangeLinks.push_back(aRangeLink);
}
}
diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
index e129457..4f013d4 100644
--- a/svl/source/misc/gridprinter.cxx
+++ b/svl/source/misc/gridprinter.cxx
@@ -29,7 +29,7 @@ typedef mdds::mtv::default_element_block<element_type_string, OUString> string_b
struct matrix_trait
{
typedef string_block string_element_block;
- typedef mdds::mtv::ushort_element_block integer_element_block;
+ typedef mdds::mtv::uint16_element_block integer_element_block;
typedef mdds::mtv::custom_block_func1<string_block> element_block_func;
};
--
cgit v1.1

3
pdfium-3794.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4
size 7123074

3
pdfium-3963.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895
size 7083415