Accepting request 761834 from LibreOffice:Factory
- Add patch to fix button ordering in Qt interface: * 0001-tdf-129879-Fix-wrong-order-of-buttons.patch - Set LANG during check; needed for a UTF8-related test to pass. - Update to 6.4.0.1: * Various minor fixes for the RC1 of 6.4 branch - Update to 6.4.0.0.beta1: * Various features for 6.4 libreoffice series - Remove upstreamed patch mdds-1-5.patch OBS-URL: https://build.opensuse.org/request/show/761834 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=191
This commit is contained in:
commit
a9b64f773e
28
0001-tdf-129879-Fix-wrong-order-of-buttons.patch
Normal file
28
0001-tdf-129879-Fix-wrong-order-of-buttons.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 9b51a4b02993524f42bbd4f19d982b88914b788f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
|
||||
Date: Wed, 8 Jan 2020 13:25:05 +0100
|
||||
Subject: [PATCH] tdf#129879 Fix wrong order of buttons
|
||||
|
||||
Change-Id: I0cb135c5b8298fd7c5579673d0eaff7068a03842
|
||||
---
|
||||
vcl/source/window/layout.cxx | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
|
||||
index 981ac621aa60..9c5a36304a21 100644
|
||||
--- a/vcl/source/window/layout.cxx
|
||||
+++ b/vcl/source/window/layout.cxx
|
||||
@@ -718,8 +718,8 @@ static int getButtonPriority(const OString &rType)
|
||||
const OUString &rEnv = Application::GetDesktopEnvironment();
|
||||
|
||||
if (rEnv.equalsIgnoreAsciiCase("windows") ||
|
||||
- rEnv.equalsIgnoreAsciiCase("tde") ||
|
||||
- rEnv.startsWithIgnoreAsciiCase("kde"))
|
||||
+ rEnv.equalsIgnoreAsciiCase("lxqt") ||
|
||||
+ rEnv.startsWithIgnoreAsciiCase("plasma"))
|
||||
{
|
||||
pOrder = &aSaveDiscardCancel[0];
|
||||
}
|
||||
--
|
||||
2.24.1
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d40ee5b29c9a0c2f0df2681f993b04a9f64e13d785fa7b7a1e8349b84149e5cf
|
||||
size 224944844
|
@ -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.1.tar.xz
Normal file
3
libreoffice-6.4.0.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0dd7516863ed272d6f19b11bc00142ac98825687d821c9f98561720ff7628997
|
||||
size 228708004
|
16
libreoffice-6.4.0.1.tar.xz.asc
Normal file
16
libreoffice-6.4.0.1.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl36CvQACgkQ9DSh76/u
|
||||
rqNIEw//YyURwMRvtkKBHizQ88873Hkp4RAvhjft72GcvE2W8VEMevI+GLZnSCXH
|
||||
Lw9Jy1ezWP3mfbmDAytzYxsOy+jig194RAFumDelCDMExAZV0ykgUIakH7iGwLGR
|
||||
rhOkhRYi8aSMSHV5DP8OgznxSFVuYm0ERuFye38f0lm5nWf8Ce9qyOiI4ITfXbfF
|
||||
FUlTSsrnfSV+7u0dreHcek/G6PAfJe6wVENaoF9t4ksDtitjyktKRUJWyuatSjou
|
||||
HW+CkxmLF1puYCFGKr4cHAoyy9sAG4RCQ7umi9eCutmnbjwXr+diK5KLOXGr1Aen
|
||||
aVv3xVMRSHnF//IIgQxfHrBrbfp/BrVRcyrH/hBgEyvBOwQWu92lQ+iZOFI/eCOV
|
||||
TLzA0f33rQRqMf9exnfp08IqB3HrEnUDRnrdPTQ9g8UZRkVKacXtWcWhEG832V8x
|
||||
DggcCKub/nwi1qxMJCD+iaNFABngTVZa+9AXRtWbfMneo6r5gvxTV5toYzwjwnFZ
|
||||
W+cx4Z3cfXYK4LUVXwy2T0FxRapltrnIMy2PHd+aIwrLdVSgDLgZdj84ctA+bYUW
|
||||
+pMmfMnAwCPLPEn25Fxu11/eqj9/in9t59oa6gpMw6xSiRtdaVlz7UibBeh482mv
|
||||
w0rMSx7pjftKVfy9YGtOpWLRYjFEGCARhw4s7EwnxEEVwCruB2Y=
|
||||
=icSR
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ab83460b6383bf592f588a452b1ccc7a01a6da7347fef5442c2089f05ac63ffe
|
||||
size 13192080
|
@ -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.1.tar.xz
Normal file
3
libreoffice-help-6.4.0.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9ea7cf11c7f036427dbf32fc47296745c569cda48e89f29dfc108753f75111b4
|
||||
size 85627668
|
16
libreoffice-help-6.4.0.1.tar.xz.asc
Normal file
16
libreoffice-help-6.4.0.1.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl36Cv0ACgkQ9DSh76/u
|
||||
rqOa+xAAknb2amPG/G7bILChRXX0rVEfUkuwafIFA+Hyhx+kb7SJ/Dt2ybvjnEwx
|
||||
epmTsXMbH1XbgL+XfytKi34/T8kJMSx5v6ZNOE9/VigY08eA1n+BumEa2M+vNOGk
|
||||
7p9YvTJOKdzQcobRS92jU+ytYLem17XlfdY5g60m2si/ygV+1NinHFFS8LxuRunc
|
||||
N5Q9Xrb4Xx8LRk5o5QWE75qj80OCWQWfCnUUAVzWqR/+Nf/y1bE34Cz3dzBPoILo
|
||||
HQlSjy2CCP/GkqCs1iAQT+QgR5ekp4dldlukCzMACp2TUmfYz+PZ+egZsyYhUTk9
|
||||
itQDgzlpl1QlaIOsRJi4Aj4vKmQHyeG81qdOulS0EZfurgEKIoAMKuJKXeqDIU4p
|
||||
8EZupet0DDIj1FOHCs+qC57+vwMSBljITnATMpggFQeFUjRspF0Ys4FlOPRVjN32
|
||||
4mc+qaGqA0++Qk1P6rzou9wkPE0u8cpbg2SPt+eSTVS2XgSQjSvhjuhr0YCENk/S
|
||||
x6pLiTfql0w31cuHsUIYYnM0G5Ths8ABHpsK30KFb3Vo6yBntPSJ5/eskYyyQsLi
|
||||
lTY6ZkuuUNFcNrjnRa01akjhrRcId+6Qb3kcumGgUQJ3b2C33hx1QokaWLoeiTdB
|
||||
XEoZSlxC5B72OhQisDWzBrxuUXaQpdvROwrD6jk+fNloaTuQ40U=
|
||||
=qyi7
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:721b760b7a9dc88e7d278dab89a2148a4e9239047f7b8f9ee6741c0f8f84b2fb
|
||||
size 146440936
|
@ -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.1.tar.xz
Normal file
3
libreoffice-translations-6.4.0.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8432bba690826d81bc241ce13ffaf1d23abda255f508f5198b1ed82d0b1300a4
|
||||
size 170999896
|
16
libreoffice-translations-6.4.0.1.tar.xz.asc
Normal file
16
libreoffice-translations-6.4.0.1.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl36Cv4ACgkQ9DSh76/u
|
||||
rqN9DQ/+MSgn2ql/14DLiLGDcAKCRBWxHRnuuG8srzDB00KEo1grSZ0peuodRjzH
|
||||
CLeKmSraL39l5pfv8Tq9k6Oq7muu5m68Ip5Y3dOFFTjhoU0FaqJXCTpsU2V9OJs4
|
||||
eeGX5FnPpZL3xHENMEKj/4fBisAP3hGR4qVuObzWbojSwM5EOhdP0rtAuuPS5C2R
|
||||
dnEq166gJtEAa/dpzBCXHMvouN1MdjdvcwovWsstquLAc8OF4RiEf6gLsHQCmE/m
|
||||
GxY/k3vtzKyVGlhxQiGZxPMner22q5GylVPzlB5XI/OZL8QQ8oGOyMI08sHCoc1Q
|
||||
ttTe/um/WiAjx8PFz7rk6WZcJbrxPpwQzL3K3eMxP5oAoNM21QZKFI/WJ2GdzcPR
|
||||
WDxHCDrCcGXpWG6PS+axeagcjRJGaqO8Lq4NbEOnPC65uKBCJSeTG9YQ68jFkJF6
|
||||
mzw0dw/Y1+7N8wXTQ97K6DI+CcoT/3FTHYrS1TRW9c/W3dIlEdi6U5Fb6S8B+3Ki
|
||||
8YMLQnJ1mJT9flpYkMwcDRR2Ah57dJIKBfhCBXdsVlnUrzlrLE+p8M0uOVHdw/Iw
|
||||
ZHhTzzgQJzBtZLfNkqixjJomR+nhcvOclVSHRCgK+g0CIXlihaFOg63sK2o7xUhg
|
||||
Ma9SC5bOHx9mx+67fPDQDLyI7ZRpRD69Rg14O+zI/tcyIvx3aVo=
|
||||
=hxRa
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 8 12:29:11 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Add patch to fix button ordering in Qt interface:
|
||||
* 0001-tdf-129879-Fix-wrong-order-of-buttons.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 5 03:59:38 UTC 2020 - Michael Gorse <mgorse@suse.com>
|
||||
|
||||
- Set LANG during check; needed for a UTF8-related test to pass.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 2 10:05:16 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Update to 6.4.0.1:
|
||||
* Various minor fixes for the RC1 of 6.4 branch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
200
libreoffice.spec
200
libreoffice.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libreoffice
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 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.1
|
||||
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,7 @@ 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
|
||||
Patch4: 0001-tdf-129879-Fix-wrong-order-of-buttons.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 +151,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 +219,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
|
||||
@ -828,122 +829,122 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
|
||||
\
|
||||
%{expand:%%_link_noarch_files %{pkgname}} \
|
||||
%{nil}
|
||||
%langpack -l af -n Afrikaans -m af_ZA
|
||||
%langpack -l am -n Amharic -T
|
||||
%langpack -l ar -n Arabic -s ctl -m ar -T
|
||||
%langpack -l as -n Assamese
|
||||
%langpack -l ast -n Asturian -T
|
||||
%langpack -l be -n Belarusian -m be_BY
|
||||
%langpack -l af -n Afrikaans -m af_ZA -X
|
||||
%langpack -l am -n Amharic -T -X
|
||||
%langpack -l ar -n Arabic -s ctl -m ar -T -X
|
||||
%langpack -l as -n Assamese -X
|
||||
%langpack -l ast -n Asturian -T -X
|
||||
%langpack -l be -n Belarusian -m be_BY -X
|
||||
%langpack -l bg -n Bulgarian -X -m bg_BG -T
|
||||
%langpack -l bn -n Bengali -m bn_BD -T
|
||||
%langpack -l bn_IN -n Bengali_India -T -p bn-IN -m bn_IN -L bn-IN -g bn_IN -j bn_IN
|
||||
%langpack -l bo -n Tibetian -T -s ctl -m bo
|
||||
%langpack -l br -n Breton -m br_FR
|
||||
%langpack -l brx -n Bodo
|
||||
%langpack -l bs -n Bosnian -T
|
||||
%langpack -l bn -n Bengali -m bn_BD -T -X
|
||||
%langpack -l bn_IN -n Bengali_India -T -p bn-IN -m bn_IN -L bn-IN -g bn_IN -j bn_IN -X
|
||||
%langpack -l bo -n Tibetian -T -s ctl -m bo -X
|
||||
%langpack -l br -n Breton -m br_FR -X
|
||||
%langpack -l brx -n Bodo -X
|
||||
%langpack -l bs -n Bosnian -T -X
|
||||
%langpack -l ca -n Catalan -M -X -T
|
||||
%langpack -l ca_valencia -n Valencian -m ca_ES_valencia -T -L ca-valencia -g ca@valencia -j ca_valencia
|
||||
%langpack -l ca_valencia -n Valencian -m ca_ES_valencia -T -L ca-valencia -g ca@valencia -j ca_valencia -X
|
||||
%langpack -l cs -n Czech -X -m cs_CZ -T
|
||||
%langpack -l cy -n Welsh
|
||||
%langpack -l cy -n Welsh -X
|
||||
%langpack -l da -n Danish -X -m da_DK -T
|
||||
%langpack -l de -n German -X -M -T
|
||||
%langpack -l dgo -n Dogri
|
||||
%langpack -l dsb -n Lower_Sorbian
|
||||
%langpack -l dz -n Dzongkha -s ctl -T
|
||||
%langpack -l el -n Greek -m el_GR -T
|
||||
%langpack -l dgo -n Dogri -X
|
||||
%langpack -l dsb -n Lower_Sorbian -X
|
||||
%langpack -l dz -n Dzongkha -s ctl -T -X
|
||||
%langpack -l el -n Greek -m el_GR -T -X
|
||||
%langpack -l en -n English -L en-US -X -M -g en_US -T -j en_US
|
||||
%langpack -l en_GB -n English_GB -M -T -X -L en-GB -g en_GB -j en_GB
|
||||
%langpack -l en_ZA -n English_ZA -M -T -X -L en-ZA -g en_ZA -j en_ZA
|
||||
%langpack -l eo -n Esperanto -T
|
||||
%langpack -l eo -n Esperanto -T -X
|
||||
%langpack -l es -n Spanish -M -X -T
|
||||
%langpack -l et -n Estonian -m et_EE -T
|
||||
%langpack -l eu -n Basque -T
|
||||
%langpack -l et -n Estonian -m et_EE -T -X
|
||||
%langpack -l eu -n Basque -T -X
|
||||
%langpack -l fa -n Farsi -s ctl -X
|
||||
%langpack -l fi -n Finnish -r libreoffice-voikko -X -T
|
||||
%langpack -l fr -n French -X -m fr_FR -T
|
||||
%langpack -l fy -n Frisian
|
||||
%langpack -l ga -n Irish
|
||||
%langpack -l gd -n Gaelic -m gd_GB
|
||||
%langpack -l gl -n Galician -M -T
|
||||
%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN -T
|
||||
%langpack -l gug -n Paraguayan_Guaraní -M
|
||||
%langpack -l he -n Hebrew -s ctl -m he_IL -T
|
||||
%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN -T
|
||||
%langpack -l fy -n Frisian -X
|
||||
%langpack -l ga -n Irish -X
|
||||
%langpack -l gd -n Gaelic -m gd_GB -X
|
||||
%langpack -l gl -n Galician -M -T -X
|
||||
%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN -T -X
|
||||
%langpack -l gug -n Paraguayan_Guaraní -M -X
|
||||
%langpack -l he -n Hebrew -s ctl -m he_IL -T -X
|
||||
%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN -T -X
|
||||
%langpack -l hr -n Croatian -m hr_HR -X -T
|
||||
%langpack -l hsb -n Upper_Sorbian
|
||||
%langpack -l hsb -n Upper_Sorbian -X
|
||||
%langpack -l hu -n Hungarian -X -m hu_HU -T
|
||||
%langpack -l it -n Italian -X -m it_IT -T
|
||||
%langpack -l id -n Indonesian -T -M
|
||||
%langpack -l id -n Indonesian -T -M -X
|
||||
%langpack -l is -n Icelandic -T -X -M
|
||||
%langpack -l ja -n Japanese -s cjk -X -T
|
||||
%langpack -l ka -n Georgian -T
|
||||
%langpack -l kab -n Kabyle
|
||||
%langpack -l kk -n Kazakh
|
||||
%langpack -l kn -n Kannada
|
||||
%langpack -l ka -n Georgian -T -X
|
||||
%langpack -l kab -n Kabyle -X
|
||||
%langpack -l kk -n Kazakh -X
|
||||
%langpack -l kn -n Kannada -X
|
||||
%langpack -l km -n Khmer -T -X -s ctl -c ctlseqcheck_km
|
||||
%langpack -l kmr_Latn -n Kurdish -M -g kmr@latin -L kmr-Latn -j kmr_Latn
|
||||
%langpack -l kmr_Latn -n Kurdish -M -g kmr@latin -L kmr-Latn -j kmr_Latn -X
|
||||
%langpack -l ko -n Korean -s cjk -X -T
|
||||
%langpack -l kok -n Konkani
|
||||
%langpack -l ks -n Kashmiri
|
||||
%langpack -l lb -n Luxembourgish
|
||||
%langpack -l lo -n Lao -T -s ctl -m lo_LA -c ctlseqcheck_lo
|
||||
%langpack -l kok -n Konkani -X
|
||||
%langpack -l ks -n Kashmiri -X
|
||||
%langpack -l lb -n Luxembourgish -X
|
||||
%langpack -l lo -n Lao -T -s ctl -m lo_LA -c ctlseqcheck_lo -X
|
||||
%langpack -l lt -n Lithuanian -m lt_LT -X -T
|
||||
%langpack -l lv -n Latvian -m lv_LV -T
|
||||
%langpack -l mai -n Maithili
|
||||
%langpack -l mk -n Macedonian -T
|
||||
%langpack -l ml -n Malayalam
|
||||
%langpack -l lv -n Latvian -m lv_LV -T -X
|
||||
%langpack -l mai -n Maithili -X
|
||||
%langpack -l mk -n Macedonian -T -X
|
||||
%langpack -l ml -n Malayalam -X
|
||||
%langpack -l mn -n Monglolian -X
|
||||
%langpack -l mni -n Manipuri
|
||||
%langpack -l mr -n Marathi
|
||||
%langpack -l my -n Burnese -s ctl
|
||||
%langpack -l nb -n Bokmal -M -m no -T
|
||||
%langpack -l ne -n Nepali -T -s ctl -m ne_NP
|
||||
%langpack -l mni -n Manipuri -X
|
||||
%langpack -l mr -n Marathi -X
|
||||
%langpack -l my -n Burnese -s ctl -X
|
||||
%langpack -l nb -n Bokmal -M -m no -T -X
|
||||
%langpack -l ne -n Nepali -T -s ctl -m ne_NP -X
|
||||
%langpack -l nl -n Dutch -X -m nl_NL -T
|
||||
%langpack -l nn -n Nynorsk -m nn_NO -T
|
||||
%langpack -l nr -n Southern_Ndebele
|
||||
%langpack -l nso -n Northern_Sotho
|
||||
%langpack -l oc -n Occitan -m oc_FR
|
||||
%langpack -l om -n Oromo -T
|
||||
%langpack -l or -n Odia -s ctl
|
||||
%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN -g pa_IN -j pa_IN
|
||||
%langpack -l nn -n Nynorsk -m nn_NO -T -X
|
||||
%langpack -l nr -n Southern_Ndebele -X
|
||||
%langpack -l nso -n Northern_Sotho -X
|
||||
%langpack -l oc -n Occitan -m oc_FR -X
|
||||
%langpack -l om -n Oromo -T -X
|
||||
%langpack -l or -n Odia -s ctl -X
|
||||
%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN -g pa_IN -j pa_IN -x pa-IN
|
||||
%langpack -l pl -n Polish -X -m pl_PL -T
|
||||
%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X -g pt_BR -j pt_BR -T
|
||||
%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT -T
|
||||
%langpack -l ro -n Romanian -M -X -T
|
||||
%langpack -l ru -n Russian -X -m ru_RU -T
|
||||
%langpack -l rw -n Kinyarwanda
|
||||
%langpack -l sa_IN -n Sanskrit -L sa-IN -g sa_IN -j sa_IN
|
||||
%langpack -l sat -n Santali
|
||||
%langpack -l sd -n Sindhi
|
||||
%langpack -l si -n Sinhalese -S ctl -m si_LK -T
|
||||
%langpack -l sid -n Sidamo -T
|
||||
%langpack -l rw -n Kinyarwanda -X
|
||||
%langpack -l sa_IN -n Sanskrit -L sa-IN -g sa_IN -j sa_IN -x sa-IN
|
||||
%langpack -l sat -n Santali -X
|
||||
%langpack -l sd -n Sindhi -X
|
||||
%langpack -l si -n Sinhalese -S ctl -m si_LK -T -X
|
||||
%langpack -l sid -n Sidamo -T -X
|
||||
%langpack -l sk -n Slovak -X -m sk_SK -T
|
||||
%langpack -l sl -n Slovenian -X -m sl_SI -T
|
||||
%langpack -l sq -n Albanian -T -m sq_AL
|
||||
%langpack -l sr -n Serbian -i sr-Latn -M -j sr -g sr -k sr@latin -o sr_Latn
|
||||
%langpack -l ss -n Swati
|
||||
%langpack -l st -n Southern_Sotho
|
||||
%langpack -l sq -n Albanian -T -m sq_AL -X
|
||||
%langpack -l sr -n Serbian -i sr-Latn -M -j sr -g sr -k sr@latin -o sr_Latn -x sr-Latn
|
||||
%langpack -l ss -n Swati -X
|
||||
%langpack -l st -n Southern_Sotho -X
|
||||
%langpack -l sv -n Swedish -X -m sv_SE -T
|
||||
%langpack -l sw_TZ -n Swahili -M -L sw-TZ -g sw_TZ -j sw_TZ
|
||||
%langpack -l szl -n Silesian
|
||||
%langpack -l ta -n Tamil -s ctl -T
|
||||
%langpack -l te -n Telugu -m te_IN
|
||||
%langpack -l tg -n Tajik -T
|
||||
%langpack -l th -n Thai -s ctl -c ctlseqcheck_th -m th_TH
|
||||
%langpack -l tn -n Tswana
|
||||
%langpack -l sw_TZ -n Swahili -M -L sw-TZ -g sw_TZ -j sw_TZ -x sw-TZ
|
||||
%langpack -l szl -n Silesian -X
|
||||
%langpack -l ta -n Tamil -s ctl -T -X
|
||||
%langpack -l te -n Telugu -m te_IN -X
|
||||
%langpack -l tg -n Tajik -T -X
|
||||
%langpack -l th -n Thai -s ctl -c ctlseqcheck_th -m th_TH -X
|
||||
%langpack -l tn -n Tswana -X
|
||||
%langpack -l tr -n Turkish -X -T -m tr_TR
|
||||
%langpack -l ts -n Tsonga
|
||||
%langpack -l tt -n Tatar
|
||||
%langpack -l ug -n Uyghur -T
|
||||
%langpack -l uk -n Ukrainian -m uk_UA -T
|
||||
%langpack -l uz -n Uzbek
|
||||
%langpack -l ts -n Tsonga -X
|
||||
%langpack -l tt -n Tatar -X
|
||||
%langpack -l ug -n Uyghur -T -X
|
||||
%langpack -l uk -n Ukrainian -m uk_UA -T -X
|
||||
%langpack -l uz -n Uzbek -X
|
||||
%langpack -l vi -n Vietnamese -T -X -M
|
||||
%langpack -l ve -n Venda
|
||||
%langpack -l vec -n Venetian
|
||||
%langpack -l xh -n Xhosa
|
||||
%langpack -l ve -n Venda -X
|
||||
%langpack -l vec -n Venetian -X
|
||||
%langpack -l xh -n Xhosa -X
|
||||
%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans -g zh_CN -j zh_CN -T
|
||||
%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant -g zh_TW -j zh_TW -T
|
||||
%langpack -l zu -n Zulu -m zu_ZA
|
||||
%langpack -l zu -n Zulu -m zu_ZA -X
|
||||
|
||||
%prep
|
||||
%setup -q -b2 -b4
|
||||
@ -953,7 +954,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
|
||||
%endif # Leap 42/SLE-12
|
||||
%patch2
|
||||
%patch3
|
||||
%patch5 -p1
|
||||
%patch4 -p1
|
||||
%patch990 -p1
|
||||
%patch991 -p1
|
||||
|
||||
@ -1053,16 +1054,14 @@ 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 \
|
||||
@ -1117,6 +1116,7 @@ export NOCONFIGURE=yes
|
||||
make verbose=t build-nocheck
|
||||
|
||||
%check
|
||||
export LANG=C.UTF-8
|
||||
# Run tests only on x86_64 and ppc64le as they are resource hogs
|
||||
%ifarch x86_64 ppc64le
|
||||
# safeguard jarfires that can get magically overriden by the make
|
||||
@ -1254,6 +1254,10 @@ for file in $files; do
|
||||
echo "%{_libdir}/%{name}/share/autocorr/$file" >> file-lists/common_list.txt
|
||||
done
|
||||
|
||||
# we don't bother with serbian non-latin autocorr (as the lang logic allows us to dynamically allocate
|
||||
# just one autotext filler and it does not make sense to have special case just for serbian
|
||||
rm -r %{buildroot}%{_datadir}/libreoffice/share/autotext/sr/
|
||||
|
||||
# Install appdata files, so we're shown in gnome-software (and other, future app stores)
|
||||
# upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...]
|
||||
# fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name
|
||||
@ -1314,6 +1318,12 @@ ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/
|
||||
mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/
|
||||
install -m 0644 include/LibreOfficeKit/* %{buildroot}%{_includedir}/LibreOfficeKit/
|
||||
|
||||
# typelib data
|
||||
mkdir -p %{buildroot}%{_libdir}/girepository-1.0/
|
||||
install -m 0644 workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.typelib %{buildroot}%{_libdir}/girepository-1.0/
|
||||
mkdir -p %{buildroot}%{_datadir}/gir-1.0/
|
||||
install -m 0644 workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.gir %{buildroot}%{_datadir}/gir-1.0/
|
||||
|
||||
# Symlink uno.py and unohelper.py so that python can find them
|
||||
# This is done after the cache files generating on purpose
|
||||
mkdir -p %{buildroot}%{python3_sitelib}
|
||||
@ -1488,8 +1498,8 @@ exit 0
|
||||
|
||||
%if %{with kdeintegration}
|
||||
%files -f file-lists/kde4_list.txt qt5
|
||||
%{_libdir}/libreoffice/program/libkde5be1lo.so
|
||||
%{_libdir}/libreoffice/program/libvclplug_kde5lo.so
|
||||
%{_libdir}/libreoffice/program/libkf5be1lo.so
|
||||
%{_libdir}/libreoffice/program/libvclplug_kf5lo.so
|
||||
%{_libdir}/libreoffice/program/libvclplug_qt5lo.so
|
||||
%endif
|
||||
|
||||
|
245
mdds-1-5.patch
245
mdds-1-5.patch
@ -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
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4
|
||||
size 7123074
|
3
pdfium-3963.tar.bz2
Normal file
3
pdfium-3963.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895
|
||||
size 7083415
|
Loading…
Reference in New Issue
Block a user