diff options
| author | Eike Rathke <erack@redhat.com> | 2013-09-05 15:54:14 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-09-05 16:51:28 +0200 |
| commit | e13fd395939ff037a38172a87366a84293df7e30 (patch) | |
| tree | fe13b157c41b7e4bf14c83bfd84a644951f83984 /tools | |
| parent | WaE: unused variable (diff) | |
| download | core-e13fd395939ff037a38172a87366a84293df7e30.tar.gz core-e13fd395939ff037a38172a87366a84293df7e30.zip | |
getFallbackStrings() with bIncludeFullBcp47 parameter
so the various places that check the full tag first do not have to get
it just to delete it again.
Change-Id: Ib4e3cf1b16988464db875f1b6ac5cf4a0ab60fe5
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index b5b86a0a1792..9199ad17963b 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -233,7 +233,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix, LanguageTag aLocale( rLocale ); boost::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end(); - ::std::vector< OUString > aFallbacks( aLocale.getFallbackStrings()); + ::std::vector< OUString > aFallbacks( aLocale.getFallbackStrings( true)); if (!isAlreadyPureenUS( aLocale)) aFallbacks.push_back( "en-US"); // last resort if all fallbacks fail @@ -356,7 +356,7 @@ InternalResMgr* ResMgrContainer::getNextFallback( InternalResMgr* pMgr ) * passed / remember a fallback list and an index within to pick the next. * */ - ::std::vector< OUString > aFallbacks( pMgr->aLocale.getFallbackStrings()); + ::std::vector< OUString > aFallbacks( pMgr->aLocale.getFallbackStrings( true)); // The first is the locale itself, use next fallback or en-US. /* TODO: what happens if the chain is "en-US", "en" -> "en-US", ... * This was already an issue with the previous code. */ |