mcst-linux-kernel/patches-2024.06.26/libreoffice-6.3.0.4/0019-boost1.81-compat-bug15...

23 lines
1017 B
Diff
Raw Permalink Normal View History

2024-07-09 13:51:45 +03:00
Link:https://git.libreoffice.org/core/+/23dcd4339428e4080029ec5ae658e75f01e79a62
Subject: i18n: fix build with Boost 1.81.0
Bug: 153990
Tags: common
diff -rupN a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
--- a/unotools/source/i18n/resmgr.cxx 2023-12-08 16:46:00.819604172 +0300
+++ b/unotools/source/i18n/resmgr.cxx 2023-12-08 16:46:52.946886607 +0300
@@ -121,8 +121,13 @@ namespace Translate
if (aFind != aCache.end())
return aFind->second;
boost::locale::generator gen;
+#if BOOST_VERSION < 108100
gen.characters(boost::locale::char_facet);
gen.categories(boost::locale::message_facet | boost::locale::information_facet);
+#else
+ gen.characters(boost::locale::char_facet_t::char_f);
+ gen.categories(boost::locale::category_t::message | boost::locale::category_t::information);
+#endif
OUString uri("$BRAND_BASE_DIR/$BRAND_SHARE_RESOURCE_SUBDIR/");
rtl::Bootstrap::expandMacros(uri);
OUString path;