diff options
Diffstat (limited to 'svl/source/numbers/zforfind.cxx')
| -rw-r--r-- | svl/source/numbers/zforfind.cxx | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index f0b08b5a903d..77832ea3024a 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -3222,7 +3222,16 @@ bool ImpSvNumberInputScan::IsNumberFormatMain( const OUString& rString, / } if ( nMatchedAllStrings ) { - eScannedType = eSetType; + // A type DEFINED means that no category could be assigned to the + // overall format because of mixed type subformats. Use the scan + // matched subformat's type if any. + short eForType = eSetType; + if ((eForType == css::util::NumberFormat::UNDEFINED || eForType == css::util::NumberFormat::DEFINED) && pFormat) + eForType = pFormat->GetNumForInfoScannedType( nStringScanNumFor); + if (eForType != css::util::NumberFormat::UNDEFINED && eForType != css::util::NumberFormat::DEFINED) + eScannedType = eForType; + else + eScannedType = css::util::NumberFormat::NUMBER; } else if ( bDidMatch ) { @@ -3250,7 +3259,15 @@ bool ImpSvNumberInputScan::IsNumberFormatMain( const OUString& rString, / } if ( nMatchedAllStrings ) { - eScannedType = eSetType; + // A type DEFINED means that no category could be assigned to the + // overall format because of mixed type subformats. Do not override + // the scanned type in this case. Otherwise in IsNumberFormat() the + // first numeric particle would be accepted as number. + short eForType = eSetType; + if ((eForType == css::util::NumberFormat::UNDEFINED || eForType == css::util::NumberFormat::DEFINED) && pFormat) + eForType = pFormat->GetNumForInfoScannedType( nStringScanNumFor); + if (eForType != css::util::NumberFormat::UNDEFINED && eForType != css::util::NumberFormat::DEFINED) + eScannedType = eForType; } else if ( bWasReturn ) { |