[Libreoffice-commits] .: rsc/source

[Tor Lillqvist]

 rsc/source/parser/rscibas.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9da0b9d70d81f33fd45546ef5ad7b7aeda1fc3fa
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 23 12:15:34 2011 +0300

    Fix broken implicit string conversion

diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index b0114e2..d44567e 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -97,7 +97,6 @@ void RscLangEnum::Init( RscNameTable& rNames )
 
     sal_Int32 nIndex = 0;
     mnLangId = 0x400; // stay away from selfdefined...
-    char csep = '-';
     const MsLangId::IsoLangEntry* pLangEntry;
 
     while ( NULL != ( pLangEntry = MsLangId::getIsoLangEntry( nIndex )) && ( pLangEntry->mnLang != LANGUAGE_DONTKNOW ))
@@ -129,7 +128,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
             fprintf( stderr, "ISO Language out: %s 0x%lx", aLang.getStr(), mnLangId );
 #endif
             mnLangId++;
-            aLang = aLang + csep + aCountry.toAsciiUpperCase();
+            aLang = aLang + rtl::OString( '-' ) + aCountry.toAsciiUpperCase();
             SetConstant( rNames.Put( aLang.getStr(), CONSTNAME, mnLangId ), mnLangId );
             if ( ! GetLangId( aLang ))
                 ULong_Iso_map[ aLang ] = mnLangId;