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

[Eike Rathke (via logerrit)]

 basic/source/sbx/sbxscan.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e89404f00b25cfddd4098b4b2cf900d190617221
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Wed Aug 11 01:16:16 2021 +0200
Commit:     Eike Rathke <er...@redhat.com>
CommitDate: Wed Aug 11 02:34:36 2021 +0200

    There is no LANGUAGE_ENGLISH {en} locale but LANGUAGE_ENGLISH_US {en-US}
    
    The known fallback locale is en-US so this worked by chance..
    
    Change-Id: I81ee2aff0cc35b4c8d501dfb6846f0709f1417ef
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120301
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Jenkins

diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index a632a689a42f..08f43ab475fa 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -720,7 +720,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt 
) const
                 else
                 {
                     aFmtStr = OUString::createFromAscii(pInfo->mpOOoFormat);
-                    pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH, eLangType, true);
+                    pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH_US, eLangType, true);
                 }
                 pFormatter->GetOutputString( nNumber, nIndex, rRes, &pCol );
             }
@@ -737,7 +737,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt 
) const
                     if( floor( nNumber ) != nNumber )
                     {
                         aFmtStr = "H:MM:SS AM/PM";
-                        pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, 
nType, nIndex, LANGUAGE_ENGLISH, eLangType, true);
+                        pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, 
nType, nIndex, LANGUAGE_ENGLISH_US, eLangType, true);
                         OUString aTime;
                         pFormatter->GetOutputString( nNumber, nIndex, aTime, 
&pCol );
                         rRes += " " + aTime;
@@ -747,7 +747,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt 
) const
                 {
                     // long time only
                     aFmtStr = "H:MM:SS AM/PM";
-                    pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH, eLangType, true);
+                    pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH_US, eLangType, true);
                     pFormatter->GetOutputString( nNumber, nIndex, rRes, &pCol 
);
                 }
             }
@@ -783,7 +783,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt 
) const
             }
             else
             {
-                pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH, eLangType, true);
+                pFormatter->PutandConvertEntry( aFmtStr, nCheckPos, nType, 
nIndex, LANGUAGE_ENGLISH_US, eLangType, true);
                 pFormatter->GetOutputString( nNumber, nIndex, rRes, &pCol );
             }