[Libreoffice-commits] core.git: include/vcl

Andrzej Hunt andrzej.hunt at collabora.com
Wed Jul 30 04:33:34 PDT 2014


 include/vcl/ITiledRenderable.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 56bd29136ceb32250c0acdce798be47c8f7e7b12
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Wed Jul 30 13:30:07 2014 +0200

    Wrap "" in OUString: error: conversion from const char* to non-scalar...
    
    Full error:
         error: conversion from const char* to non-scalar type rtl::OUString requested
    
    This seems to be happening only where ITiledRenderable.hxx ends up being
    included in an Objective C file.

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index a57053e..f07ccd5 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -76,7 +76,7 @@ public:
     virtual OUString getPartName(int nPart)
     {
         (void) nPart;
-        return "";
+        return OUString("");
     }
 
     virtual void setPartMode(LibreOfficeKitPartMode ePartMode)


More information about the Libreoffice-commits mailing list