[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - basic/source

[Andras Timar]

 basic/source/runtime/methods1.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bf6064e69f1903f0d7682965b59fb5a0acb0af2
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Jan 16 17:00:06 2014 +0100

    Environment variables can contain >127 characters
    
    Change-Id: Iaeb690429d835ab2e6c13a8890a1b27b9405796a
    Reviewed-on: https://gerrit.libreoffice.org/7476
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 78ac359..43384ae 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1326,7 +1326,7 @@ RTLFUNC(Environ)
     const char* pEnvStr = getenv(aByteStr.getStr());
     if ( pEnvStr )
     {
-        aResult = OUString::createFromAscii( pEnvStr );
+        aResult = OUString(pEnvStr, strlen(pEnvStr), osl_getThreadTextEncoding());
     }
     rPar.Get(0)->PutString( aResult );
 }