rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related: rhbz#1678319 workaround weird compilation result

Browse Source
This commit is contained in:
Caolán McNamara 2019-02-25 16:55:36 +00:00
parent d95352c92c
commit ce31654063
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-rhbz-1678319-workaround-miscompilation.patch Normal file
View File

@ -0,0 +1,31 @@
From 2805f3426d099d0f66f12fef74314ef835768584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 25 Feb 2019 16:53:31 +0000
Subject: [PATCH] rhbz#1678319 workaround miscompilation
Change-Id: Iba37c4e9c623ab5f40547b1e491c2d92f741bda0
---
sc/source/filter/xml/xmlcoli.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index a9033196ecbc..12e91f26f60e 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -53,8 +53,11 @@ ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport,
{
case XML_ELEMENT( TABLE, XML_NUMBER_COLUMNS_REPEATED ):
{
- nColCount = std::max<sal_Int32>(aIter.toInt32(), 1);
- nColCount = std::min<sal_Int32>(nColCount, MAXCOLCOUNT);
+ nColCount = aIter.toInt32();
+ if (nColCount < 1)
+ nColCount = 1;
+ else if (nColCount > MAXCOLCOUNT)
+ nColCount = MAXCOLCOUNT;
}
break;
case XML_ELEMENT( TABLE, XML_STYLE_NAME ):
--
2.21.0.rc1

6
libreoffice.spec
View File

@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.3
Release: 3%{?libo_prerelease}%{?dist}
Release: 4%{?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/
@ -243,6 +243,7 @@ Patch3: 0001-Resolves-tdf-122623-theme-unwanted-tab-into-invisibi.patch
Patch4: 0001-tdf-122393-move-to-overflow-row-on-using-left-right-.patch
Patch5: 0001-Resolves-tdf-122467-drop-down-field-name-is-too-narr.patch
Patch6: 0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch
Patch7: 0001-rhbz-1678319-workaround-miscompilation.patch
%if 0%{?rhel}
# not upstreamed
@ -2123,6 +2124,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
* Mon Feb 15 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.2.0.3-4
- Related: rhbz#1678319 workaround weird compilation result
* Thu Feb 21 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.2.0.3-3
- menu of currency combobox is too wide