summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2012-11-13 16:30:07 +0000
committerEike Rathke <erack@redhat.com>2012-11-14 14:55:34 +0000
commit4e57d13eca14fb4b0dd2c5a27eba1647b207b0d2 (patch)
tree3505c878ddbc8c189df0d60e53e52baf3ea56156
parentb25a6c815beb5c9bb7f3205b4841186fbd0b425c (diff)
don't always show integer part for fraction formats with hard denom fdo#56205
fixes bug when you have a fraction format with a forced denominator e.g. '?/5' which showed the integer part of the fraction ( as if the format was '# ?/5' ) but even without the space e.g. before fix pi 3.14159265358979 with format '?/8' would be shown as "31/8" after the fix 3.14159265358979 with format '?/8' would be shown as "25/8" Change-Id: I1feb8b78af94b90db1bcc30da248077243dd8dfc Reviewed-on: https://gerrit.libreoffice.org/1047 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/1064
-rw-r--r--svl/source/numbers/zforscan.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 069d2d3941e9..1124fc536614 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1605,7 +1605,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
nCounter = nCntPost;
else if (nCntPre)
nCounter = nCntPre;
- if (!nCntPre)
+ // don't artificially increment nCntPre
+ // for forced denominator
+ if ( ( eScannedType != NUMBERFORMAT_FRACTION ) && (!nCntPre) )
nCntPre++;
}
}