bin/gen-boost-headers | 1
external/boost/include/boost/algorithm/string.hpp | 1
external/boost/include/boost/algorithm/string/predicate.hpp | 1
external/boost/include/boost/archive/iterators/base64_from_binary.hpp | 1
external/boost/include/boost/archive/iterators/binary_from_base64.hpp | 1
external/boost/include/boost/archive/iterators/remove_whitespace.hpp | 1
external/boost/include/boost/archive/iterators/transform_width.hpp | 1
external/boost/include/boost/bind.hpp | 1
external/boost/include/boost/cast.hpp | 1
external/boost/include/boost/circular_buffer.hpp | 1
external/boost/include/boost/cstdint.hpp | 1
external/boost/include/boost/current_function.hpp | 1
external/boost/include/boost/date_time.hpp | 1
external/boost/include/boost/date_time/posix_time/posix_time.hpp | 1
external/boost/include/boost/filesystem.hpp | 1
external/boost/include/boost/filesystem/path.hpp | 1
external/boost/include/boost/functional/hash.hpp | 1
external/boost/include/boost/fusion/adapted/std_pair.hpp | 1
external/boost/include/boost/fusion/include/adapt_struct.hpp | 1
external/boost/include/boost/intrusive/circular_list_algorithms.hpp | 1
external/boost/include/boost/intrusive_ptr.hpp | 1
external/boost/include/boost/io/ios_state.hpp | 1
external/boost/include/boost/iostreams/filter/gzip.hpp | 1
external/boost/include/boost/iostreams/filtering_stream.hpp | 1
external/boost/include/boost/iterator/iterator_facade.hpp | 1
external/boost/include/boost/lexical_cast.hpp | 1
external/boost/include/boost/locale.hpp | 1
external/boost/include/boost/locale/gnu_gettext.hpp | 1
external/boost/include/boost/logic/tribool.hpp | 1
external/boost/include/boost/math/common_factor_rt.hpp | 1
external/boost/include/boost/math/special_functions/expm1.hpp | 1
external/boost/include/boost/math/special_functions/sinc.hpp | 1
external/boost/include/boost/multi_array.hpp | 1
external/boost/include/boost/multi_index/composite_key.hpp | 1
external/boost/include/boost/multi_index/identity.hpp | 1
external/boost/include/boost/multi_index/mem_fun.hpp | 1
external/boost/include/boost/multi_index/ordered_index.hpp | 1
external/boost/include/boost/multi_index/random_access_index.hpp | 1
external/boost/include/boost/multi_index_container.hpp | 1
external/boost/include/boost/noncopyable.hpp | 1
external/boost/include/boost/none.hpp | 1
external/boost/include/boost/numeric/conversion/cast.hpp | 1
external/boost/include/boost/operators.hpp | 1
external/boost/include/boost/optional.hpp | 1
external/boost/include/boost/program_options.hpp | 1
external/boost/include/boost/property_tree/json_parser.hpp | 1
external/boost/include/boost/property_tree/ptree.hpp | 1
external/boost/include/boost/range/adaptor/reversed.hpp | 1
external/boost/include/boost/range/iterator_range.hpp | 1
external/boost/include/boost/rational.hpp | 1
external/boost/include/boost/scoped_ptr.hpp | 1
external/boost/include/boost/shared_ptr.hpp | 1
external/boost/include/boost/spirit/include/classic.hpp | 1
external/boost/include/boost/spirit/include/classic_core.hpp | 1
external/boost/include/boost/spirit/include/classic_error_handling.hpp | 1
external/boost/include/boost/spirit/include/classic_file_iterator.hpp | 1
external/boost/include/boost/spirit/include/classic_utility.hpp | 1
external/boost/include/boost/spirit/include/phoenix.hpp | 1
external/boost/include/boost/spirit/include/qi.hpp | 1
external/boost/include/boost/spirit/include/qi_attr.hpp | 1
external/boost/include/boost/spirit/include/qi_lit.hpp | 1
external/boost/include/boost/spirit/include/qi_optional.hpp | 1
external/boost/include/boost/spirit/include/qi_parse_attr.hpp | 1
external/boost/include/boost/spirit/include/qi_sequence.hpp | 1
external/boost/include/boost/spirit/include/qi_symbols.hpp | 1
external/boost/include/boost/unordered_map.hpp | 1
external/boost/include/boost/uuid/uuid_generators.hpp | 1
external/boost/include/boost/uuid/uuid_io.hpp | 1
external/boost/include/boost/variant.hpp | 1
external/boost/include/boost/variant/recursive_variant.hpp | 1
external/boost/include/boost/version.hpp | 1
sal/rtl/byteseq.cxx | 7
sw/qa/extras/layout/data/table-in-section-truncated.fodt | 161
++++++++++
sw/qa/extras/layout/layout.cxx | 44
++
sw/source/core/layout/tabfrm.cxx | 13
75 files changed, 294 insertions(+), 2 deletions(-)
New commits:
commit fa90125c6528ff3fdc0f2fcbea5378a7058b848e
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Feb 27 19:44:26 2025 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Feb 28 13:43:15 2025 +0100
sw: layout: fix truncation of table in section
There is a table in a section, split across 2 pages; now insert a page
break that moves the section to page 2.
In SwTabFrame::MakeAll(), on page 2, first the follow is joined, which
grows the table frame but shrinks the section frame (removing the
follow's height), then the table's upper is grown to LONG_MAX but with
bTst=true so it doesn't actually change or invalidate the section frame,
then in lcl_RecalcRow() almost no growth happens because the table
frame already has accounted for the height of most of the table content.
The section frame remains too small for the table, and the content is
truncated... this problem can already be reproduced in OOo 3.3.
When GetUpper()->Grow() returns some space, invalidate the upper if it's
a section frame, then the next round will format the section.
(Simply calling Grow() with bTst=false results in an opposite problem,
where the section is too large.)
Change-Id: I3cb3a5a38fbd7996fa9fcea9a6036f4260451a95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182331
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 154b58cfd76a8ad670d4aa25874eed66e3398a3e)
diff --git a/sw/qa/extras/layout/data/table-in-section-truncated.fodt
b/sw/qa/extras/layout/data/table-in-section-truncated.fodt
new file mode 100644
index 000000000000..238dcd18b1fb
--- /dev/null
+++ b/sw/qa/extras/layout/data/table-in-section-truncated.fodt
@@ -0,0 +1,161 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<office:document xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:css3t="http://www.w3.org/TR/css3-text/";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:dc="http://purl.org/dc/eleme
nts/1.1/" xmlns:ooo="http://openoffice.org/2004/office";
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0
" xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
+
<office:meta><meta:creation-date>2025-02-27T18:20:34.001095028</meta:creation-date><dc:date>2025-02-27T18:27:39.896741375</dc:date><meta:editing-duration>PT6M11S</meta:editing-duration><meta:editing-cycles>4</meta:editing-cycles><meta:generator>CIB_OfficeDev/6.4.0.24$Linux_X86_64
LibreOffice_project/f75130dcf240f3fe0d11d4374e1ad4e36d92e416</meta:generator><meta:document-statistic
meta:table-count="1" meta:image-count="0" meta:object-count="0"
meta:page-count="2" meta:paragraph-count="4" meta:word-count="10"
meta:character-count="53"
meta:non-whitespace-character-count="47"/></office:meta>
+ <office:font-face-decls>
+ <style:font-face style:name="Liberation Serif" svg:font-family="'Liberation
Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Lucida Sans" svg:font-family="'Lucida Sans'"
style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Serif CJK SC" svg:font-family="'Noto Serif
CJK SC'" style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <style:default-style style:family="graphic">
+ <style:graphic-properties svg:stroke-color="#3465a4"
draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm"
draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm"
draw:start-line-spacing-vertical="0.283cm"
draw:end-line-spacing-horizontal="0.283cm"
draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
style:font-name="Liberation Serif" fo:font-size="12pt" fo:language="de"
fo:country="DE" style:letter-kerning="true" style:font-name-asian="Noto Serif
CJK SC" style:font-size-asian="10.5pt" style:language-asian="zh"
style:country-asian="CN" style:font-name-complex="Lucida Sans"
style:font-size-complex="12pt" style:language-complex="hi"
style:country-complex="IN"/>
+ </style:default-style>
+ <style:default-style style:family="paragraph">
+ <style:paragraph-properties fo:orphans="2" fo:widows="2"
fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha"
style:punctuation-wrap="hanging" style:line-break="strict"
style:tab-stop-distance="1.251cm" style:writing-mode="page"/>
+ <style:text-properties style:use-window-font-color="true"
style:font-name="Liberation Serif" fo:font-size="12pt" fo:language="de"
fo:country="DE" style:letter-kerning="true" style:font-name-asian="Noto Serif
CJK SC" style:font-size-asian="10.5pt" style:language-asian="zh"
style:country-asian="CN" style:font-name-complex="Lucida Sans"
style:font-size-complex="12pt" style:language-complex="hi"
style:country-complex="IN" fo:hyphenate="false"
fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"
loext:hyphenation-no-caps="false"/>
+ </style:default-style>
+ <style:default-style style:family="table">
+ <style:table-properties table:border-model="collapsing"/>
+ </style:default-style>
+ <style:default-style style:family="table-row">
+ <style:table-row-properties fo:keep-together="auto"/>
+ </style:default-style>
+ <style:style style:name="Standard" style:family="paragraph"
style:class="text"/>
+ <text:outline-style style:name="Outline">
+ <text:outline-level-style text:level="1" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="2" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="3" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="4" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="5" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="6" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="7" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="8" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="9" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="10" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ </text:outline-style>
+ <text:notes-configuration text:note-class="footnote" style:num-format="1"
text:start-value="0" text:footnotes-position="page"
text:start-numbering-at="document"/>
+ <text:notes-configuration text:note-class="endnote" style:num-format="i"
text:start-value="0"/>
+ <text:linenumbering-configuration text:number-lines="false"
text:offset="0.499cm" style:num-format="1" text:number-position="left"
text:increment="5"/>
+ </office:styles>
+ <office:automatic-styles>
+ <style:style style:name="Table1" style:family="table">
+ <style:table-properties style:width="6.5cm" table:align="margins"/>
+ </style:style>
+ <style:style style:name="Table1.A" style:family="table-column">
+ <style:table-column-properties style:column-width="6.5cm"
style:rel-column-width="65535*"/>
+ </style:style>
+ <style:style style:name="Table1.A1" style:family="table-cell">
+ <style:table-cell-properties fo:padding="0.097cm" fo:border="0.05pt solid
#000000"/>
+ </style:style>
+ <style:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:text-properties/>
+ </style:style>
+ <style:style style:name="P3" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:text-properties/>
+ </style:style>
+ <style:style style:name="Sect1" style:family="section">
+ <style:section-properties style:editable="false">
+ <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+ </style:section-properties>
+ </style:style>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties fo:page-width="10.5cm"
fo:page-height="14.801cm" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm"
fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm"
style:layout-grid-mode="none" style:layout-grid-ruby-below="false"
style:layout-grid-print="false" style:layout-grid-display="false"
style:footnote-max-height="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Standard" style:page-layout-name="pm1"/>
+ </office:master-styles>
+ <office:body>
+ <office:text text:use-soft-page-breaks="true">
+ <office:forms form:automatic-focus="false" form:apply-design-mode="false"/>
+ <text:sequence-decls>
+ <text:sequence-decl text:display-outline-level="0"
text:name="Illustration"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+ </text:sequence-decls>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="Standard"/>
+ <text:p text:style-name="P3">before section</text:p>
+ <text:section text:style-name="Sect1" text:name="Section1">
+ <table:table table:name="Table1" table:style-name="Table1">
+ <table:table-column table:style-name="Table1.A"/>
+ <table:table-row>
+ <table:table-cell table:style-name="Table1.A1"
office:value-type="string">
+ <text:p text:style-name="P1">in table in section</text:p>
+ <text:p text:style-name="P1"><text:soft-page-break/></text:p>
+ <text:p text:style-name="P1">end table</text:p>
+ </table:table-cell>
+ </table:table-row>
+ </table:table>
+ <text:p text:style-name="P1">end section</text:p>
+ </text:section>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 29d6d216f7a5..49071831ef32 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -285,6 +285,50 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTableSplitBug)
}
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTableInSectionTruncated)
+{
+ createDoc("table-in-section-truncated.fodt");
+
+ {
+ xmlDocPtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt", 20);
+ assertXPath(pXmlDoc, "/root/page[1]/body/section/txt", 0);
+ assertXPath(pXmlDoc, "/root/page[1]/body/section/tab/row/cell/txt", 1);
+ assertXPath(pXmlDoc, "/root/page[2]/body/section/tab/row/cell/txt", 2);
+ assertXPath(pXmlDoc, "/root/page[2]/body/section/txt", 1);
+ assertXPath(pXmlDoc, "/root/page[2]/body/txt", 0);
+
+ assertXPath(pXmlDoc, "/root/page[2]/body/section/infos/bounds",
"bottom", "11032");
+ discardDumpedLayout();
+ }
+
+ SwXTextDocument* pTextDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+
+ pWrtShell->Down(false, 19);
+ lcl_dispatchCommand(mxComponent, ".uno:InsertPagebreak", {});
+
+ {
+ xmlDocPtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc, "/root/page[1]/body/txt", 20);
+ assertXPath(pXmlDoc, "/root/page[1]/body/section/txt", 0);
+ assertXPath(pXmlDoc, "/root/page[1]/body/section/tab/row/cell/txt", 0);
+ assertXPath(pXmlDoc, "/root/page[2]/body/txt", 1);
+ assertXPath(pXmlDoc, "/root/page[2]/body/section/tab/row/cell/txt", 3);
+ assertXPath(pXmlDoc, "/root/page[2]/body/section/txt", 1);
+
+ assertXPath(pXmlDoc, "/root/page[2]/body/section/infos/bounds", "top",
"10369");
+ assertXPath(pXmlDoc, "/root/page[2]/body/section/tab/infos/bounds",
"top", "10369");
+ assertXPath(pXmlDoc, "/root/page[2]/body/section/tab/infos/bounds",
"height", "940");
+ assertXPath(pXmlDoc, "/root/page[2]/body/section/txt/infos/bounds",
"bottom",
+ "11584");
+ // problem was that the section bottom did not grow enough (only 11309)
+ assertXPath(pXmlDoc, "/root/page[2]/body/section/infos/bounds",
"bottom", "11584");
+ discardDumpedLayout();
+ }
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTableInSectionSplitLoop)
{
createDoc("table-in-section-split-loop.fodt");
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index c5a5897b7ccb..c9f9674e8593 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2558,8 +2558,17 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
{
SwTwips nDeadLine = aRectFnSet.GetPrtBottom(*GetUpper());
if( IsInSct() || GetUpper()->IsInTab() ) // TABLE IN TABLE)
- nDeadLine = aRectFnSet.YInc( nDeadLine,
- GetUpper()->Grow( LONG_MAX, true ) );
+ {
+ auto const nGrow{GetUpper()->Grow(LONG_MAX, true)};
+ if (nGrow != 0)
+ {
+ if (GetUpper()->IsSctFrame()) // what about table cell?
+ {
+ GetUpper()->InvalidateSize_();
+ }
+ nDeadLine = aRectFnSet.YInc(nDeadLine, nGrow);
+ }
+ }
{
SwFrameDeleteGuard g(Lower()); // tdf#134965 prevent
RemoveFollowFlowLine()
commit 424d58b315748ce0673cc0c490a1a6ac0dbcb2a1
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jul 22 13:37:06 2020 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Feb 26 19:08:01 2025 +0100
Silence GCC 11 trunk -Werror=nonnull in external/boost
...like
> In file included from
workdir/UnpackedTarball/boost/boost/concept/assert.hpp:35,
> from
workdir/UnpackedTarball/boost/boost/concept_check.hpp:20,
> from
workdir/UnpackedTarball/boost/boost/range/concepts.hpp:19,
> from
workdir/UnpackedTarball/boost/boost/range/size_type.hpp:20,
> from
workdir/UnpackedTarball/boost/boost/range/size.hpp:21,
> from
workdir/UnpackedTarball/boost/boost/range/functions.hpp:20,
> from
workdir/UnpackedTarball/boost/boost/range/iterator_range_core.hpp:38,
> from
workdir/UnpackedTarball/boost/boost/range/iterator_range.hpp:13,
> from
external/boost/include/boost/range/iterator_range.hpp:29,
> from
workdir/UnpackedTarball/boost/boost/range/as_literal.hpp:22,
> from
workdir/UnpackedTarball/boost/boost/algorithm/string/trim.hpp:19,
> from
workdir/UnpackedTarball/boost/boost/algorithm/string.hpp:19,
> from
external/boost/include/boost/algorithm/string.hpp:29,
> from sal/cppunittester/cppunittester.cxx:61:
> workdir/UnpackedTarball/boost/boost/concept/detail/general.hpp: In
instantiation of ‘static void boost::concepts::constraint<Model>::failed()
[with Model =
boost::algorithm::FinderConcept<boost::algorithm::detail::token_finderF<boost::algorithm::detail::is_any_ofF<char>
>, const char*>]’:
> workdir/UnpackedTarball/boost/boost/algorithm/string/iter_find.hpp:81:13:
required from ‘SequenceSequenceT&
boost::algorithm::iter_split(SequenceSequenceT&, RangeT&&, FinderT) [with
SequenceSequenceT = std::__debug::vector<std::__cxx11::basic_string<char> >;
RangeT = const char*&; FinderT =
boost::algorithm::detail::token_finderF<boost::algorithm::detail::is_any_ofF<char>
>]’
> workdir/UnpackedTarball/boost/boost/algorithm/string/split.hpp:158:50:
required from ‘SequenceSequenceT& boost::algorithm::split(SequenceSequenceT&,
RangeT&&, PredicateT, boost::algorithm::token_compress_mode_type) [with
SequenceSequenceT = std::__debug::vector<std::__cxx11::basic_string<char> >;
RangeT = const char*&; PredicateT = boost::algorithm::detail::is_any_ofF<char>]’
> sal/cppunittester/cppunittester.cxx:303:71: required from here
> workdir/UnpackedTarball/boost/boost/concept/detail/general.hpp:47:52:
error: ‘this’ pointer null [-Werror=nonnull]
> 47 | static void failed() { ((Model*)0)->constraints(); }
> | ~~~~~~~~~~~~~~~~~~~~~~~~^~
Change-Id: Ia22b5d510ba41bea138dfcc8d8e0b9eb1e9ad41c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99217
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 7adb6398dcb081999003c61985ae8a203c65ce0d)
diff --git a/bin/gen-boost-headers b/bin/gen-boost-headers
index 478e9c8f7ee0..a30f738709ae 100755
--- a/bin/gen-boost-headers
+++ b/bin/gen-boost-headers
@@ -46,6 +46,7 @@ cat <(cd ${SRCDIR} && git grep -h '^# *include') \
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/algorithm/string.hpp
b/external/boost/include/boost/algorithm/string.hpp
index ad7dabf82da9..b1704cd70838 100644
--- a/external/boost/include/boost/algorithm/string.hpp
+++ b/external/boost/include/boost/algorithm/string.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/algorithm/string/predicate.hpp
b/external/boost/include/boost/algorithm/string/predicate.hpp
index af71d53bdd7e..36ea330a1fc3 100644
--- a/external/boost/include/boost/algorithm/string/predicate.hpp
+++ b/external/boost/include/boost/algorithm/string/predicate.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git
a/external/boost/include/boost/archive/iterators/base64_from_binary.hpp
b/external/boost/include/boost/archive/iterators/base64_from_binary.hpp
index f89f029f61a1..e9a556fb516b 100644
--- a/external/boost/include/boost/archive/iterators/base64_from_binary.hpp
+++ b/external/boost/include/boost/archive/iterators/base64_from_binary.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git
a/external/boost/include/boost/archive/iterators/binary_from_base64.hpp
b/external/boost/include/boost/archive/iterators/binary_from_base64.hpp
index f9381fbaa4c8..2c342fb3b654 100644
--- a/external/boost/include/boost/archive/iterators/binary_from_base64.hpp
+++ b/external/boost/include/boost/archive/iterators/binary_from_base64.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git
a/external/boost/include/boost/archive/iterators/remove_whitespace.hpp
b/external/boost/include/boost/archive/iterators/remove_whitespace.hpp
index 095e76d755f2..4ba1945bc5c1 100644
--- a/external/boost/include/boost/archive/iterators/remove_whitespace.hpp
+++ b/external/boost/include/boost/archive/iterators/remove_whitespace.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/archive/iterators/transform_width.hpp
b/external/boost/include/boost/archive/iterators/transform_width.hpp
index 1e7a7bbf5f5f..6ecf708393a7 100644
--- a/external/boost/include/boost/archive/iterators/transform_width.hpp
+++ b/external/boost/include/boost/archive/iterators/transform_width.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/bind.hpp
b/external/boost/include/boost/bind.hpp
index 20b1e96dc75d..526d84ab38a7 100644
--- a/external/boost/include/boost/bind.hpp
+++ b/external/boost/include/boost/bind.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/cast.hpp
b/external/boost/include/boost/cast.hpp
index f35a82a83028..e2533343bdc5 100644
--- a/external/boost/include/boost/cast.hpp
+++ b/external/boost/include/boost/cast.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/circular_buffer.hpp
b/external/boost/include/boost/circular_buffer.hpp
index 4f2d4e74081f..430db5af2397 100644
--- a/external/boost/include/boost/circular_buffer.hpp
+++ b/external/boost/include/boost/circular_buffer.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/cstdint.hpp
b/external/boost/include/boost/cstdint.hpp
index 932fc2f95409..0470f2cea7b3 100644
--- a/external/boost/include/boost/cstdint.hpp
+++ b/external/boost/include/boost/cstdint.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/current_function.hpp
b/external/boost/include/boost/current_function.hpp
index 8d6296731fed..e3918e0bf8da 100644
--- a/external/boost/include/boost/current_function.hpp
+++ b/external/boost/include/boost/current_function.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/date_time.hpp
b/external/boost/include/boost/date_time.hpp
index 979ba99c4d64..f58b6fc8573b 100644
--- a/external/boost/include/boost/date_time.hpp
+++ b/external/boost/include/boost/date_time.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/date_time/posix_time/posix_time.hpp
b/external/boost/include/boost/date_time/posix_time/posix_time.hpp
index f519e3eaf4cb..0884a2330247 100644
--- a/external/boost/include/boost/date_time/posix_time/posix_time.hpp
+++ b/external/boost/include/boost/date_time/posix_time/posix_time.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/filesystem.hpp
b/external/boost/include/boost/filesystem.hpp
index a23e81e33c12..697dd04a4f2a 100644
--- a/external/boost/include/boost/filesystem.hpp
+++ b/external/boost/include/boost/filesystem.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/filesystem/path.hpp
b/external/boost/include/boost/filesystem/path.hpp
index f3927a8f9220..0e6c6fcf5a53 100644
--- a/external/boost/include/boost/filesystem/path.hpp
+++ b/external/boost/include/boost/filesystem/path.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/functional/hash.hpp
b/external/boost/include/boost/functional/hash.hpp
index f3fc2cfdfa37..8872d71af5b1 100644
--- a/external/boost/include/boost/functional/hash.hpp
+++ b/external/boost/include/boost/functional/hash.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/fusion/adapted/std_pair.hpp
b/external/boost/include/boost/fusion/adapted/std_pair.hpp
index 9dd29bcc4096..b62fa4748e0c 100644
--- a/external/boost/include/boost/fusion/adapted/std_pair.hpp
+++ b/external/boost/include/boost/fusion/adapted/std_pair.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/fusion/include/adapt_struct.hpp
b/external/boost/include/boost/fusion/include/adapt_struct.hpp
index 6462b99d3577..5b457c3c6110 100644
--- a/external/boost/include/boost/fusion/include/adapt_struct.hpp
+++ b/external/boost/include/boost/fusion/include/adapt_struct.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git
a/external/boost/include/boost/intrusive/circular_list_algorithms.hpp
b/external/boost/include/boost/intrusive/circular_list_algorithms.hpp
index 136468348535..6ee7c928269d 100644
--- a/external/boost/include/boost/intrusive/circular_list_algorithms.hpp
+++ b/external/boost/include/boost/intrusive/circular_list_algorithms.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/intrusive_ptr.hpp
b/external/boost/include/boost/intrusive_ptr.hpp
index 800a25738b6e..349d84ecad83 100644
--- a/external/boost/include/boost/intrusive_ptr.hpp
+++ b/external/boost/include/boost/intrusive_ptr.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/io/ios_state.hpp
b/external/boost/include/boost/io/ios_state.hpp
index 3680ade3d294..8680e4fef967 100644
--- a/external/boost/include/boost/io/ios_state.hpp
+++ b/external/boost/include/boost/io/ios_state.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/iostreams/filter/gzip.hpp
b/external/boost/include/boost/iostreams/filter/gzip.hpp
index 2ab88978174d..65343cb04695 100644
--- a/external/boost/include/boost/iostreams/filter/gzip.hpp
+++ b/external/boost/include/boost/iostreams/filter/gzip.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/iostreams/filtering_stream.hpp
b/external/boost/include/boost/iostreams/filtering_stream.hpp
index 7a387f76b3e4..93fd815afe55 100644
--- a/external/boost/include/boost/iostreams/filtering_stream.hpp
+++ b/external/boost/include/boost/iostreams/filtering_stream.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/iterator/iterator_facade.hpp
b/external/boost/include/boost/iterator/iterator_facade.hpp
index cf420d2962da..1eb9c84a6007 100644
--- a/external/boost/include/boost/iterator/iterator_facade.hpp
+++ b/external/boost/include/boost/iterator/iterator_facade.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/lexical_cast.hpp
b/external/boost/include/boost/lexical_cast.hpp
index 4ec5e34772b1..5b8546601d8b 100644
--- a/external/boost/include/boost/lexical_cast.hpp
+++ b/external/boost/include/boost/lexical_cast.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/locale.hpp
b/external/boost/include/boost/locale.hpp
index 42a2d5396118..8c6c28fd00bc 100644
--- a/external/boost/include/boost/locale.hpp
+++ b/external/boost/include/boost/locale.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/locale/gnu_gettext.hpp
b/external/boost/include/boost/locale/gnu_gettext.hpp
index a30ac3775665..489efb0830cb 100644
--- a/external/boost/include/boost/locale/gnu_gettext.hpp
+++ b/external/boost/include/boost/locale/gnu_gettext.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/logic/tribool.hpp
b/external/boost/include/boost/logic/tribool.hpp
index a733419d4825..bef0383bf00a 100644
--- a/external/boost/include/boost/logic/tribool.hpp
+++ b/external/boost/include/boost/logic/tribool.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/math/common_factor_rt.hpp
b/external/boost/include/boost/math/common_factor_rt.hpp
index ea3fd290387a..13b7b0935c8d 100644
--- a/external/boost/include/boost/math/common_factor_rt.hpp
+++ b/external/boost/include/boost/math/common_factor_rt.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/math/special_functions/expm1.hpp
b/external/boost/include/boost/math/special_functions/expm1.hpp
index 969402525778..1ebe219fe640 100644
--- a/external/boost/include/boost/math/special_functions/expm1.hpp
+++ b/external/boost/include/boost/math/special_functions/expm1.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/math/special_functions/sinc.hpp
b/external/boost/include/boost/math/special_functions/sinc.hpp
index ef04fd0b7356..520e2a01cfd6 100644
--- a/external/boost/include/boost/math/special_functions/sinc.hpp
+++ b/external/boost/include/boost/math/special_functions/sinc.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/multi_array.hpp
b/external/boost/include/boost/multi_array.hpp
index 9155dae59bb1..71a191405f9b 100644
--- a/external/boost/include/boost/multi_array.hpp
+++ b/external/boost/include/boost/multi_array.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/multi_index/composite_key.hpp
b/external/boost/include/boost/multi_index/composite_key.hpp
index 881f325ee29b..97e87705eb11 100644
--- a/external/boost/include/boost/multi_index/composite_key.hpp
+++ b/external/boost/include/boost/multi_index/composite_key.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/multi_index/identity.hpp
b/external/boost/include/boost/multi_index/identity.hpp
index ca85c6787a1a..a9ecd8fd2738 100644
--- a/external/boost/include/boost/multi_index/identity.hpp
+++ b/external/boost/include/boost/multi_index/identity.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/multi_index/mem_fun.hpp
b/external/boost/include/boost/multi_index/mem_fun.hpp
index 84f04eaf861f..310a89e6374c 100644
--- a/external/boost/include/boost/multi_index/mem_fun.hpp
+++ b/external/boost/include/boost/multi_index/mem_fun.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/multi_index/ordered_index.hpp
b/external/boost/include/boost/multi_index/ordered_index.hpp
index 8b95edf758fa..ecd5907b400f 100644
--- a/external/boost/include/boost/multi_index/ordered_index.hpp
+++ b/external/boost/include/boost/multi_index/ordered_index.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/multi_index/random_access_index.hpp
b/external/boost/include/boost/multi_index/random_access_index.hpp
index 81786438a01a..b8e16363626a 100644
--- a/external/boost/include/boost/multi_index/random_access_index.hpp
+++ b/external/boost/include/boost/multi_index/random_access_index.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/multi_index_container.hpp
b/external/boost/include/boost/multi_index_container.hpp
index 79cbc68e7bb3..345a70e37f2e 100644
--- a/external/boost/include/boost/multi_index_container.hpp
+++ b/external/boost/include/boost/multi_index_container.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/noncopyable.hpp
b/external/boost/include/boost/noncopyable.hpp
index 1fa9936528b3..42a116226879 100644
--- a/external/boost/include/boost/noncopyable.hpp
+++ b/external/boost/include/boost/noncopyable.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/none.hpp
b/external/boost/include/boost/none.hpp
index 8ae6f6453aba..4ee6fd450a8c 100644
--- a/external/boost/include/boost/none.hpp
+++ b/external/boost/include/boost/none.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/numeric/conversion/cast.hpp
b/external/boost/include/boost/numeric/conversion/cast.hpp
index 51e9bb3780c4..db8bb63c1fda 100644
--- a/external/boost/include/boost/numeric/conversion/cast.hpp
+++ b/external/boost/include/boost/numeric/conversion/cast.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/operators.hpp
b/external/boost/include/boost/operators.hpp
index b2522366a4ca..1791eb3deecd 100644
--- a/external/boost/include/boost/operators.hpp
+++ b/external/boost/include/boost/operators.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/optional.hpp
b/external/boost/include/boost/optional.hpp
index 3037bdd17e93..2ab169e9d982 100644
--- a/external/boost/include/boost/optional.hpp
+++ b/external/boost/include/boost/optional.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/program_options.hpp
b/external/boost/include/boost/program_options.hpp
index 6dc76ad6a25a..6ff8cbeba9a0 100644
--- a/external/boost/include/boost/program_options.hpp
+++ b/external/boost/include/boost/program_options.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/property_tree/json_parser.hpp
b/external/boost/include/boost/property_tree/json_parser.hpp
index 3e79b7d3c611..b9c721df4be0 100644
--- a/external/boost/include/boost/property_tree/json_parser.hpp
+++ b/external/boost/include/boost/property_tree/json_parser.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/property_tree/ptree.hpp
b/external/boost/include/boost/property_tree/ptree.hpp
index 7a75dfc6851a..0a39e6df6408 100644
--- a/external/boost/include/boost/property_tree/ptree.hpp
+++ b/external/boost/include/boost/property_tree/ptree.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/range/adaptor/reversed.hpp
b/external/boost/include/boost/range/adaptor/reversed.hpp
index 04b14540006b..2584b4bb79c1 100644
--- a/external/boost/include/boost/range/adaptor/reversed.hpp
+++ b/external/boost/include/boost/range/adaptor/reversed.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/range/iterator_range.hpp
b/external/boost/include/boost/range/iterator_range.hpp
index d01cd33e15e2..40f998b3af49 100644
--- a/external/boost/include/boost/range/iterator_range.hpp
+++ b/external/boost/include/boost/range/iterator_range.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/rational.hpp
b/external/boost/include/boost/rational.hpp
index dd051852dcef..cf1c10a45174 100644
--- a/external/boost/include/boost/rational.hpp
+++ b/external/boost/include/boost/rational.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/scoped_ptr.hpp
b/external/boost/include/boost/scoped_ptr.hpp
index 17bd3f63b257..c4ea7fa75d46 100644
--- a/external/boost/include/boost/scoped_ptr.hpp
+++ b/external/boost/include/boost/scoped_ptr.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/shared_ptr.hpp
b/external/boost/include/boost/shared_ptr.hpp
index 2fb3cc0c7ae8..4b6782cf9847 100644
--- a/external/boost/include/boost/shared_ptr.hpp
+++ b/external/boost/include/boost/shared_ptr.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/classic.hpp
b/external/boost/include/boost/spirit/include/classic.hpp
index b7199c8e93ed..737c61d3fe76 100644
--- a/external/boost/include/boost/spirit/include/classic.hpp
+++ b/external/boost/include/boost/spirit/include/classic.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/classic_core.hpp
b/external/boost/include/boost/spirit/include/classic_core.hpp
index 132073577f4e..1f99e673452b 100644
--- a/external/boost/include/boost/spirit/include/classic_core.hpp
+++ b/external/boost/include/boost/spirit/include/classic_core.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git
a/external/boost/include/boost/spirit/include/classic_error_handling.hpp
b/external/boost/include/boost/spirit/include/classic_error_handling.hpp
index 6d65e6d90b89..e7eefd0523e0 100644
--- a/external/boost/include/boost/spirit/include/classic_error_handling.hpp
+++ b/external/boost/include/boost/spirit/include/classic_error_handling.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git
a/external/boost/include/boost/spirit/include/classic_file_iterator.hpp
b/external/boost/include/boost/spirit/include/classic_file_iterator.hpp
index 01ce04e1e34f..190bdab91336 100644
--- a/external/boost/include/boost/spirit/include/classic_file_iterator.hpp
+++ b/external/boost/include/boost/spirit/include/classic_file_iterator.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/classic_utility.hpp
b/external/boost/include/boost/spirit/include/classic_utility.hpp
index b1febc31a195..84e2593a82d4 100644
--- a/external/boost/include/boost/spirit/include/classic_utility.hpp
+++ b/external/boost/include/boost/spirit/include/classic_utility.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/phoenix.hpp
b/external/boost/include/boost/spirit/include/phoenix.hpp
index eaaf8c632f44..0db9d740677b 100644
--- a/external/boost/include/boost/spirit/include/phoenix.hpp
+++ b/external/boost/include/boost/spirit/include/phoenix.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/qi.hpp
b/external/boost/include/boost/spirit/include/qi.hpp
index e5fed56661f7..792a63eb1869 100644
--- a/external/boost/include/boost/spirit/include/qi.hpp
+++ b/external/boost/include/boost/spirit/include/qi.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/qi_attr.hpp
b/external/boost/include/boost/spirit/include/qi_attr.hpp
index cd7dbc193ff2..11c9011f6881 100644
--- a/external/boost/include/boost/spirit/include/qi_attr.hpp
+++ b/external/boost/include/boost/spirit/include/qi_attr.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/qi_lit.hpp
b/external/boost/include/boost/spirit/include/qi_lit.hpp
index a9fc82e56957..cc5a61daea05 100644
--- a/external/boost/include/boost/spirit/include/qi_lit.hpp
+++ b/external/boost/include/boost/spirit/include/qi_lit.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/qi_optional.hpp
b/external/boost/include/boost/spirit/include/qi_optional.hpp
index 774bc8d3f32d..3deefcdad6ec 100644
--- a/external/boost/include/boost/spirit/include/qi_optional.hpp
+++ b/external/boost/include/boost/spirit/include/qi_optional.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/qi_parse_attr.hpp
b/external/boost/include/boost/spirit/include/qi_parse_attr.hpp
index c4305aaf2425..02aa676f8b29 100644
--- a/external/boost/include/boost/spirit/include/qi_parse_attr.hpp
+++ b/external/boost/include/boost/spirit/include/qi_parse_attr.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/qi_sequence.hpp
b/external/boost/include/boost/spirit/include/qi_sequence.hpp
index 20898f1e25df..8a80e9203adc 100644
--- a/external/boost/include/boost/spirit/include/qi_sequence.hpp
+++ b/external/boost/include/boost/spirit/include/qi_sequence.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/spirit/include/qi_symbols.hpp
b/external/boost/include/boost/spirit/include/qi_symbols.hpp
index 4e9b3e07c517..0435c601743c 100644
--- a/external/boost/include/boost/spirit/include/qi_symbols.hpp
+++ b/external/boost/include/boost/spirit/include/qi_symbols.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/unordered_map.hpp
b/external/boost/include/boost/unordered_map.hpp
index 224f6e8efddb..3f32634d74f7 100644
--- a/external/boost/include/boost/unordered_map.hpp
+++ b/external/boost/include/boost/unordered_map.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/uuid/uuid_generators.hpp
b/external/boost/include/boost/uuid/uuid_generators.hpp
index 188daaabb23e..69455c9944bd 100644
--- a/external/boost/include/boost/uuid/uuid_generators.hpp
+++ b/external/boost/include/boost/uuid/uuid_generators.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/uuid/uuid_io.hpp
b/external/boost/include/boost/uuid/uuid_io.hpp
index 6f7804f04f0e..a741b329a5b5 100644
--- a/external/boost/include/boost/uuid/uuid_io.hpp
+++ b/external/boost/include/boost/uuid/uuid_io.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/variant.hpp
b/external/boost/include/boost/variant.hpp
index ce10d761ffd0..8a75ea88965d 100644
--- a/external/boost/include/boost/variant.hpp
+++ b/external/boost/include/boost/variant.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/variant/recursive_variant.hpp
b/external/boost/include/boost/variant/recursive_variant.hpp
index b3b1ba12e6d0..3a691bdca3ae 100644
--- a/external/boost/include/boost/variant/recursive_variant.hpp
+++ b/external/boost/include/boost/variant/recursive_variant.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
diff --git a/external/boost/include/boost/version.hpp
b/external/boost/include/boost/version.hpp
index 82383617c330..261ad39689b2 100644
--- a/external/boost/include/boost/version.hpp
+++ b/external/boost/include/boost/version.hpp
@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Winvalid-constexpr"
#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#pragma GCC diagnostic ignored "-Wnonnull"
#pragma GCC diagnostic ignored "-Wparentheses"
#pragma GCC diagnostic ignored "-Wplacement-new"
#pragma GCC diagnostic ignored "-Wreturn-type"
commit 194346fd6d50c8796d57839185a17505a498e005
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Sun Dec 24 13:14:53 2023 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Feb 26 19:08:01 2025 +0100
Silence new GCC 14 trunk -Werror=alloc-size
> sal/rtl/byteseq.cxx: In function ‘void
rtl_byte_sequence_reference2One(sal_Sequence**)’:
> sal/rtl/byteseq.cxx:63:20: error: allocation of insufficient size ‘8’ for
type ‘sal_Sequence’ {aka ‘_sal_Sequence’} with size ‘12’ [-Werror=alloc-size]
> 63 | pNew = static_cast<sal_Sequence *>(malloc(
SAL_SEQUENCE_HEADER_SIZE ));
> |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
(cherry-picked from 5e3af4aec40531b490950da5ed49342a01c1477b)
Change-Id: I9d4081ed2938fffdf282c852250a3eed5f0d9e25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161269
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
(cherry picked from commit 86211693569151d0f9d824425927b35d76bd1737)
diff --git a/sal/rtl/byteseq.cxx b/sal/rtl/byteseq.cxx
index c78a1e22f43a..4162da81d337 100644
--- a/sal/rtl/byteseq.cxx
+++ b/sal/rtl/byteseq.cxx
@@ -59,7 +59,14 @@ void SAL_CALL rtl_byte_sequence_reference2One(
}
else
{
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 14
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Walloc-size"
+#endif
pNew = static_cast<sal_Sequence *>(malloc(
SAL_SEQUENCE_HEADER_SIZE ));
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 14
+#pragma GCC diagnostic pop
+#endif
}
if ( pNew != nullptr )
