diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-01 09:33:19 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-14 13:20:14 +0000 |
| commit | 77fd448d0990adc79406e13a127b2b1834984b71 (patch) | |
| tree | 3b8d1b23e7029dedcb97eb1d38ba83c91dfdac51 /pyuno/source/module/pyuno_type.cxx | |
| parent | 5502501a8848c771aff5a77448a02451e22398a4 (diff) | |
Removed several useless macros: UNISTRING, USTR, USTR_ASCII, ASCII_STR, ASCII_STRING, CONST_ASCII, ASCSTR, ASCII, DEFINE_CONST_UNICODE, DEFINE_CONST_OUSTRING
Change-Id: I96d690bf9f9b319e9eeafcf218ec5ce87f21215f
Reviewed-on: https://gerrit.libreoffice.org/1954
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'pyuno/source/module/pyuno_type.cxx')
| -rw-r--r-- | pyuno/source/module/pyuno_type.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx index d30e07dd0f83..d03368ab136f 100644 --- a/pyuno/source/module/pyuno_type.cxx +++ b/pyuno/source/module/pyuno_type.cxx @@ -37,7 +37,6 @@ using com::sun::star::uno::XInterface; using com::sun::star::uno::Reference; using com::sun::star::uno::TypeDescription; -#define USTR_ASCII(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) namespace pyuno { const char *typeClassToString( TypeClass t ) @@ -142,14 +141,14 @@ sal_Unicode PyChar2Unicode( PyObject *obj ) throw ( RuntimeException ) if( ! PyUnicode_Check( value.get() ) ) { throw RuntimeException( - USTR_ASCII( "attribute value of uno.Char is not a unicode string" ), + "attribute value of uno.Char is not a unicode string", Reference< XInterface > () ); } if( PyUnicode_GetSize( value.get() ) < 1 ) { throw RuntimeException( - USTR_ASCII( "uno.Char contains an empty unicode string" ), + "uno.Char contains an empty unicode string", Reference< XInterface > () ); } @@ -165,7 +164,7 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException ) if( !PyStr_Check( typeName.get() ) || ! PyStr_Check( value.get() ) ) { throw RuntimeException( - USTR_ASCII( "attributes typeName and/or value of uno.Enum are not strings" ), + "attributes typeName and/or value of uno.Enum are not strings", Reference< XInterface > () ); } @@ -221,7 +220,7 @@ Type PyType2Type( PyObject * o ) throw(RuntimeException ) if( !PyStr_Check( pyName.get() ) ) { throw RuntimeException( - USTR_ASCII( "type object does not have typeName property" ), + "type object does not have typeName property", Reference< XInterface > () ); } |