online.git: engine/basic engine/connectivity engine/dbaccess engine/filter engine/hwpfilter engine/idl engine/linguistic engine/slideshow engine/sw engine/unoxml engine/vcl engine/xmloff

["Stephan Bergmann (via cogerrit)"]

engine/basic/source/classes/sbxmod.cxx | 4 ++--
engine/connectivity/source/manager/mdrivermanager.cxx | 4 ++--
engine/dbaccess/source/core/api/querycontainer.cxx | 4 ++--
engine/filter/source/msfilter/msdffimp.cxx | 8 ++++----
engine/hwpfilter/source/hstyle.cxx | 4 ++--
engine/idl/source/cmptools/lex.cxx | 8 ++++----
engine/linguistic/source/lngsvcmgr.cxx | 4 ++--
engine/slideshow/source/engine/box2dtools.cxx | 4 ++--
engine/sw/source/core/txtnode/atrfld.cxx | 4 ++--
engine/sw/source/ui/misc/contentcontroldlg.cxx | 4 ++--
engine/unoxml/source/dom/document.cxx | 4 ++--
engine/vcl/source/window/layout.cxx | 12 ++++++------
engine/xmloff/source/text/txtflde.cxx | 4 ++--
13 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit cc06a0c5288053636460ba0c2874c7c57c78ce19
Author: Stephan Bergmann <stephan....@collabora.com>
AuthorDate: Mon Apr 27 22:46:08 2026 +0200
Commit: Michael Stahl <michae...@collabora.com>
CommitDate: Tue Apr 28 12:46:31 2026 +0000

Adapt to some spurious warnings still emitted by recent GCC 17 trunk

Signed-off-by: Stephan Bergmann <stephan....@collabora.com>
Change-Id: Id18dea5cd17972e58ebb5ceea91828f7eefa799e
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/1748
Tested-by: Jenkins CPCI <rel...@collaboraoffice.com>
Reviewed-by: Michael Stahl <michae...@collabora.com>

diff --git a/engine/basic/source/classes/sbxmod.cxx b/engine/basic/source/classes/sbxmod.cxx
index ccb671d21f9d..72674fef51ad 100644
--- a/engine/basic/source/classes/sbxmod.cxx
+++ b/engine/basic/source/classes/sbxmod.cxx
@@ -650,12 +650,12 @@ SbxVariable* SbModule::Find( const OUString& rName, SbxClassType t )

pRes = new SbxVariable( SbxOBJECT );
pRes->SetName( aEnumName );
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
#endif
pRes->SetParent( this );
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif
pRes->SetFlag( SbxFlagBits::Read );
diff --git a/engine/connectivity/source/manager/mdrivermanager.cxx b/engine/connectivity/source/manager/mdrivermanager.cxx
index c73f641d6753..b44bcb72f624 100644
--- a/engine/connectivity/source/manager/mdrivermanager.cxx
+++ b/engine/connectivity/source/manager/mdrivermanager.cxx
@@ -563,12 +563,12 @@ Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const OUString& _rU
m_aDriversBS.end(), // end of search range
[&_rURL, this] (const DriverAccessArray::value_type& driverAccess) {
// extract the driver from the access, then ask the resulting driver for acceptance
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference"
#endif
const DriverAccess& ensuredAccess = EnsureDriver(m_xContext)(driverAccess);
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif
const Reference<XDriver> driver = ExtractDriverFromAccess()(ensuredAccess);
diff --git a/engine/dbaccess/source/core/api/querycontainer.cxx b/engine/dbaccess/source/core/api/querycontainer.cxx
index cc8000e5b9e0..e627ab9b24f7 100644
--- a/engine/dbaccess/source/core/api/querycontainer.cxx
+++ b/engine/dbaccess/source/core/api/querycontainer.cxx
@@ -84,12 +84,12 @@ void OQueryContainer::init()
m_aDocuments.push_back(m_aDocumentMap.emplace(definitionName, Documents::mapped_type()).first);
}

-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
#endif
setElementApproval( std::make_shared<ObjectNameApproval>( m_xConnection, ObjectNameApproval::TypeQuery ) );
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif
}
diff --git a/engine/filter/source/msfilter/msdffimp.cxx b/engine/filter/source/msfilter/msdffimp.cxx
index 7f1d4ca60f7e..700e577a6a53 100644
--- a/engine/filter/source/msfilter/msdffimp.cxx
+++ b/engine/filter/source/msfilter/msdffimp.cxx
@@ -5726,7 +5726,7 @@ void SvxMSDffManager::RemoveFromShapeOrder( SdrObject const * pObject ) const

// exported class: Public Methods

-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
@@ -5779,11 +5779,11 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
if( &rStCtrl != pStData )
pStData->Seek( nOldPosData );
}
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif

-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
@@ -5805,7 +5805,7 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, OUString aBaseURL )
{
SetModel( nullptr, 0 );
}
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif

diff --git a/engine/hwpfilter/source/hstyle.cxx b/engine/hwpfilter/source/hstyle.cxx
index 1a8309599afe..635ee2ac6c58 100644
--- a/engine/hwpfilter/source/hstyle.cxx
+++ b/engine/hwpfilter/source/hstyle.cxx
@@ -66,14 +66,14 @@ void HWPStyle::SetName(int n, char const* name)

if (name)
{
-#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 16) && !defined __clang__
+#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 17) && !defined __clang__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-truncation"
#endif
auto const p = style[n].name;
strncpy(p, name, MAXSTYLENAME);
p[MAXSTYLENAME] = '\0'; // just in case, even though the array is zero-initialized
-#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 16) && !defined __clang__
+#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 17) && !defined __clang__
#pragma GCC diagnostic pop
#endif
}
diff --git a/engine/idl/source/cmptools/lex.cxx b/engine/idl/source/cmptools/lex.cxx
index de3df82d5f0f..bb31479d9122 100644
--- a/engine/idl/source/cmptools/lex.cxx
+++ b/engine/idl/source/cmptools/lex.cxx
@@ -89,12 +89,12 @@ void SvTokenStream::FillTokenList()
{
if (!aTokList.empty())
{
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 12 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 12 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
*pToken = SvToken();
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 12 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 12 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif
std::vector<std::unique_ptr<SvToken> >::const_iterator it = aTokList.begin();
@@ -106,12 +106,12 @@ void SvTokenStream::FillTokenList()
}
else if( pToken->IsComment() )
{
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 12 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 12 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
*pToken = SvToken();
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 12 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 12 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif
}
diff --git a/engine/linguistic/source/lngsvcmgr.cxx b/engine/linguistic/source/lngsvcmgr.cxx
index 65c3b68d2f3b..1fd57944f92b 100644
--- a/engine/linguistic/source/lngsvcmgr.cxx
+++ b/engine/linguistic/source/lngsvcmgr.cxx
@@ -504,7 +504,7 @@ void LngSvcMgr::disposing(const lang::EventObject&)
stopListening();
}

-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 14 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 14 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
@@ -521,7 +521,7 @@ LngSvcMgr::~LngSvcMgr()
pAvailHyphSvcs.reset();
pAvailThesSvcs.reset();
}
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 14 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 14 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif

diff --git a/engine/slideshow/source/engine/box2dtools.cxx b/engine/slideshow/source/engine/box2dtools.cxx
index 9d19ba45ecab..a055c5aff9b5 100644
--- a/engine/slideshow/source/engine/box2dtools.cxx
+++ b/engine/slideshow/source/engine/box2dtools.cxx
@@ -728,12 +728,12 @@ Box2DBodySharedPtr box2DWorld::createStaticBody(const slideshow::internal::Shape
}

return std::make_shared<box2DBody>(pBody, mfScaleFactor);
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
#endif
}
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif

diff --git a/engine/sw/source/core/txtnode/atrfld.cxx b/engine/sw/source/core/txtnode/atrfld.cxx
index beccc2b9f417..fcb52dd7b2c8 100644
--- a/engine/sw/source/core/txtnode/atrfld.cxx
+++ b/engine/sw/source/core/txtnode/atrfld.cxx
@@ -600,13 +600,13 @@ SwTextField::SwTextField(
, m_aExpand()
, m_pTextNode( nullptr )
{
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#pragma GCC diagnostic ignored "-Wuninitialized"
#endif
SwFormatField& rSwFormatField(static_cast<SwFormatField&>(GetAttr()));
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif
m_aExpand = rSwFormatField.GetField()->ExpandField(bInClipboard, nullptr);
diff --git a/engine/sw/source/ui/misc/contentcontroldlg.cxx b/engine/sw/source/ui/misc/contentcontroldlg.cxx
index e9d6858b9d0f..4a63940e180f 100644
--- a/engine/sw/source/ui/misc/contentcontroldlg.cxx
+++ b/engine/sw/source/ui/misc/contentcontroldlg.cxx
@@ -300,7 +300,7 @@ IMPL_LINK_NOARG(SwContentControlDlg, OkHdl, weld::Button&, void)
m_xDialog->response(RET_OK);
}

-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
#endif
@@ -334,7 +334,7 @@ IMPL_LINK(SwContentControlDlg, SelectCharHdl, weld::Button&, rButton, void)
}
});
}
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif

diff --git a/engine/unoxml/source/dom/document.cxx b/engine/unoxml/source/dom/document.cxx
index f19b67f22bcb..643f1d7f3209 100644
--- a/engine/unoxml/source/dom/document.cxx
+++ b/engine/unoxml/source/dom/document.cxx
@@ -85,7 +85,7 @@ namespace DOM
return cur;
}

-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
@@ -96,7 +96,7 @@ namespace DOM
, m_pEventDispatcher(new events::CEventDispatcher)
{
}
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif

diff --git a/engine/vcl/source/window/layout.cxx b/engine/vcl/source/window/layout.cxx
index ea2d57d6fe92..a3e3731c2890 100644
--- a/engine/vcl/source/window/layout.cxx
+++ b/engine/vcl/source/window/layout.cxx
@@ -966,12 +966,12 @@ static array_type assembleGrid(const VclGrid &rGrid)
{
for (sal_Int32 y = 0; y < nMaxY; ++y)
{
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference"
#endif
const GridEntry &rEntry = A[x][y];
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif
const vcl::Window *pChild = rEntry.pChild;
@@ -1104,7 +1104,7 @@ static void calcMaxs(const array_type &A, std::vector<VclGrid::Value> &rWidths,
{
for (sal_Int32 y = 0; y < nMaxY; ++y)
{
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference"
#elif defined _MSC_VER
@@ -1113,7 +1113,7 @@ static void calcMaxs(const array_type &A, std::vector<VclGrid::Value> &rWidths,
#pragma warning(disable : 4996)
#endif
const GridEntry &rEntry = A[x][y];
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#elif defined _MSC_VER
#pragma warning(pop)
@@ -1148,12 +1148,12 @@ static void calcMaxs(const array_type &A, std::vector<VclGrid::Value> &rWidths,
{
for (sal_Int32 y = 0; y < nMaxY; ++y)
{
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference"
#endif
const GridEntry &rEntry = A[x][y];
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif
const vcl::Window *pChild = rEntry.pChild;
diff --git a/engine/xmloff/source/text/txtflde.cxx b/engine/xmloff/source/text/txtflde.cxx
index d5653b0f01e2..e7dedbfdc613 100644
--- a/engine/xmloff/source/text/txtflde.cxx
+++ b/engine/xmloff/source/text/txtflde.cxx
@@ -2264,12 +2264,12 @@ void XMLTextFieldExport::SetExportOnlyUsedFieldDeclarations(

// create used masters set (if none is used)
if (bExportOnlyUsed)
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 14 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 14 && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
moUsedMasters.emplace();
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 14 && __GNUC__ <= 16
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 14 && __GNUC__ >= 16 && __GNUC__ <= 17
#pragma GCC diagnostic pop
#endif
}