[Libreoffice-commits] .: tools/inc

Caolán McNamara caolan at kemper.freedesktop.org
Fri Nov 19 02:12:27 PST 2010


 tools/inc/tools/diagnose_ex.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8a11d28a08dd8d3ed928840142697d1b5d0ccac6
Author: Kevin Hunter <hunteke at earlham.edu>
Date:   Thu Nov 18 17:43:40 2010 -0500

    EasyHack: RTL_CONST macro from createFromAscii

diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h
index e208840..8798d72 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/tools/inc/tools/diagnose_ex.h
@@ -91,14 +91,14 @@
                                      OSL_ENSURE(c, m); \
                                      throw ::com::sun::star::lang::IllegalArgumentException( \
                                      ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                     ::rtl::OUString::createFromAscii(",\n"m), \
+                                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \
                                      ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \
                                      0 ); }
 #define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \
                                                OSL_ENSURE(c, m); \
                                                throw ::com::sun::star::lang::IllegalArgumentException( \
                                                ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                               ::rtl::OUString::createFromAscii(",\n"m), \
+                                               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \
                                                ifc, \
                                                arg ); }
 
@@ -109,13 +109,13 @@
                                      OSL_ENSURE(c, m); \
                                      throw ::com::sun::star::uno::RuntimeException( \
                                      ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                     ::rtl::OUString::createFromAscii(",\n"m), \
+                                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \
                                      ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); }
 #define ENSURE_OR_THROW2(c, m, ifc) if( !(c) ) { \
                                           OSL_ENSURE(c, m); \
                                           throw ::com::sun::star::uno::RuntimeException( \
                                           ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                          ::rtl::OUString::createFromAscii(",\n"m), \
+                                          ::rtl::OUString::( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \
                                           ifc ); }
 
 /** This macro asserts the given condition (in debug mode), and


More information about the Libreoffice-commits mailing list