[Libreoffice-commits] .: sc/inc sc/qa
Markus Mohrhard
mmohrhard at kemper.freedesktop.org
Tue Oct 18 17:11:37 PDT 2011
sc/inc/document.hxx | 2 +-
sc/qa/unit/filters-test.cxx | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 9706288e95cfdbecdfc2cab3a66a2cce07ac23b4
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Wed Oct 19 01:52:58 2011 +0200
add output for language settings to log file
some windows builds crash in this test, maybe they get a false language
setting from somewhere
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5648a54..a7ae1c3 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -447,7 +447,7 @@ public:
ScExtDocOptions* GetExtDocOptions() { return pExtDocOptions; }
SC_DLLPUBLIC void SetExtDocOptions( ScExtDocOptions* pNewOptions );
- void GetLanguage( LanguageType& rLatin, LanguageType& rCjk, LanguageType& rCtl ) const;
+ SC_DLLPUBLIC void GetLanguage( LanguageType& rLatin, LanguageType& rCjk, LanguageType& rCtl ) const;
void SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageType eCtl );
void SetDrawDefaults();
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 68885a5..939109e 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -475,6 +475,13 @@ void ScFiltersTest::testFormats()
CPPUNIT_ASSERT_MESSAGE("Failed to load formats.*", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
+ //output this just for debugging, should make it easier to see which local the numberformatter really used
+ //it helps to understand why some windows build fails in this test
+ LanguageType aLang, aCjkLang, aCtlLang;
+ pDoc->GetLanguage(aLang, aCjkLang, aCtlLang);
+ std::cout << "Language Settings in ScDocument: normal: " << aLang << " Cjk: " << aCjkLang << " Ctl: " << aCtlLang << std::endl;
+ std::cout << "Language for NumberFormatter: " << pDoc->GetFormatTable()->GetLanguage() << std::endl;
+
//test Sheet1 with csv file
rtl::OUString aCSVFileName;
createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("numberFormat.")), aCSVFileName);
More information about the Libreoffice-commits
mailing list