diff options
Diffstat (limited to 'svl/source/numbers/zforfind.hxx')
| -rw-r--r-- | svl/source/numbers/zforfind.hxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx index e7ddb7e6f1d9..17b14edb4c2d 100644 --- a/svl/source/numbers/zforfind.hxx +++ b/svl/source/numbers/zforfind.hxx @@ -70,7 +70,6 @@ public: private: SvNumberFormatter* pFormatter; - const SvNumberformat* mpFormat; //* The format to compare against, if any std::unique_ptr<OUString[]> pUpperMonthText; //* Array of month names, uppercase std::unique_ptr<OUString[]> pUpperAbbrevMonthText; //* Array of month names, abbreviated, uppercase std::unique_ptr<OUString[]> pUpperGenitiveMonthText; //* Array of genitive month names, uppercase @@ -284,7 +283,8 @@ private: // Get currency symbol and advance string position bool GetCurrency( const OUString& rString, - sal_Int32& nPos ); + sal_Int32& nPos, + const SvNumberformat* pFormat ); // number format to match against // Get symbol AM or PM and advance string position bool GetTimeAmPm( const OUString& rString, @@ -324,23 +324,28 @@ private: // Conversion of date to number bool GetDateRef( double& fDays, // OUT: days diff to null date - sal_uInt16& nCounter ); // Count of date substrings + sal_uInt16& nCounter, // Count of date substrings + const SvNumberformat* pFormat ); // number format to match against // Analyze start of string - bool ScanStartString( const OUString& rString ); + bool ScanStartString( const OUString& rString, + const SvNumberformat* pFormat ); // Analyze middle substring bool ScanMidString( const OUString& rString, - sal_uInt16 nStringPos ); + sal_uInt16 nStringPos, + const SvNumberformat* pFormat ); // Analyze end of string - bool ScanEndString( const OUString& rString ); + bool ScanEndString( const OUString& rString, + const SvNumberformat* pFormat ); // Compare rString to substring of array indexed by nString // nString == 0xFFFF => last substring bool ScanStringNumFor( const OUString& rString, sal_Int32 nPos, + const SvNumberformat* pFormat, sal_uInt16 nString, bool bDontDetectNegation = false ); @@ -415,7 +420,7 @@ private: /** Whether input is acceptable as ISO 8601 date format in the current NfEvalDateFormat setting. */ - bool IsAcceptableIso8601(); + bool IsAcceptableIso8601( const SvNumberformat* pFormat ); }; #endif // INCLUDED_SVL_SOURCE_NUMBERS_ZFORFIND_HXX |