mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

and some replacement code for lt_tag_get_privateuse(), sigh..

Browse Source 
Change-Id: Ida5064f32a16269b16ec16c0ce9f42ea895641f9
This commit is contained in:
Eike Rathke
2014-06-03 14:43:27 +02:00
parent a31f53d058
commit 4516b18f9a
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
i18nlangtag/source/languagetag/simple-langtag.cxx
View File

@@ -141,6 +141,12 @@ struct lt_variant_t : public my_t_impl
virtual ~lt_variant_t() {} virtual ~lt_variant_t() {}
}; };
struct lt_string_t : public my_t_impl
{
explicit lt_string_t() : my_t_impl() {}
virtual ~lt_string_t() {}
};
struct lt_list_t : public my_t_impl struct lt_list_t : public my_t_impl
{ {
lt_list_t* mpPrev; lt_list_t* mpPrev;
@@ -260,6 +266,7 @@ struct lt_tag_t : public my_t_impl
lt_script_t maScript; lt_script_t maScript;
lt_region_t maRegion; lt_region_t maRegion;
my_t_list maVariants; my_t_list maVariants;
lt_string_t maPrivateUse;
explicit lt_tag_t() : my_t_impl(), maLanguage(), maScript(), maRegion(), maVariants() {} explicit lt_tag_t() : my_t_impl(), maLanguage(), maScript(), maRegion(), maVariants() {}
virtual ~lt_tag_t() {} virtual ~lt_tag_t() {}
explicit lt_tag_t( const lt_tag_t& r ) explicit lt_tag_t( const lt_tag_t& r )
@@ -354,6 +361,13 @@ static lt_bool_t lt_tag_parse(lt_tag_t *tag,
{ {
(*ppSub)->assign( pStart, p); (*ppSub)->assign( pStart, p);
bPrivate = true; bPrivate = true;
if (*pStart == 'x')
{
// Simply copy all to privateuse field, we
// do not care here what part actually is
// private.
tag->maPrivateUse.assign( pStart, pEnd);
}
} }
else else
return 0; // bad return 0; // bad
@@ -531,6 +545,11 @@ static const lt_list_t *lt_tag_get_variants(const lt_tag_t *tag)
return tag ? tag->maVariants.mpList : NULL; return tag ? tag->maVariants.mpList : NULL;
} }
static const lt_string_t *lt_tag_get_privateuse(const lt_tag_t *tag)
{
return tag && tag->maPrivateUse.mpStr ? &tag->maPrivateUse : NULL;
}
static const char *lt_lang_get_tag(const lt_lang_t *lang) static const char *lt_lang_get_tag(const lt_lang_t *lang)
{ {
return lang ? lang->mpStr : NULL; return lang ? lang->mpStr : NULL;
@@ -551,6 +570,11 @@ static const char *lt_variant_get_tag(const lt_variant_t *variant)
return variant ? variant->mpStr : NULL; return variant ? variant->mpStr : NULL;
} }
static size_t lt_string_length(const lt_string_t *string)
{
return string ? strlen(string->mpStr) : 0;
}
#ifdef erDEBUG #ifdef erDEBUG
static void lt_tag_dump(const lt_tag_t *tag) static void lt_tag_dump(const lt_tag_t *tag)
{ {