summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-07-10 23:20:28 +0200
committerCaolán McNamara <caolanm@redhat.com>2015-07-13 11:50:54 +0000
commit9d23401109f93fcff37f35f708af7ec33e690ed4 (patch)
tree2320e8c22342818c014b80e1fe2bcd8777690ab9
parentbcf9f7c7e06ee97106b5a555a97599e6b0ed1c13 (diff)
the last condition is "all other numbers", not the third, tdf#92457 related
(cherry picked from commit b3c11e2b3ef4bad8c2b5f92ba00ac805fb68786f) So we'll properly strip the "value()&lt;=1.79769313486232E+308" condition that 5.1 will write. This will not enable the handling of the style, but at least it is fed correctly as intended to the number formatter. Change-Id: Ic9571d938c4a8837c5712bafbfb2ebf9f32011df Reviewed-on: https://gerrit.libreoffice.org/16988 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--xmloff/source/style/xmlnumfi.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index a422b2588d20..5b8ad3fed3fb 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -2129,10 +2129,10 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
if ( aConditions.isEmpty() && aMyConditions.size() == 1 && sRealCond == ">=0" )
bDefaultCond = true;
- if ( nType == XML_TOK_STYLES_TEXT_STYLE && nIndex == 2 )
+ if ( nType == XML_TOK_STYLES_TEXT_STYLE && static_cast<size_t>(nIndex) == aMyConditions.size() - 1 )
{
- // The third condition in a number format with a text part can only be
- // "all other numbers", the condition string must be empty.
+ // The last condition in a number format with a text part can only
+ // be "all other numbers", the condition string must be empty.
bDefaultCond = true;
}