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 /unotools | |
| parent | c2b18aa7743ffb0b3e229deafb2740322d7560b3 (diff) | |
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 'unotools')
| -rw-r--r-- | unotools/source/config/fontcfg.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 3edd9b41a5fe..a2859339d705 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -225,8 +225,7 @@ OUString DefaultFontConfiguration::getDefaultFont( const LanguageTag& rLanguageT } else { - ::std::vector< OUString > aFallbacks( rLanguageTag.getFallbackStrings()); - aFallbacks.erase( aFallbacks.begin()); // first is full BCP47, we already checked that + ::std::vector< OUString > aFallbacks( rLanguageTag.getFallbackStrings( false)); for (::std::vector< OUString >::const_iterator it( aFallbacks.begin()); it != aFallbacks.end() && aRet.isEmpty(); ++it) { @@ -1147,7 +1146,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const OUString& rFontN if( aLanguageTag.isSystemLocale() ) aLanguageTag = SvtSysLocale().GetUILanguageTag(); - ::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings()); + ::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings( true)); if (aLanguageTag.getLanguage() != "en") aFallbacks.push_back("en"); |