diff options
author | Eike Rathke <erack@redhat.com> | 2018-08-20 20:33:07 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2018-08-21 10:22:25 +0200 |
commit | 195c1cfb16a9513e496c2bc2179c282344df9926 (patch) | |
tree | d3a768d7655ad1f7bc7918243e907355902a9013 | |
parent | be806964a1053299896b1a8f8ab51b3e3f02d460 (diff) |
No LCID if no format code, tdf#73063 prep
Current code inserts LCID only if there is a calendar or locale
specific numerals given, prepare for more general handling.
Change-Id: I61f89263c47b7aeed58803656f58543def5f4f2f
Reviewed-on: https://gerrit.libreoffice.org/59345
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
-rw-r--r-- | svl/source/numbers/zformat.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index e682b63cb161..6a2d351692a8 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -5016,6 +5016,10 @@ void lcl_insertLCID( OUStringBuffer& rFormatStr, sal_uInt32 nLCID, sal_Int32 nPo { if ( nLCID == 0 ) return; + if (nPosInsertLCID == rFormatStr.getLength() && !bDBNumInserted) + // No format code, no locale. + return; + OUStringBuffer aLCIDString = OUString::number( nLCID , 16 ).toAsciiUpperCase(); // Search for only last DBNum which is the last element before insertion position if ( bDBNumInserted && nPosInsertLCID >= 8 |