commit 63c58944749de8f44dac979eb4e044e2c08120a8 Author: serval Date: Tue Dec 21 22:28:50 2010 +0100 RTL_CONSTASCII_USTRINGPARAM diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index af78449..2ead973 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.hxx @@ -41,8 +41,6 @@ class SvStream; /////////////////////////////////////////////////////////////////////////// -#define A2OU(x) ::rtl::OUString::createFromAscii( x ) - typedef boost::shared_ptr< SvStream > SvStreamPtr; namespace css = ::com::sun::star; diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 4e57cb2..eba4624 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -53,7 +53,7 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; -#define A2OU(x) ::rtl::OUString::createFromAscii( x ) +#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) /////////////////////////////////////////////////////////////////////////// @@ -70,7 +70,7 @@ PropertyChgHelper::PropertyChgHelper( OUString *pName = aPropNames.getArray(); for (INT32 i = 0; i < nPropCount; ++i) { - pName[i] = A2OU( pPropNames[i] ); + pName[i] = ::rtl::OUString::createFromAscii( pPropNames[i] ); } } diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index 6ad7fe6..ae6655e 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/linguistic/workben/sspellimp.hxx @@ -52,9 +52,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; - -#define A2OU(x) ::rtl::OUString::createFromAscii( x ) - /////////////////////////////////////////////////////////////////////////// @@ -168,7 +165,7 @@ public: inline OUString SpellChecker::getImplementationName_Static() throw() { - return A2OU( "com.sun.star.lingu.examples.SpellChecker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.lingu.examples.SpellChecker" )); } diff --git a/scripting/source/inc/util/util.hxx b/scripting/source/inc/util/util.hxx index 442c965..fb3bcb0 100644 --- a/scripting/source/inc/util/util.hxx +++ b/scripting/source/inc/util/util.hxx @@ -33,7 +33,7 @@ #include #include -#define OUSTR(x) ::rtl::OUString( ::rtl::OUString::createFromAscii(x) ) +#define OUSTR(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x) ) namespace scripting_util { @@ -43,7 +43,7 @@ namespace scripting_util if(!xRef.is()) { - throw ::com::sun::star::uno::RuntimeException(OUSTR(Msg), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >()); + throw ::com::sun::star::uno::RuntimeException(::rtl::OUString::createFromAscii(Msg), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >()); } } }