diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-30 11:44:23 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-30 12:54:40 +0000 |
| commit | 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53 (patch) | |
| tree | a1a95b8249052d846a997ad1729758168d6a3b24 /bridges/test | |
| parent | f8569cd9a28a3a8856dba4ad53218aa6cc073521 (diff) | |
Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'bridges/test')
| -rw-r--r-- | bridges/test/inter_libs_exc/inter.cxx | 8 | ||||
| -rw-r--r-- | bridges/test/inter_libs_exc/share.h | 2 | ||||
| -rw-r--r-- | bridges/test/inter_libs_exc/thrower.cxx | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/bridges/test/inter_libs_exc/inter.cxx b/bridges/test/inter_libs_exc/inter.cxx index fe60c8ccc50a..3c1190dabb4b 100644 --- a/bridges/test/inter_libs_exc/inter.cxx +++ b/bridges/test/inter_libs_exc/inter.cxx @@ -35,18 +35,18 @@ extern "C" int main( int argc, char const * argv [] ) #define SAL_DLLPREFIX "" #endif Module mod_starter( - OUSTR(SAL_DLLPREFIX "starter" SAL_DLLEXTENSION), + SAL_DLLPREFIX "starter" SAL_DLLEXTENSION, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); Module mod_thrower( - OUSTR(SAL_DLLPREFIX "thrower" SAL_DLLEXTENSION), + SAL_DLLPREFIX "thrower" SAL_DLLEXTENSION, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); typedef t_throws_exc (SAL_CALL * t_get_thrower)(); - t_get_thrower get_thrower = (t_get_thrower)mod_thrower.getSymbol( OUSTR("get_thrower") ); + t_get_thrower get_thrower = (t_get_thrower)mod_thrower.getSymbol( "get_thrower" ); t_throws_exc thrower = (*get_thrower)(); typedef void (SAL_CALL * t_starter)( t_throws_exc ); - t_starter start = (t_starter)mod_starter.getSymbol( OUSTR("start") ); + t_starter start = (t_starter)mod_starter.getSymbol( "start" ); (*start)( thrower ); diff --git a/bridges/test/inter_libs_exc/share.h b/bridges/test/inter_libs_exc/share.h index fffa41b5bf82..260883df0a04 100644 --- a/bridges/test/inter_libs_exc/share.h +++ b/bridges/test/inter_libs_exc/share.h @@ -20,8 +20,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/uno/DeploymentException.hpp> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - typedef void (SAL_CALL * t_throws_exc)(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/inter_libs_exc/thrower.cxx b/bridges/test/inter_libs_exc/thrower.cxx index 5f42f4a44892..de37e1d90a70 100644 --- a/bridges/test/inter_libs_exc/thrower.cxx +++ b/bridges/test/inter_libs_exc/thrower.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star::uno; static void SAL_CALL throws_exc() { throw lang::IllegalArgumentException( - OUSTR("bla"), Reference< XInterface >(), 0 ); + "bla", Reference< XInterface >(), 0 ); } extern "C" t_throws_exc SAL_CALL get_thrower() |