]>
Commit | Line | Data |
---|---|---|
b5fdb33e JP |
1 | From 23dcd4339428e4080029ec5ae658e75f01e79a62 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= | |
3 | <congdanhqx@gmail.com> | |
4 | Date: Sun, 27 Nov 2022 18:59:24 +0700 | |
5 | Subject: i18n: fix build with Boost 1.81.0 | |
6 | MIME-Version: 1.0 | |
7 | Content-Type: text/plain; charset=UTF-8 | |
8 | Content-Transfer-Encoding: 8bit | |
9 | ||
10 | Boost.Locale since 1.81.0 switch to enum classes for facet type [1]. | |
11 | Switch our resource manager accordingly. | |
12 | ||
13 | 1: https://github.com/boostorg/locale/commit/e5ed439ea39a4de915e9fb939cca95cae7d9d8d1 | |
14 | ||
15 | Change-Id: Ief215363ceb79b2019606b20a7cde55c8df6a042 | |
16 | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143343 | |
17 | Reviewed-by: Heiko Becker <heirecka@exherbo.org> | |
18 | Tested-by: Caolán McNamara <caolanm@redhat.com> | |
19 | Reviewed-by: Caolán McNamara <caolanm@redhat.com> | |
20 | --- | |
21 | unotools/source/i18n/resmgr.cxx | 5 +++++ | |
22 | 1 file changed, 5 insertions(+) | |
23 | ||
24 | (limited to 'unotools/source/i18n') | |
25 | ||
26 | diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx | |
27 | index ddedf5b9e8a2..3a7116350062 100644 | |
28 | --- a/unotools/source/i18n/resmgr.cxx | |
29 | +++ b/unotools/source/i18n/resmgr.cxx | |
30 | @@ -127,8 +127,13 @@ namespace Translate | |
31 | if (aFind != aCache.end()) | |
32 | return aFind->second; | |
33 | boost::locale::generator gen; | |
34 | +#if BOOST_VERSION < 108100 | |
35 | gen.characters(boost::locale::char_facet); | |
36 | gen.categories(boost::locale::message_facet | boost::locale::information_facet); | |
37 | +#else | |
38 | + gen.characters(boost::locale::char_facet_t::char_f); | |
39 | + gen.categories(boost::locale::category_t::message | boost::locale::category_t::information); | |
40 | +#endif | |
41 | #if defined(ANDROID) | |
42 | OString sPath(OString(lo_get_app_data_dir()) + "/program/resource"); | |
43 | #else | |
44 | -- | |
45 | cgit v1.2.1 | |
46 |