[Libreoffice-commits] .: basic/source

[Libreoffice Gerrit user]

 basic/source/runtime/dllmgr-x86.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7aa973919d49cce56cf3f3abbba5253c15d975a2
Author: Tor Lillqvist <tlillqv...@suse.com>
Date:   Wed Nov 7 11:41:32 2012 +0200

    Fix String -> OUString fallout
    
    Change-Id: I038848aed0c64c39ca93da89b4a78bd3a1f6d7d0

diff --git a/basic/source/runtime/dllmgr-x86.cxx 
b/basic/source/runtime/dllmgr-x86.cxx
index db583fa..1e6bec3 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -193,7 +193,7 @@ SbError marshalString(
 {
     OSL_ASSERT(variable != 0 && buffer != 0);
     rtl::OString str;
-    SbError e = convert(variable->GetString(), &str);
+    SbError e = convert(variable->GetOUString(), &str);
     if (e != ERRCODE_NONE) {
         return e;
     }
@@ -463,7 +463,7 @@ SbError unmarshalString(StringData const & data, 
SbxVariable & result) {
             return e;
         }
     }
-    data.variable->PutString(String(str));
+    data.variable->PutString(str);
     return ERRCODE_NONE;
 }
 
@@ -528,7 +528,7 @@ SbError call(
             if (e != ERRCODE_NONE) {
                 return e;
             }
-            result.PutString(String(s2));
+            result.PutString(s2);
             break;
         }
     case SbxOBJECT:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits