diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-24 23:38:08 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-06-02 03:25:49 +0200 |
commit | b61642bb3ca4cddd38b496816c0003420c352f77 (patch) | |
tree | 34321b77fbeca825d26f77488558d5ebd9777ff4 /sc | |
parent | 57efd69c22e2c6f5cb4d057345644b6e07a62d48 (diff) |
don't set hard format for text formats
Gets rid of some test failures that are the result of dirty test
environments.
Change-Id: I45ed4bbe46c8aa598e074c3eac7903811cbb2620
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/formulacell.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 7108597f5f4c..d4a484625d13 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -1301,7 +1301,10 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) sal_uInt16 nFormatType = p->GetRetFormatType(); sal_Int32 nFormatIndex = p->GetRetFormatIndex(); - if((nFormatIndex % SV_COUNTRY_LANGUAGE_OFFSET) == 0) + // don't set text format as hard format + if(nFormatType == NUMBERFORMAT_TEXT) + nFormatIndex = 0; + else if((nFormatIndex % SV_COUNTRY_LANGUAGE_OFFSET) == 0) nFormatIndex = ScGlobal::GetStandardFormat(*pDocument->GetFormatTable(), nFormatIndex, nFormatType); |