summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-08-23 22:27:14 +0200
committerEike Rathke <erack@redhat.com>2013-08-23 23:09:09 +0200
commit087ee66013916bd009eb0b29460ef1868b4d755c (patch)
tree04a68244e9fe87f35b46afbe1bb06d8331be3a9c /rsc
parent5b2a740b9cacd1e0e4d2164647e89fb6b1e6c39e (diff)
encapsulate IsoLangEntry again
Change-Id: I66475eb3914b07b4c7a045e295ef77a5de9439d4
Diffstat (limited to 'rsc')
-rw-r--r--rsc/source/parser/rscibas.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index f4f05b5dbff5..dda165cc6e2c 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -81,18 +81,18 @@ void RscLangEnum::Init( RscNameTable& rNames )
sal_Int32 nIndex = 0;
mnLangId = 0x400; // stay away from selfdefined...
- const MsLangId::IsoLangEntry* pLangEntry;
- while ( NULL != ( pLangEntry = MsLangId::getIsoLangEntry( nIndex )) && ( pLangEntry->mnLang != LANGUAGE_DONTKNOW ))
+ const ::std::vector< MsLangId::LanguagetagMapping > aList( MsLangId::getDefinedLanguagetags());
+ for (::std::vector< MsLangId::LanguagetagMapping >::const_iterator iTag( aList.begin()); iTag != aList.end(); ++iTag)
{
#if OSL_DEBUG_LEVEL > 2
fprintf( stderr, "ISO Language in : %d, 0x%04x, %s\n",
(int)nIndex,
- (unsigned)pLangEntry->mnLang,
- OUStringToOString( pLangEntry->getTagString(), RTL_TEXTENCODING_ASCII_US).getStr());
+ (unsigned)(*iTag).mnLang,
+ OUStringToOString( (*iTag).maBcp47, RTL_TEXTENCODING_ASCII_US).getStr());
fprintf( stderr, "ISO Language out:");
#endif
- LanguageTag aLanguageTag( pLangEntry->getTagString());
+ LanguageTag aLanguageTag( (*iTag).maBcp47);
::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings());
for (::std::vector< OUString >::const_iterator it( aFallbacks.begin()); it != aFallbacks.end(); ++it)
{