summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorLaurent Balland-Poirier <laurent.balland-poirier@laposte.net>2016-04-30 21:44:29 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-05-25 15:42:29 +0000
commitf3de0caba189ff7d17a2f37495147673e68c2e7f (patch)
tree5fe0de4f9a4ca05f805df4bddbe17e693c4c383a /svl
parent700a6c6360c1c83433545d472511c48ac355a1d2 (diff)
tdf#31449 Correctly test if fraction has no integer part
Test if fraction format has no integer part is modified to take into account all cases: ??/?? or ##/## and do not detect false positive like ? ??/?? Change-Id: Ia8677a5ad496e5df56ce6bf1290323555e46ba0a Reviewed-on: https://gerrit.libreoffice.org/24540 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 3beb146b34fa931e2d63f4738a3ae69fe286545f) Reviewed-on: https://gerrit.libreoffice.org/25452 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svl')
-rw-r--r--svl/source/numbers/zformat.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 3b6384ec3e81..c9f08ad20837 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -5126,6 +5126,16 @@ sal_Int32 SvNumberformat::GetQuoteEnd( const OUString& rStr, sal_Int32 nPos,
return nLen; // End of String
}
+sal_uInt16 SvNumberformat::GetNumForNumberElementCount( sal_uInt16 nNumFor ) const
+{
+ if ( nNumFor < 4 )
+ {
+ sal_uInt16 nAnz = NumFor[nNumFor].GetCount();
+ return nAnz - ImpGetNumForStringElementCount( nNumFor );
+ }
+ return 0;
+}
+
sal_uInt16 SvNumberformat::ImpGetNumForStringElementCount( sal_uInt16 nNumFor ) const
{
sal_uInt16 nCnt = 0;