external/icu/0001-ICU-23054-const-up-struct-that-gencmn-outputs.patch.2 | 25
++++++++++
external/icu/UnpackedTarball_icu.mk | 1
sfx2/source/doc/SfxDocumentMetaData.cxx | 6
+-
svx/source/svdraw/svdattr.cxx | 2
sw/source/core/unocore/unoobj.cxx | 4
-
unotools/source/misc/fontcvt.cxx | 2
6 files changed, 33 insertions(+), 7 deletions(-)
New commits:
commit e52bdd6d6509f54703ef37507602fd0278cf2780
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jul 15 09:57:18 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jul 15 18:50:38 2025 +0200
const up icu gencmn output
Change-Id: I0e39e5833b78b1c699782cf040dfbe49cf76ba8a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187905
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git
a/external/icu/0001-ICU-23054-const-up-struct-that-gencmn-outputs.patch.2
b/external/icu/0001-ICU-23054-const-up-struct-that-gencmn-outputs.patch.2
new file mode 100644
index 000000000000..6e620e883e57
--- /dev/null
+++ b/external/icu/0001-ICU-23054-const-up-struct-that-gencmn-outputs.patch.2
@@ -0,0 +1,25 @@
+From a918593e59e4fc67055420281940f67a068e0598 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caol...@gmail.com>
+Date: Tue, 15 Jul 2025 11:21:18 +0100
+Subject: [PATCH] ICU-23054 const up struct that gencmn outputs
+
+---
+ icu4c/source/tools/toolutil/pkg_gencmn.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/icu4c/source/tools/toolutil/pkg_gencmn.cpp
b/icu4c/source/tools/toolutil/pkg_gencmn.cpp
+index 3ec965d8e6..c1a46e9aed 100644
+--- a/icu4c/source/tools/toolutil/pkg_gencmn.cpp
++++ b/icu4c/source/tools/toolutil/pkg_gencmn.cpp
+@@ -360,7 +360,7 @@ createCommonDataFile(const char *destDir, const char
*name, const char *entrypoi
+
+ snprintf(
+ buffer, sizeof(buffer),
+- "U_EXPORT struct {
"
++ "U_EXPORT const struct {
"
+ " uint16_t headerSize;
"
+ " uint8_t magic1, magic2;
"
+ " UDataInfo info;
"
+--
+2.49.0
+
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index b3bd35e605e8..312c82475347 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
$(if $(filter-out
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
external/icu/no-python.patch \
external/icu/Wunnecessary-virtual-specifier.patch \
+ external/icu/0001-ICU-23054-const-up-struct-that-gencmn-outputs.patch.2
\
))
$(eval $(call
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
commit a9399dc2ba78cceec6ce9140b87a0bba98c56941
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jul 15 09:46:19 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jul 15 18:50:31 2025 +0200
const up s_stdMeta, s_stdStats
Change-Id: I8fe029daa696e4228abaa6ec76539945b60c7c68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187904
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx
b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 917d403b2445..7a15713f3af7 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -394,7 +394,7 @@ constexpr OUString s_stdStatAttrs[] = {
};
// NB: keep these two arrays in sync!
-const char* s_stdStats[] = {
+const char* const s_stdStats[] = {
"PageCount",
"TableCount",
"DrawCount",
@@ -413,7 +413,7 @@ const char* s_stdStats[] = {
nullptr
};
-const char* s_stdMeta[] = {
+const char* const s_stdMeta[] = {
"meta:generator", // string
"dc:title", // string
"dc:description", // string
@@ -1212,7 +1212,7 @@ void SfxDocumentMetaData::init(
// select nodes for elements of which we only handle one occurrence
- for (const char **pName = s_stdMeta; *pName != nullptr; ++pName) {
+ for (const char* const* pName = s_stdMeta; *pName != nullptr; ++pName) {
OUString name = OUString::createFromAscii(*pName);
// NB: If a document contains more than one occurrence of a
// meta-data element, we arbitrarily pick one of them here.
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 3d23d93dee46..d1bf41730fdc 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1726,7 +1726,7 @@ SdrMeasureTextHPosItem*
SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) co
const OUString & SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos)
{
- static std::array<OUString, 4> aMeasureTextHPosItem
+ static constexpr std::array<OUString, 4> aMeasureTextHPosItem
{
u"automatic"_ustr,
u"left outside"_ustr,
diff --git a/sw/source/core/unocore/unoobj.cxx
b/sw/source/core/unocore/unoobj.cxx
index 3ed86a98a45b..1c3f9d06a610 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2503,7 +2503,7 @@ void SAL_CALL SwXTextCursor::firePropertiesChangeEvent(
}
// para specific attribute ranges
-static sal_uInt16 g_ParaResetableSetRange[] = {
+const sal_uInt16 g_ParaResetableSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
@@ -2512,7 +2512,7 @@ static sal_uInt16 g_ParaResetableSetRange[] = {
};
// selection specific attribute ranges
-static sal_uInt16 g_ResetableSetRange[] = {
+const sal_uInt16 g_ResetableSetRange[] = {
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT,
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index df15d9fcdc6e..4d1541731505 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1332,7 +1332,7 @@ const RecodeTable aAppleSymbolRecodeTable[] = {
{"symbol", {aAdobeSymbolToAppleSymbolTab, u"AppleSymbol"_ustr,
nullptr}}
};
-static ConvertChar aImplStarSymbolCvt = { nullptr, u"StarBats"_ustr,
ImplStarSymbolToStarBats };
+const ConvertChar aImplStarSymbolCvt = { nullptr, u"StarBats"_ustr,
ImplStarSymbolToStarBats };
const ConvertChar* ConvertChar::GetRecodeData( std::u16string_view
rOrgFontName, std::u16string_view rMapFontName )
{
