Kaydet (Commit) 92924b15 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

tools: Use appropriate OUString functions on string constants

Change-Id: If79786d21b6d7cb0cb0ec9b947f43e76aa7547e3
üst 44199e81
...@@ -61,15 +61,15 @@ ...@@ -61,15 +61,15 @@
#define ENSURE_ARG_OR_THROW(c, m) if( !(c) ) { \ #define ENSURE_ARG_OR_THROW(c, m) if( !(c) ) { \
OSL_ENSURE(c, m); \ OSL_ENSURE(c, m); \
throw ::com::sun::star::lang::IllegalArgumentException( \ throw ::com::sun::star::lang::IllegalArgumentException( \
OUString(BOOST_CURRENT_FUNCTION) + \ OUStringLiteral(BOOST_CURRENT_FUNCTION) \
OUString( ",\n" m ), \ + ",\n" m, \
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \
0 ); } 0 ); }
#define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \ #define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \
OSL_ENSURE(c, m); \ OSL_ENSURE(c, m); \
throw ::com::sun::star::lang::IllegalArgumentException( \ throw ::com::sun::star::lang::IllegalArgumentException( \
OUString(BOOST_CURRENT_FUNCTION) + \ OUStringLiteral(BOOST_CURRENT_FUNCTION) \
OUString( ",\n" m ), \ + ",\n" m, \
ifc, \ ifc, \
arg ); } arg ); }
...@@ -80,16 +80,14 @@ ...@@ -80,16 +80,14 @@
if( !(c) ){ \ if( !(c) ){ \
OSL_ENSURE(c, m); \ OSL_ENSURE(c, m); \
throw ::com::sun::star::uno::RuntimeException( \ throw ::com::sun::star::uno::RuntimeException( \
OUString(BOOST_CURRENT_FUNCTION) + \ OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\n" m, \
OUString( ",\n" m ), \
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); } ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); }
#define ENSURE_OR_THROW2(c, m, ifc) \ #define ENSURE_OR_THROW2(c, m, ifc) \
if( !(c) ) { \ if( !(c) ) { \
OSL_ENSURE(c, m); \ OSL_ENSURE(c, m); \
throw ::com::sun::star::uno::RuntimeException( \ throw ::com::sun::star::uno::RuntimeException( \
OUString(BOOST_CURRENT_FUNCTION) + \ OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\n" m, \
OUString( ",\n" m ), \
ifc ); } ifc ); }
/** This macro asserts the given condition (in debug mode), and /** This macro asserts the given condition (in debug mode), and
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment