The package rpms/libreoffice.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=0fd396...
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=5cef03...
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=cb71f0...
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=1ae2fa...
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=0ac536...
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=4e244d....
Change:
-ExcludeArch: s390x
-%ifnarch s390x
-%ifarch armv7hl
+%ifarch armv7hl
+%ifnarch s390x
+ExcludeArch: s390x
Thanks.
Full change:
============
commit bb6ff7203a613bbe6bfa466efd973332969ea53c
Merge: bdb5e2a 0fd3966
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Thu Aug 5 11:30:35 2021 +0100
Merge branch 'rawhide' into f34
commit 0fd3966dfec929820d6932e819c28f48aafb07ea
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Thu Aug 5 11:29:33 2021 +0100
Revert "rhbz#1969393 firebird is unavailable at the moment"
This reverts commit 4e244dcdcef5fec2b7c0cbb894d11fc7822c6cab.
diff --git a/libreoffice.spec b/libreoffice.spec
index d83b790..a44950d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -54,9 +54,6 @@ Release: 3%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
-# rhbz#1969393 firebird is unavailable at the moment
-ExcludeArch: s390x
-
Source0:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source1:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source2:
%{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
commit 5cef0310cb0f3311109c1b0c41bbf2c5fc0fee1a
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Thu Aug 5 11:29:18 2021 +0100
Revert "rhbz#1969393 firebird is unavailable on s390x at the moment"
This reverts commit 0ac536d492274b5b7b273c894475380785612184.
diff --git a/libreoffice.spec b/libreoffice.spec
index 68c0a29..d83b790 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -54,6 +54,9 @@ Release: 3%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
+# rhbz#1969393 firebird is unavailable at the moment
+ExcludeArch: s390x
+
Source0:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source1:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source2:
%{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
@@ -127,9 +130,7 @@ BuildRequires: boost-devel
BuildRequires: cups-devel
BuildRequires: fontpackages-devel
%if 0%{?fedora}
-%ifnarch s390x
BuildRequires: firebird-devel
-%endif
BuildRequires: libqrcodegencpp-devel
%endif
BuildRequires: glm-devel
@@ -340,10 +341,8 @@ to be written in python.
%package base
Summary: Database front-end for LibreOffice
%if 0%{?fedora}
-%ifnarch s390x
Requires: firebird
%endif
-%endif
Requires: pentaho-reporting-flow-engine
Requires: postgresql-jdbc
Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release}
@@ -1063,12 +1062,8 @@ export CXXFLAGS=$ARCH_FLAGS
%define distrooptions --disable-eot --disable-scripting-beanshell
--disable-scripting-javascript --disable-firebird-sdbc --disable-qrcodegen
%else
# fedora
-%ifarch s390x
-%define distrooptions --enable-eot --enable-kf5 --disable-firebird-sdbc
-%else
%define distrooptions --enable-eot --enable-kf5
%endif
-%endif
%if %{with langpacks}
%define with_lang --with-lang='%{langpack_langs}'
@@ -1861,10 +1856,8 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libabplo.so
%{baseinstdir}/program/libdbplo.so
%if 0%{?fedora}
-%ifnarch s390x
%{baseinstdir}/program/libfirebird_sdbclo.so
%endif
-%endif
%{baseinstdir}/program/libhsqldb.so
%{baseinstdir}/program/librptlo.so
%{baseinstdir}/program/librptuilo.so
commit 7e80a32bdb21f50407cf7bc96a107b37f3cd6748
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Wed Aug 4 10:52:50 2021 +0100
rebuild for poppler rebase to 21.07.0
diff --git a/libreoffice.spec b/libreoffice.spec
index cca1b7a..68c0a29 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 2%{?libo_prerelease}%{?dist}
+Release: 3%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
@@ -2253,6 +2253,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Wed Aug 04 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.5.2-3
+- rebuild for poppler rebase to 21.07.0
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:7.1.5.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit cb71f0e03bf3506d448763aa794c93a6fc644cbc
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Tue Aug 3 19:55:02 2021 +0100
can revert temp armv7hl workaround now
see:
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
diff --git a/libreoffice.spec b/libreoffice.spec
index 22a1b21..cca1b7a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1080,10 +1080,6 @@ autoconf
SMP_MFLAGS=%{?_smp_mflags}
SMP_MFLAGS=$[${SMP_MFLAGS/-j/}]
-%ifarch armv7hl
-SMP_MFLAGS=2
-%endif
-
%if 0%{?flatpak}
%define flatpakoptions --with-beanshell-jar=/app/share/java/bsh.jar
--with-boost-libdir=%{_libdir} --with-external-dict-dir=/app/share/myspell
--with-external-hyph-dir=/app/share/hyphen --with-external-thes-dir=/app/share/mythes
--with-flute-jar=/app/share/java/flute.jar --with-jdk-home=/app/lib/jvm/java
--with-jfreereport-jar=/app/share/java/flow-engine.jar
--with-libbase-jar=/app/share/java/libbase.jar
--with-libfonts-jar=/app/share/java/libfonts.jar
--with-libformula-jar=/app/share/java/libformula.jar
--with-liblayout-jar=/app/share/java/liblayout.jar
--with-libloader-jar=/app/share/java/libloader.jar
--with-librepository-jar=/app/share/java/librepository.jar
--with-libserializer-jar=/app/share/java/libserializer.jar
--with-libxml-jar=/app/share/java/libxml.jar --with-sac-jar=/app/share/java/sac.jar
FIREBIRDCONFIG=%{_libdir}/fb_config QT4INC=%{_includedir}
%endif
commit 1ae2faeeea1982042796ea4afc0fd51fcff83a9e
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Tue Aug 3 12:54:38 2021 +0100
armv7hl build is failing with OOM
diff --git a/libreoffice.spec b/libreoffice.spec
index cca1b7a..22a1b21 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1080,6 +1080,10 @@ autoconf
SMP_MFLAGS=%{?_smp_mflags}
SMP_MFLAGS=$[${SMP_MFLAGS/-j/}]
+%ifarch armv7hl
+SMP_MFLAGS=2
+%endif
+
%if 0%{?flatpak}
%define flatpakoptions --with-beanshell-jar=/app/share/java/bsh.jar
--with-boost-libdir=%{_libdir} --with-external-dict-dir=/app/share/myspell
--with-external-hyph-dir=/app/share/hyphen --with-external-thes-dir=/app/share/mythes
--with-flute-jar=/app/share/java/flute.jar --with-jdk-home=/app/lib/jvm/java
--with-jfreereport-jar=/app/share/java/flow-engine.jar
--with-libbase-jar=/app/share/java/libbase.jar
--with-libfonts-jar=/app/share/java/libfonts.jar
--with-libformula-jar=/app/share/java/libformula.jar
--with-liblayout-jar=/app/share/java/liblayout.jar
--with-libloader-jar=/app/share/java/libloader.jar
--with-librepository-jar=/app/share/java/librepository.jar
--with-libserializer-jar=/app/share/java/libserializer.jar
--with-libxml-jar=/app/share/java/libxml.jar --with-sac-jar=/app/share/java/sac.jar
FIREBIRDCONFIG=%{_libdir}/fb_config QT4INC=%{_includedir}
%endif
commit 0ac536d492274b5b7b273c894475380785612184
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Mon Aug 2 19:09:50 2021 +0100
rhbz#1969393 firebird is unavailable on s390x at the moment
diff --git a/libreoffice.spec b/libreoffice.spec
index 48bc052..cca1b7a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -54,9 +54,6 @@ Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
-# rhbz#1969393 firebird is unavailable at the moment
-ExcludeArch: s390x
-
Source0:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source1:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source2:
%{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
@@ -130,7 +127,9 @@ BuildRequires: boost-devel
BuildRequires: cups-devel
BuildRequires: fontpackages-devel
%if 0%{?fedora}
+%ifnarch s390x
BuildRequires: firebird-devel
+%endif
BuildRequires: libqrcodegencpp-devel
%endif
BuildRequires: glm-devel
@@ -341,8 +340,10 @@ to be written in python.
%package base
Summary: Database front-end for LibreOffice
%if 0%{?fedora}
+%ifnarch s390x
Requires: firebird
%endif
+%endif
Requires: pentaho-reporting-flow-engine
Requires: postgresql-jdbc
Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release}
@@ -1062,8 +1063,12 @@ export CXXFLAGS=$ARCH_FLAGS
%define distrooptions --disable-eot --disable-scripting-beanshell
--disable-scripting-javascript --disable-firebird-sdbc --disable-qrcodegen
%else
# fedora
+%ifarch s390x
+%define distrooptions --enable-eot --enable-kf5 --disable-firebird-sdbc
+%else
%define distrooptions --enable-eot --enable-kf5
%endif
+%endif
%if %{with langpacks}
%define with_lang --with-lang='%{langpack_langs}'
@@ -1856,8 +1861,10 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libabplo.so
%{baseinstdir}/program/libdbplo.so
%if 0%{?fedora}
+%ifnarch s390x
%{baseinstdir}/program/libfirebird_sdbclo.so
%endif
+%endif
%{baseinstdir}/program/libhsqldb.so
%{baseinstdir}/program/librptlo.so
%{baseinstdir}/program/librptuilo.so
commit 4e244dcdcef5fec2b7c0cbb894d11fc7822c6cab
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Mon Aug 2 18:58:44 2021 +0100
rhbz#1969393 firebird is unavailable at the moment
diff --git a/libreoffice.spec b/libreoffice.spec
index 404d60c..48bc052 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -54,6 +54,9 @@ Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
+# rhbz#1969393 firebird is unavailable at the moment
+ExcludeArch: s390x
+
Source0:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source1:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source2:
%{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
commit bc1c0f97e2bd68d3f0a5bedafd9db79b42269cf6
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Sun Jul 25 14:56:10 2021 +0100
Related: rhbz#1980800 add in improvements
diff --git a/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch
b/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch
index 67ff1f9..b1224ac 100644
--- a/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch
+++ b/0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch
@@ -1,4 +1,4 @@
-From c4961f30f3ab5ea1efd1fc143fac0a22d6a4a2a9 Mon Sep 17 00:00:00 2001
+From aec3e189e6e9aa1eb2fe91cbb1c46f308b074cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
Date: Tue, 13 Jul 2021 12:38:07 +0100
Subject: [PATCH] rhbz#1980800 allow --convert-to csv to write each sheet to a
@@ -22,16 +22,38 @@ Reviewed-on:
https://gerrit.libreoffice.org/c/core/+/118850
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack(a)redhat.com>
(cherry picked from commit b8903bc106dad036acb3d117e5c4fc955697fe02)
+
+Related: tdf#135762 Allow --convert-to csv to specify 1-based sheet number
+
+Same multifile mechanism as for -1 all sheets is used, so
+
+soffice --convert-to csv:"Text - txt - csv
(StarCalc)":44,34,UTF8,1,,0,false,true,false,false,false,2 sample.ods
+
+writes a file sample-Sheet2.csv
+
+Change-Id: Ib9248c9561e4e340c88458ac5dfd159e443a4cfd
+Reviewed-on:
https://gerrit.libreoffice.org/c/core/+/118971
+Reviewed-by: Eike Rathke <erack(a)redhat.com>
+Tested-by: Jenkins
+(cherry picked from commit fda91f8be16ba760e360940ebafd6244c648cb8c)
+
+Related: tdf#135762 Suppress cout if not command line
+
+Change-Id: I9431221aadf97739bb197871f25fa151ef4c391c
+Reviewed-on:
https://gerrit.libreoffice.org/c/core/+/119294
+Reviewed-by: Eike Rathke <erack(a)redhat.com>
+Tested-by: Jenkins
+(cherry picked from commit 0cda081c9aa3b3dcb363f97bac60c845ce9a13e0)
---
- desktop/source/app/dispatchwatcher.cxx | 26 +++++--
- sc/source/ui/dbgui/imoptdlg.cxx | 7 +-
- sc/source/ui/docshell/docsh.cxx | 97 +++++++++++++++++++-------
- sc/source/ui/inc/docsh.hxx | 2 +-
- sc/source/ui/inc/imoptdlg.hxx | 6 +-
- 5 files changed, 106 insertions(+), 32 deletions(-)
+ desktop/source/app/dispatchwatcher.cxx | 50 +++++++--
+ sc/source/ui/dbgui/imoptdlg.cxx | 16 ++-
+ sc/source/ui/docshell/docsh.cxx | 141 +++++++++++++++++++++----
+ sc/source/ui/inc/docsh.hxx | 2 +-
+ sc/source/ui/inc/imoptdlg.hxx | 6 +-
+ 5 files changed, 179 insertions(+), 36 deletions(-)
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
-index 50b92ecb7834..0660ccf3f83e 100644
+index 50b92ecb7834..3df4f34ccf83 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -30,6 +30,7 @@
@@ -51,8 +73,25 @@ index 50b92ecb7834..0660ccf3f83e 100644
if (aFilter.isEmpty())
{
std::cerr << "Error: no export filter"
<< std::endl;
-@@ -616,10 +619,23 @@ bool DispatchWatcher::executeDispatchRequests( const
std::vector<DispatchRequest
- conversionProperties[1].Name = "FilterName";
+@@ -605,29 +608,54 @@ bool DispatchWatcher::executeDispatchRequests( const
std::vector<DispatchRequest
+ else
+ {
+ sal_Int32 nFilterOptionsIndex =
aFilter.indexOf(':');
+- sal_Int32 nProps = ( 0 < nFilterOptionsIndex ) ? 3 :
2;
++ sal_Int32 nProps = ( 0 < nFilterOptionsIndex ) ? 4 :
3;
+
+ if ( !aImgOut.isEmpty() )
+ nProps +=1;
+ Sequence<PropertyValue> conversionProperties(
nProps );
+- conversionProperties[0].Name = "Overwrite";
+- conversionProperties[0].Value <<= true;
++ conversionProperties[0].Name =
"ConversionRequestOrigin";
++ conversionProperties[0].Value <<=
OUString("CommandLine");
++ conversionProperties[1].Name = "Overwrite";
++ conversionProperties[1].Value <<= true;
+
+- conversionProperties[1].Name = "FilterName";
++ conversionProperties[2].Name = "FilterName";
if( 0 < nFilterOptionsIndex )
{
- conversionProperties[1].Value <<=
aFilter.copy(0, nFilterOptionsIndex);
@@ -62,22 +101,42 @@ index 50b92ecb7834..0660ccf3f83e 100644
+ if (sFilterName == "Text - txt - csv
(StarCalc)")
+ {
+ sal_Int32 nIdx(0);
-+ // If the 11th token token is '-1' then
we export a file
++ // If the 11th token is '-1' then we
export a file
+ // per sheet where the file name is based on the
suggested
+ // output filename concatenated with the sheet
name, so adjust
+ // the output and overwrite messages
-+ bMultiFileTarget = sFilterOptions.getToken(11,
',', nIdx) == "-1";
++ // If the 11th token is not present or numeric 0
then the
++ // default sheet is exported with the output
filename. If it
++ // is numeric >0 then that sheet (1-based)
with the output
++ // filename concatenated with the sheet name. So
even if
++ // that is a single file, the multi file target
mechanism is
++ // used.
++ const OUString aTok(sFilterOptions.getToken(11,
',', nIdx));
++ // Actual validity is checked in Calc, here just
check for
++ // presence of numeric value at start.
++ bMultiFileTarget = (!aTok.isEmpty() &&
aTok.toInt32() != 0);
+ }
+
-+ conversionProperties[1].Value <<=
sFilterName;
++ conversionProperties[2].Value <<=
sFilterName;
- conversionProperties[2].Name =
"FilterOptions";
+- conversionProperties[2].Name =
"FilterOptions";
- conversionProperties[2].Value <<=
aFilter.copy(nFilterOptionsIndex + 1);
-+ conversionProperties[2].Value <<=
sFilterOptions;
++ conversionProperties[3].Name =
"FilterOptions";
++ conversionProperties[3].Value <<=
sFilterOptions;
}
else
{
-@@ -639,9 +655,11 @@ bool DispatchWatcher::executeDispatchRequests( const
std::vector<DispatchRequest
+- conversionProperties[1].Value <<= aFilter;
++ conversionProperties[2].Value <<= aFilter;
+ }
+
+ if ( !aImgOut.isEmpty() )
+ {
++
assert(conversionProperties[nProps-1].Name.isEmpty());
+ conversionProperties[nProps-1].Name =
"ImageFilter";
+ conversionProperties[nProps-1].Value <<=
aImgOut;
+ }
+@@ -639,9 +667,11 @@ bool DispatchWatcher::executeDispatchRequests( const
std::vector<DispatchRequest
OString aTargetURL8 = OUStringToOString(aTempName,
osl_getThreadTextEncoding());
if (aDispatchRequest.aRequestType != REQUEST_CAT)
{
@@ -92,39 +151,55 @@ index 50b92ecb7834..0660ccf3f83e 100644
}
try
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
-index 071f1b0257bc..d8c4fd810ea3 100644
+index 071f1b0257bc..a362e4df0ee7 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
-@@ -43,6 +43,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
+@@ -20,6 +20,7 @@
+ #include <imoptdlg.hxx>
+ #include <asciiopt.hxx>
+ #include <comphelper/string.hxx>
++#include <unotools/charclass.hxx>
+ #include <osl/thread.h>
+ #include <global.hxx>
+
+@@ -43,6 +44,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
bSaveNumberAsSuch = true;
bSaveFormulas = false;
bRemoveSpace = false;
-+ bNewFilePerSheet = false;
++ nSheetToExport = 0;
sal_Int32 nTokenCount = comphelper::string::getTokenCount(rStr, ',');
if ( nTokenCount < 3 )
return;
-@@ -77,6 +78,8 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
+@@ -77,6 +79,16 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
bSaveFormulas = rStr.getToken(0, ',', nIdx) == "true";
if ( nTokenCount >= 11 )
bRemoveSpace = rStr.getToken(0, ',', nIdx) == "true";
+ if ( nTokenCount >= 12 )
-+ bNewFilePerSheet = rStr.getToken(0, ',', nIdx) == "-1";
++ {
++ const OUString aTok(rStr.getToken(0, ',', nIdx));
++ if (aTok == "-1")
++ nSheetToExport = -1; // all
++ else if (aTok.isEmpty() || CharClass::isAsciiNumeric(aTok))
++ nSheetToExport = aTok.toInt32();
++ else
++ nSheetToExport = -23; // invalid, force error
++ }
}
}
-@@ -99,7 +102,9 @@ OUString ScImportOptions::BuildString() const
+@@ -99,7 +111,9 @@ OUString ScImportOptions::BuildString() const
"," +
OUString::boolean( bSaveFormulas ) + // "save formulas": not in
ScAsciiOptions
"," +
- OUString::boolean( bRemoveSpace ); // same as "Remove space" in
ScAsciiOptions
+ OUString::boolean( bRemoveSpace ) + // same as "Remove space" in
ScAsciiOptions
+ "," +
-+ std::u16string_view(bNewFilePerSheet ? u"-1" : u"0") ;
// Only available for command line --convert-to
++ OUString::number(nSheetToExport) ; // Only available for command line
--convert-to
return aResult;
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
-index 91020db0b2e0..7cee6bb7f32e 100644
+index 91020db0b2e0..5fdfddd0c89b 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -44,6 +44,7 @@
@@ -160,7 +235,7 @@ index 91020db0b2e0..7cee6bb7f32e 100644
SCCOL nEndCol;
SCROW nEndRow;
m_aDocument.GetCellArea( nTab, nEndCol, nEndRow );
-@@ -2389,35 +2390,81 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
+@@ -2389,35 +2390,129 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
}
else if (aFltName == pFilterAscii)
{
@@ -177,47 +252,89 @@ index 91020db0b2e0..7cee6bb7f32e 100644
- const SfxPoolItem* pItem;
- if ( pSet && SfxItemState::SET ==
- pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) )
-- {
-- sItStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
-- }
+ sItStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
+ }
-
-- if ( sItStr.isEmpty() )
-- {
-- // default for ascii export (from API without options):
-- // ISO8859-1/MS_1252 encoding, comma, double quotes
++
+ if ( sItStr.isEmpty() )
+ {
+ // default for ascii export (from API without options):
+ // ISO8859-1/MS_1252 encoding, comma, double quotes
-
-- ScImportOptions aDefOptions( ',', '"',
RTL_TEXTENCODING_MS_1252 );
-- sItStr = aDefOptions.BuildString();
-- }
++
+ ScImportOptions aDefOptions( ',', '"',
RTL_TEXTENCODING_MS_1252 );
+ sItStr = aDefOptions.BuildString();
+ }
-
-- weld::WaitObject aWait( GetActiveDialogParent() );
-- ScImportOptions aOptions( sItStr );
-- AsciiSave( *pStream, aOptions );
++
+ weld::WaitObject aWait( GetActiveDialogParent() );
+ ScImportOptions aOptions( sItStr );
+
-+ if (aOptions.bNewFilePerSheet)
++ if (aOptions.nSheetToExport)
+ {
- bRet = true;
++ // Only from command line --convert-to
++ bRet = true;
++
++ // Verbose only from command line, not UI (in case we actually
++ // implement that) nor macro filter options.
++ bool bVerbose = false;
++ const css::uno::Sequence<css::beans::PropertyValue> & rArgs =
rMed.GetArgs();
++ const auto pProp = std::find_if( rArgs.begin(), rArgs.end(),
++ [](const css::beans::PropertyValue& rProp) { return rProp.Name
== "ConversionRequestOrigin"; });
++ if (pProp != rArgs.end())
+ {
+- sItStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
++ OUString aOrigin;
++ pProp->Value >>= aOrigin;
++ bVerbose = (aOrigin == "CommandLine");
+ }
-- if (m_aDocument.GetTableCount() > 1)
-- if (!rMed.GetError())
-- rMed.SetError(SCWARN_EXPORT_ASCII);
+- if ( sItStr.isEmpty() )
++ SCTAB nStartTab;
++ SCTAB nCount = m_aDocument.GetTableCount();
++ if (aOptions.nSheetToExport == -1)
+ {
+- // default for ascii export (from API without options):
+- // ISO8859-1/MS_1252 encoding, comma, double quotes
+-
+- ScImportOptions aDefOptions( ',', '"',
RTL_TEXTENCODING_MS_1252 );
+- sItStr = aDefOptions.BuildString();
++ // All sheets.
++ nStartTab = 0;
++ }
++ else if (0 < aOptions.nSheetToExport && aOptions.nSheetToExport
<= nCount)
++ {
++ // One sheet, 1-based.
++ nCount = aOptions.nSheetToExport;
++ nStartTab = nCount - 1;
++ }
++ else
++ {
++ // Usage error, no export but log.
++ if (bVerbose)
++ {
++ if (aOptions.nSheetToExport < 0)
++ std::cout << "Bad sheet number string given."
<< std::endl;
++ else
++ std::cout << "No sheet number " <<
aOptions.nSheetToExport
++ << ", number of sheets is " << nCount
<< std::endl;
++ }
++ nStartTab = 0;
++ nCount = 0;
++ SetError(SCERR_EXPORT_DATA);
++ bRet = false;
+ }
+
+- weld::WaitObject aWait( GetActiveDialogParent() );
+- ScImportOptions aOptions( sItStr );
+- AsciiSave( *pStream, aOptions );
+- bRet = true;
+ INetURLObject aURLObject(rMed.GetURLObject());
+ OUString sExt = aURLObject.CutExtension();
+ OUString sBaseName = aURLObject.GetLastName();
+ aURLObject.CutLastName();
-+
-+ for (SCTAB i = 0, nCount = m_aDocument.GetTableCount(); i < nCount; ++i)
+
+- if (m_aDocument.GetTableCount() > 1)
+- if (!rMed.GetError())
+- rMed.SetError(SCWARN_EXPORT_ASCII);
++ for (SCTAB i = nStartTab; i < nCount; ++i)
+ {
+ OUString sTabName;
+ if (!m_aDocument.GetName(i, sTabName))
@@ -230,20 +347,24 @@ index 91020db0b2e0..7cee6bb7f32e 100644
+
+ // log similar to DispatchWatcher::executeDispatchRequests
+ OUString aOutFile =
aSheetURLObject.GetMainURL(INetURLObject::DecodeMechanism::NONE);
-+ OUString aDisplayedName;
-+ if (osl::FileBase::E_None !=
osl::FileBase::getSystemPathFromFileURL(aOutFile, aDisplayedName))
-+ aDisplayedName = aOutFile;
-+ std::cout << "Writing sheet " <<
OUStringToOString(sTabName, osl_getThreadTextEncoding()) << " -> "
-+ << OUStringToOString(aDisplayedName,
osl_getThreadTextEncoding())
-+ << std::endl;
++ if (bVerbose)
++ {
++ OUString aDisplayedName;
++ if (osl::FileBase::E_None !=
osl::FileBase::getSystemPathFromFileURL(aOutFile, aDisplayedName))
++ aDisplayedName = aOutFile;
++ std::cout << "Writing sheet " <<
OUStringToOString(sTabName, osl_getThreadTextEncoding()) << " -> "
++ <<
OUStringToOString(aDisplayedName, osl_getThreadTextEncoding())
++ << std::endl;
+
-+ if (FStatHelper::IsDocument(aOutFile))
-+ std::cout << "Overwriting: " <<
OUStringToOString(aDisplayedName, osl_getThreadTextEncoding()) << std::endl ;
++ if (FStatHelper::IsDocument(aOutFile))
++ std::cout << "Overwriting: " <<
OUStringToOString(aDisplayedName, osl_getThreadTextEncoding())
++ << std::endl ;
++ }
+
+ std::unique_ptr<SvStream> xStm =
::utl::UcbStreamHelper::CreateStream(aOutFile, StreamMode::TRUNC | StreamMode::WRITE);
+ if (!xStm)
+ {
-+ SetError(SCERR_IMPORT_UNKNOWN);
++ SetError(ERRCODE_IO_CANTCREATE);
+ bRet = false;
+ break;
+ }
@@ -279,7 +400,7 @@ index 41c0b30a42a8..3aa5f6caf311 100644
void Execute( SfxRequest& rReq );
void GetState( SfxItemSet &rSet );
diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx
-index bac941c2a377..2a4cba786b6e 100644
+index bac941c2a377..382067d67813 100644
--- a/sc/source/ui/inc/imoptdlg.hxx
+++ b/sc/source/ui/inc/imoptdlg.hxx
@@ -32,7 +32,8 @@ public:
@@ -288,7 +409,7 @@ index bac941c2a377..2a4cba786b6e 100644
bFixedWidth(false), bSaveAsShown(false), bQuoteAllText(false),
- bSaveNumberAsSuch(true), bSaveFormulas(false), bRemoveSpace(false)
+ bSaveNumberAsSuch(true), bSaveFormulas(false), bRemoveSpace(false),
-+ bNewFilePerSheet(false)
++ nSheetToExport(0)
{ SetTextEncoding( nEnc ); }
ScImportOptions& operator=( const ScImportOptions& rCpy ) = default;
@@ -296,9 +417,9 @@ index bac941c2a377..2a4cba786b6e 100644
bool bSaveNumberAsSuch;
bool bSaveFormulas;
bool bRemoveSpace;
-+ // currently only "0" for 'current sheet' and "-1" for
all sheets (each to
-+ // a separate file) are options
-+ bool bNewFilePerSheet;
++ // "0" for 'current sheet', "-1" for all sheets (each to
a separate file),
++ // or 1-based specific sheet number (to a separate file).
++ sal_Int32 nSheetToExport;
};
#endif // INCLUDED_SC_SOURCE_UI_INC_IMOPTDLG_HXX
commit 6d279d778f36d4a6de97fb821300e2bc077efb10
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 22 12:13:37 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/libreoffice.spec b/libreoffice.spec
index c48f705..404d60c 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 1%{?libo_prerelease}%{?dist}
+Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
@@ -2243,6 +2243,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:7.1.5.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Sun Jul 18 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.1.5.2-1
- latest version
- drop merged patches