diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-21 16:02:25 +0100 |
---|---|---|
committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-21 16:02:25 +0100 |
commit | e379a111fbd2c287383f5ba508b54bcca352f472 (patch) | |
tree | 1157891448c8be09ea11c30a5b4a5432c627d917 | |
parent | 6da123e4edf622280108d6361a359c21fc3d17d5 (diff) |
RTL_CONSTASCII_USTRINGPARAM in libs core 44
-rw-r--r-- | connectivity/source/drivers/macab/MacabDriver.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/frmload.cxx | 4 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/forms/layerexport.cxx | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index e409e24f59..3e19b56514 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -104,7 +104,7 @@ bool MacabImplModule::impl_loadModule() OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc, "MacabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!"); - const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( SAL_MODULENAME( "macabdrv1" ) ); + const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "macabdrv1" )) ); m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# OSL_ENSURE( m_hConnectorModule, "MacabImplModule::impl_loadModule: could not load the implementation library!" ); if ( !m_hConnectorModule ) diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 982ab59b15..b9e593d7f3 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -730,14 +730,14 @@ UNOSEQUENCE< UNOOUSTRING > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNa { UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() ); UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 ); - seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( "com.sun.star.frame.SynchronousFrameLoader" ); + seqServiceNames.getArray() [0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.SynchronousFrameLoader" )); return seqServiceNames ; } /* Helper for XServiceInfo */ UNOOUSTRING SfxFrameLoader_Impl::impl_getStaticImplementationName() { - return UNOOUSTRING::createFromAscii( "com.sun.star.comp.office.FrameLoader" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.office.FrameLoader" )); } /* Helper for registry */ diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 1b8300e6da..77a0288cd5 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -802,7 +802,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio // prepare firing an event aModeChangeEvent.Source = *this; - aModeChangeEvent.NewMode = ::rtl::OUString::createFromAscii( mbDesignMode ? "design" : "alive" ); + aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "design" )) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "alive" )); } // --- </mutex_lock> --- diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 01a60eb7f8..a01e6400f7 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -87,7 +87,7 @@ namespace xmloff //--------------------------------------------------------------------- const ::rtl::OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix() { - static const ::rtl::OUString s_sControlNumberStyleNamePrefix = ::rtl::OUString::createFromAscii("C"); + static const ::rtl::OUString s_sControlNumberStyleNamePrefix(RTL_CONSTASCII_USTRINGPARAM("C")); return s_sControlNumberStyleNamePrefix; } @@ -776,8 +776,8 @@ namespace xmloff // create it for en-US (does not really matter, as we will specify a locale for every // concrete language to use) Sequence< Any > aSupplierArgs(1); - aSupplierArgs[0] <<= Locale ( ::rtl::OUString::createFromAscii("en"), - ::rtl::OUString::createFromAscii("US"), + aSupplierArgs[0] <<= Locale ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), ::rtl::OUString() ); // #110680# |