test/source/bootstrapfixture.cxx | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 715957c39a8e12a24dd592f55565be62da78c450
Author: Eike Rathke <er...@redhat.com>
Date: Sat Nov 17 01:16:00 2012 +0100
we really don't need lang-conversion here
Change-Id: I1f72ca29b2f5b286bfae906dc3ee16581a2b1c36
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index a5ce0f0..e52ee2c 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -32,7 +32,6 @@
#include <rtl/bootstrap.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <comphelper/processfactory.hxx>
-#include <i18npool/mslangid.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XComponent.hpp>
@@ -71,15 +70,12 @@ void test::BootstrapFixture::setUp()
test::BootstrapFixtureBase::setUp();
// force locale (and resource files loaded) to en-US
- const LanguageType eLang=LANGUAGE_ENGLISH_US;
- OUString aLang, aCountry;
- MsLangId::convertLanguageToIsoNames(eLang, aLang, aCountry);
- lang::Locale aLocale(aLang, aCountry, OUString());
+ lang::Locale aLocale( "en", "US", "");
ResMgr::SetDefaultLocale( aLocale );
SvtSysLocaleOptions aLocalOptions;
- OUString aLangISO = MsLangId::convertLanguageToIsoString(
LANGUAGE_ENGLISH_US );
+ OUString aLangISO( "en-US" );
aLocalOptions.SetLocaleConfigString( aLangISO );
aLocalOptions.SetUILocaleConfigString( aLangISO );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
