From 2fc41695d7b62ecb20ac9f28466745f90b094348 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Tue, 13 Nov 2012 14:23:01 +0100 Subject: resolved fdo#55369 accept fraction input if preset Accept fraction input without integer portion if the format was preset as fraction, e.g. 1/5 instead of 0 1/5 and don't force to date. (cherry picked from commit 5391bd1e54157457abe1098b29f067d6e0059113) Change-Id: I326ec85b163962425efa074119405ec1395af481 Reviewed-on: https://gerrit.libreoffice.org/1045 Reviewed-by: Petr Mladek Tested-by: Petr Mladek --- svl/source/numbers/zforfind.cxx | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'svl/source/numbers') diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index eae56daf0eb5..ef6015e409aa 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -2025,14 +2025,24 @@ bool ImpSvNumberInputScan::ScanMidString( const String& rString, { if ( eScannedType != NUMBERFORMAT_UNDEFINED // already another type && eScannedType != NUMBERFORMAT_DATE) // except date - return MatchedReturn(); // => jan/31/1994 - else if ( eScannedType != NUMBERFORMAT_DATE // analyzed date until now - && ( eSetType == NUMBERFORMAT_FRACTION // and preset was fraction - || (nAnzNums == 3 // or 3 numbers - && nStringPos > 2) ) ) // and what ??? + return MatchedReturn(); // => jan/31/1994 + else if (eScannedType != NUMBERFORMAT_DATE // analyzed no date until now + && ( eSetType == NUMBERFORMAT_FRACTION // and preset was fraction + || (nAnzNums == 3 // or 3 numbers + && (nStringPos == 3 // and 3rd string particle + || (nStringPos == 4 // or 4th + && nSign))))) // if signed { SkipBlanks(rString, nPos); - eScannedType = NUMBERFORMAT_FRACTION; // !!! it IS a fraction + if (nPos == rString.Len()) + { + eScannedType = NUMBERFORMAT_FRACTION; // !!! it IS a fraction (so far) + if (eSetType == NUMBERFORMAT_FRACTION + && nAnzNums == 2 + && (nStringPos == 1 // for 4/5 + || (nStringPos == 2 && nSign))) // or signed -4/5 + return true; // don't fall into date trap + } } else nPos--; // put '/' back -- cgit v1.2.3