From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: Sun, 27 Nov 2022 11:59:24 +0000 (+0700)
Subject: i18n: fix build with Boost 1.81.0
X-Git-Tag: archive/raspbian/1%7.4.4_rc2-2+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f13b6dabc03fc5bcb6171b9a486adfac6e0bb8fe;p=libreoffice.git

i18n: fix build with Boost 1.81.0

Boost.Locale since 1.81.0 switch to enum classes for facet type [1].
Switch our resource manager accordingly.

1: https://github.com/boostorg/locale/commit/e5ed439ea39a4de915e9fb939cca95cae7d9d8d1

Change-Id: Ief215363ceb79b2019606b20a7cde55c8df6a042
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143343
Reviewed-by: Heiko Becker <heirecka@exherbo.org>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 23dcd4339428e4080029ec5ae658e75f01e79a62)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144310
Reviewed-by: Danh Doan <congdanhqx@gmail.com>
Tested-by: Jenkins

Gbp-Pq: Name boost-1.81.diff
---

diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 641fa61be6d..dd7d8ab0682 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -127,8 +127,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
 #if defined(ANDROID)
         OString sPath(OString(lo_get_app_data_dir()) + "/program/resource");
 #else