parent
661aa989c1
commit
2bf9d4d0d0
@ -1,42 +0,0 @@
|
||||
From 7cbfb8749425cad73a91a543e32790455e11bf3d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Tue, 26 Feb 2019 11:53:31 +0000
|
||||
Subject: [PATCH] gcc error: size '128' of array exceeds maximum object size
|
||||
|
||||
an int works though
|
||||
|
||||
Change-Id: Ifb71df7f929b4ea950fbe6c9ba3ed8e81496fbdf
|
||||
---
|
||||
i18npool/inc/cclass_unicode.hxx | 2 +-
|
||||
.../source/characterclassification/cclass_unicode_parser.cxx | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
|
||||
index cd77cbea275a..d11c5e8405b2 100644
|
||||
--- a/i18npool/inc/cclass_unicode.hxx
|
||||
+++ b/i18npool/inc/cclass_unicode.hxx
|
||||
@@ -115,7 +115,7 @@ private:
|
||||
ssStop
|
||||
};
|
||||
|
||||
- static const sal_uInt8 nDefCnt;
|
||||
+ static const int nDefCnt;
|
||||
static const ParserFlags pDefaultParserTable[];
|
||||
static const sal_Int32 pParseTokensType[];
|
||||
|
||||
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
|
||||
index 1b7cba461016..bca77aea2580 100644
|
||||
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
|
||||
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
|
||||
@@ -42,7 +42,7 @@ namespace i18npool {
|
||||
|
||||
// Default identifier/name specification is [A-Za-z_][A-Za-z0-9_]*
|
||||
|
||||
-const sal_uInt8 cclass_Unicode::nDefCnt = 128;
|
||||
+const int cclass_Unicode::nDefCnt = 128;
|
||||
const ParserFlags cclass_Unicode::pDefaultParserTable[ nDefCnt ] =
|
||||
{
|
||||
// (...) == Calc formula compiler specific, commented out and modified
|
||||
--
|
||||
2.21.0.rc1
|
||||
|
@ -1,31 +0,0 @@
|
||||
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
|
||||
|
Loading…
Reference in new issue