odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f97b3e270736284e2b189508b808711ebe46b26
Author: Ariel Constenla-Haile <[email protected]>
Date:   Thu Jun 6 03:23:59 2013 +0000

    Fix breaker when compiled with DEBUG=yes
    
    (cherry picked from commit 07c6343beaea37e8e6254e0f988e19f1eccf38ce)
    
    Conflicts:
        
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
    
    Change-Id: I75278282efc80f3e9c31c413842392030beeb265

diff --git 
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
 
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index 5cfe660..321bcf0 100644
--- 
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ 
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -178,7 +178,7 @@ sal_Bool XFlatXml::importer(
     catch( Exception &exc)
     {
         // something went wrong
-        OSL_FAIL(exc.Message);
+        
OSL_FAIL(rtl::OUStringToOString(exc.Message,RTL_TEXTENCODING_UTF8).getStr());
         return sal_False;
     }
 
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to