diff options
| -rw-r--r-- | linguistic/inc/misc.hxx | 2 | ||||
| -rw-r--r-- | linguistic/source/iprcache.cxx | 4 | ||||
| -rw-r--r-- | linguistic/source/lngprophelp.cxx | 5 | ||||
| -rw-r--r-- | linguistic/source/lngsvcmgr.cxx | 2 | ||||
| -rw-r--r-- | linguistic/source/misc.cxx | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index 676046c799e1..9cdc8dffbc14 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -77,7 +77,7 @@ namespace linguistic { // ascii to OUString conversion -#define A2OU(x) ::rtl::OUString::createFromAscii( x ) +#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) /// Flags to be used with the multi-path related functions /// @see GetDictionaryPaths, GetLinguisticPaths diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index 08d57c3ab784..f689534d1290 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -100,7 +100,7 @@ static void lcl_AddAsPropertyChangeListener( for (int i = 0; i < NUM_FLUSH_PROPS; ++i) { rPropSet->addPropertyChangeListener( - A2OU(aFlushProperties[i].pPropName), xListener ); + ::rtl::OUString::createFromAscii(aFlushProperties[i].pPropName), xListener ); } } } @@ -115,7 +115,7 @@ static void lcl_RemoveAsPropertyChangeListener( for (int i = 0; i < NUM_FLUSH_PROPS; ++i) { rPropSet->removePropertyChangeListener( - A2OU(aFlushProperties[i].pPropName), xListener ); + ::rtl::OUString::createFromAscii(aFlushProperties[i].pPropName), xListener ); } } } diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index cb9ff6b6ceb5..5f45aa595c1a 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -82,7 +82,7 @@ PropertyChgHelper::PropertyChgHelper( OUString *pName = aPropNames.getArray(); for (INT32 i = 0; i < nCHCount; ++i) { - pName[i] = A2OU( aCH[i] ); + pName[i] = ::rtl::OUString::createFromAscii( aCH[i] ); } SetDefaultValues(); @@ -119,7 +119,8 @@ void PropertyChgHelper::AddPropNames( const char *pNewNames[], INT32 nCount ) OUString *pName = GetPropNames().getArray(); for (INT32 i = 0; i < nCount; ++i) { - pName[ nLen + i ] = A2OU( pNewNames[ i ] ); + pName[ nLen + i ] = ::rtl::OUString::createFromAscii( pNewNames[ i ] ); + } } } diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 47010171da93..9811263648fc 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1653,7 +1653,7 @@ BOOL LngSvcMgr::SaveCfgSvcs( const String &rServiceName ) { DBG_ASSERT( 0, "node name missing" ); } - OUString aNodeName( A2OU(pNodeName) ); + OUString aNodeName( ::rtl::OUString::createFromAscii(pNodeName) ); for (INT32 i = 0; i < nLen; ++i) { diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 7a2d69a72a67..5a8084eb2f6a 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -892,7 +892,7 @@ uno::Reference< XInterface > GetOneInstanceService( const char *pServiceName ) { try { - xRef = xMgr->createInstance( A2OU( pServiceName ) ); + xRef = xMgr->createInstance( ::rtl::OUString::createFromAscii( pServiceName ) ); } catch (uno::Exception &) { |