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 /vcl | |
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 'vcl')
-rw-r--r-- | vcl/source/app/brand.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/impimagetree.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index 0cf0a92d89f2..3304c86d2685 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -60,7 +60,7 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap) osl_getProcessLocale (&pLoc); LanguageTag aLanguageTag( *pLoc); - ::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings()); + ::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings( true)); for (size_t i=0; i < aFallbacks.size(); ++i) { if (tryLoadPng( aBaseDir, aBaseName + "-" + aFallbacks[i] + aPng, rBitmap)) diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index cc32190a6594..4d549f04e92e 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -197,7 +197,7 @@ bool ImplImageTree::doLoadImage( sal_Int32 pos = name.lastIndexOf('/'); if (pos != -1) { // find() uses a reverse iterator, so push in reverse order. - std::vector< OUString > aFallbacks( Application::GetSettings().GetUILanguageTag().getFallbackStrings()); + std::vector< OUString > aFallbacks( Application::GetSettings().GetUILanguageTag().getFallbackStrings( true)); for (std::vector< OUString >::const_reverse_iterator it( aFallbacks.rbegin()); it != aFallbacks.rend(); ++it) { |