summaryrefslogtreecommitdiff
path: root/include/uno
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-05-06 16:32:22 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-05-06 16:51:45 +0200
commite2e2cc61144cb22227eebfadff0ea24b51ccfbd0 (patch)
tree8063275cabcdf32e30c37451a32d96db5929561a /include/uno
parentd01768c31a0658c8a74e0dd3a95b2d781639d18e (diff)
remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done by compiler plugin. Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
Diffstat (limited to 'include/uno')
-rw-r--r--include/uno/current_context.hxx6
-rw-r--r--include/uno/environment.hxx2
-rw-r--r--include/uno/mapping.hxx8
3 files changed, 8 insertions, 8 deletions
diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx
index 5812db74700c..dbade9c04cca 100644
--- a/include/uno/current_context.hxx
+++ b/include/uno/current_context.hxx
@@ -44,7 +44,7 @@ inline Reference< XCurrentContext > SAL_CALL getCurrentContext()
SAL_THROW(())
{
Reference< XCurrentContext > xRet;
- ::rtl::OUString aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
+ ::rtl::OUString aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
::uno_getCurrentContext( (void **)&xRet, aEnvTypeName.pData, 0 );
return xRet;
}
@@ -57,7 +57,7 @@ inline bool SAL_CALL setCurrentContext(
Reference< XCurrentContext > const & xContext )
SAL_THROW(())
{
- ::rtl::OUString aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
+ ::rtl::OUString aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
return (::uno_setCurrentContext( xContext.get(), aEnvTypeName.pData, 0 ) != sal_False);
}
@@ -97,7 +97,7 @@ public:
//__________________________________________________________________________________________________
inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewContext )
SAL_THROW(())
- : m_aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) )
+ : m_aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME )
{
::uno_getCurrentContext( (void **)&m_xPreviousContext, m_aEnvTypeName.pData, 0 );
::uno_setCurrentContext( xNewContext.get(), m_aEnvTypeName.pData, 0 );
diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx
index 5fd8633c6e9f..272a069d331f 100644
--- a/include/uno/environment.hxx
+++ b/include/uno/environment.hxx
@@ -55,7 +55,7 @@ public:
respectively to current C++ Environment.
@since UDK 3.2.7
*/
- inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))) SAL_THROW(());
+ inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(CPPU_STRINGIFY(CPPU_ENV))) SAL_THROW(());
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index 13a042833ad6..f4340b58df9b 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -305,8 +305,8 @@ template< class C >
inline sal_Bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_THROW(())
{
Mapping aMapping(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) );
+ ::rtl::OUString( UNO_LB_UNO ),
+ ::rtl::OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) );
OSL_ASSERT( aMapping.is() );
aMapping.mapInterface(
(void **)ppRet, pUnoI, ::cppu::getTypeFavourUnsigned( ppRet ) );
@@ -328,8 +328,8 @@ template< class C >
inline sal_Bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x ) SAL_THROW(())
{
Mapping aMapping(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ) );
+ ::rtl::OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ),
+ ::rtl::OUString( UNO_LB_UNO ) );
OSL_ASSERT( aMapping.is() );
aMapping.mapInterface(
(void **)ppRet, x.get(), ::cppu::getTypeFavourUnsigned( &x ) );