[Libreoffice-commits] core.git: svl/source

[Libreoffice Gerrit user]

 svl/source/numbers/zformat.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 195c1cfb16a9513e496c2bc2179c282344df9926
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Mon Aug 20 20:33:07 2018 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Tue Aug 21 10:22:25 2018 +0200

    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 at redhat.com>

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