diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:36:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:36 +0100 |
| commit | 92924b152e8417fd3dd52fb4666176678424f9c7 (patch) | |
| tree | 55755f207ea382b2423827c934a95885d0c67760 /include/tools | |
| parent | 44199e81a1ef4e8712883f8bd191ef239335e06c (diff) | |
tools: Use appropriate OUString functions on string constants
Change-Id: If79786d21b6d7cb0cb0ec9b947f43e76aa7547e3
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/diagnose_ex.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h index 90683f00d40a..55cfe16a4f19 100644 --- a/include/tools/diagnose_ex.h +++ b/include/tools/diagnose_ex.h @@ -61,15 +61,15 @@ #define ENSURE_ARG_OR_THROW(c, m) if( !(c) ) { \ OSL_ENSURE(c, m); \ throw ::com::sun::star::lang::IllegalArgumentException( \ - OUString(BOOST_CURRENT_FUNCTION) + \ - OUString( ",\n" m ), \ + OUStringLiteral(BOOST_CURRENT_FUNCTION) \ + + ",\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( \ - OUString(BOOST_CURRENT_FUNCTION) + \ - OUString( ",\n" m ), \ + OUStringLiteral(BOOST_CURRENT_FUNCTION) \ + + ",\n" m, \ ifc, \ arg ); } @@ -80,16 +80,14 @@ if( !(c) ){ \ OSL_ENSURE(c, m); \ throw ::com::sun::star::uno::RuntimeException( \ - OUString(BOOST_CURRENT_FUNCTION) + \ - OUString( ",\n" m ), \ + OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\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( \ - OUString(BOOST_CURRENT_FUNCTION) + \ - OUString( ",\n" m ), \ + OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\n" m, \ ifc ); } /** This macro asserts the given condition (in debug mode), and |