[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source

[Siqi Liu]

 sw/source/uibase/wrtsh/wrtsh2.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 7ef570780a4ebb07e128681a96c35d6268c5e658
Author: Siqi Liu <m...@siqi.fr>
Date:   Mon Mar 9 12:51:54 2015 +0100

    use toUtf8 instead for string conversion
    
    Change-Id: I1ec96957fba161a35ec2cf44f197ed3d7199dd89

diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx 
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 01fab7a..4b26692 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -472,10 +472,8 @@ void LoadURL( SwViewShell& rVSh, const OUString& rURL, 
sal_uInt16 nFilter,
         return;
 
     // We are doing tiledRendering, let the client handles the URL loading.
-    if (rVSh.isTiledRendering())
-    {
-        rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
-                OUStringToOString(rURL, RTL_TEXTENCODING_UTF8).getStr());
+    if (rVSh.isTiledRendering()) {
+        rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED, 
rURL.toUtf8().getStr());
         return;
     }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits