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

[Luboš Luňák]

 tools/source/rc/resmgr.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 895f272ed9301ce41966a17a5c212c0e16925241
Author: Luboš Luňák <l.lu...@suse.cz>
Date:   Fri Feb 8 18:49:32 2013 +0100

    fix incorrect string conversion in 9e310cc32923ceb4b18d97ce68d54a339b935f01
    
    Change-Id: Ia1ddf969f876ce47b4195c60039b38f2a47f3470

diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 3a2a083..d161c65 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1240,7 +1240,8 @@ sal_uInt32 ResMgr::GetStringWithoutHook( OUString& rStr, 
const sal_uInt8* pStr )
 {
     sal_uInt32 nLen=0;
     sal_uInt32 nRet = GetStringSize( pStr, nLen );
-    OUString aString( (sal_Char*)pStr, RTL_TEXTENCODING_UTF8,
+    const sal_Char* str = reinterpret_cast< const sal_Char* >( pStr );
+    OUString aString( str, strlen( str ), RTL_TEXTENCODING_UTF8,
                        RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |
                        RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
                        RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits