summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-04-11 17:03:58 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-04-11 17:05:20 +0100
commite6e4474aae78cb5ab76a4d80642e32c02afd5133 (patch)
tree43683a8de3924a97dc9c72ffd70abcc6361b1f13
parent1808330a85329a739dbd9196aeb3e10a06521f64 (diff)
set what system locale should resolve to for languagetag
normally this happens in desktop/source/app/langselect.cxx for the fat app case Change-Id: I4772172aa6f071ac03d74e2abe7a9e197f0dc964
-rw-r--r--test/source/bootstrapfixture.cxx4
-rw-r--r--test/source/sheet/xsheetannotation.cxx2
2 files changed, 5 insertions, 1 deletions
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index dc7c7b0121f6..c76995af4af8 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/ucb/XUniversalContentBroker.hpp>
+#include <i18nlangtag/mslangid.hxx>
#include <vcl/svapp.hxx>
#include <tools/resmgr.hxx>
#include <vcl/graphicfilter.hxx>
@@ -64,6 +65,9 @@ void test_init_impl(bool bAssertOnDialog, bool bNeedUCB,
aLocalOptions.SetLocaleConfigString( aLangISO );
aLocalOptions.SetUILocaleConfigString( aLangISO );
+ MsLangId::setConfiguredSystemUILanguage(LANGUAGE_ENGLISH_US);
+ LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US);
+
InitVCL();
if (Application::IsHeadlessModeRequested())
Application::EnableHeadlessMode(true);
diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx
index 3a24c31d36dd..e59f94a224e1 100644
--- a/test/source/sheet/xsheetannotation.cxx
+++ b/test/source/sheet/xsheetannotation.cxx
@@ -47,7 +47,7 @@ void XSheetAnnotation::testGetDate()
uno::Reference< sheet::XSheetAnnotation > aSheetAnnotation (init(), UNO_QUERY_THROW);
OUString aDate = aSheetAnnotation->getDate();
- CPPUNIT_ASSERT_MESSAGE("Wrong date", aDate.equals("01/17/13"));
+ CPPUNIT_ASSERT_MESSAGE("Wrong date", aDate.equals("01/17/2013"));
}
void XSheetAnnotation::testGetIsVisible()
{