summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-05-02 22:10:05 +0200
committerEike Rathke <erack@redhat.com>2018-05-02 22:17:08 +0200
commitdfb9138b8b5a239b46f189a717999bcaff19aa79 (patch)
treed5636eb9d12c22aa1866c185491eb174198c2267 /include/svl
parent04e564b8179cdfafc0f33233daae126e39f46e47 (diff)
Resolves: tdf#116579 consider both work locale and format locale date patterns
If a format was set its locale's date acceptance patterns overwrote the work locale's patterns for the current input. Take both into account, with precedence depending on the NfEvalDateFormat set at SvNumberFormatter. Change-Id: Ie6e837447610d71eb9b8227e602d13d414cad612
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/zforlist.hxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 536d6bdf1645..14aaf6a40940 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -882,6 +882,10 @@ public:
/** Access for unit tests. */
size_t GetMaxDefaultColors() const;
+ struct InputScannerPrivateAccess { friend class ImpSvNumberInputScan; private: InputScannerPrivateAccess() {} };
+ /** Access for input scanner to temporarily (!) switch locales. */
+ OnDemandLocaleDataWrapper& GetOnDemandLocaleDataWrapper( const InputScannerPrivateAccess& ) { return xLocaleData; }
+
private:
mutable ::osl::Mutex m_aMutex;
css::uno::Reference< css::uno::XComponentContext > m_xContext;