summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-11-25 21:39:00 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-11-25 21:39:00 +0100
commit41f8880d52735a052ab5359981b4b187627a4bdc (patch)
treec7878df45da5b08006e789b1f46f411327bb2850 /svtools
parent261b50b8826153d36054df889c74a0f805848247 (diff)
RTL_CONSTASCII_USTRINGPARAM in libs-gui 18
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/filter.vcl/filter/FilterConfigCache.cxx2
-rw-r--r--svtools/source/graphic/descriptor.cxx2
-rw-r--r--svtools/source/misc/svtaccessiblefactory.cxx4
-rw-r--r--svtools/source/productregistration/productregistration.cxx6
-rw-r--r--svtools/source/uno/addrtempuno.cxx2
-rw-r--r--svtools/source/uno/genericunodialog.cxx10
6 files changed, 13 insertions, 13 deletions
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
index 2e9b176e1159..3c26d8cad9d4 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
@@ -107,7 +107,7 @@ sal_Bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUSt
if ( sFilterName.EqualsIgnoreCaseAscii( *pPtr ) )
bIsPixelFormat = sal_True;
}
- String aTemp( OUString::createFromAscii( SVLIBRARY( "?" ) ) );
+ String aTemp( OUString(RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "?" ) )) );
xub_StrLen nIndex = aTemp.Search( (sal_Unicode)'?' );
aTemp.Replace( nIndex, 1, sFilterName );
sFilterName = aTemp;
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 3c477f045fc3..c3929f5007d0 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -409,7 +409,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
}
if( !aMimeType.getLength() && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
- aMimeType = ::rtl::OUString::createFromAscii( MIMETYPE_VCLGRAPHIC );
+ aMimeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VCLGRAPHIC ));
}
else
aMimeType = maMimeType;
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index fa2dd88e5591..b63d1084e045 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -284,9 +284,9 @@ namespace svt
// load the library implementing the factory
if ( !s_pFactory.get() )
{
- const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(
+ const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(
SVLIBRARY( "acc" )
- );
+ ));
s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
if ( s_hAccessibleImplementationModule != NULL )
{
diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx
index 001aa13d54c5..ff4ed10bf4f0 100644
--- a/svtools/source/productregistration/productregistration.cxx
+++ b/svtools/source/productregistration/productregistration.cxx
@@ -104,14 +104,14 @@ namespace svt
//--------------------------------------------------------------------
OUString SAL_CALL OProductRegistration::getImplementationName_Static( )
{
- return OUString::createFromAscii( PRODREG_IMPLNAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( PRODREG_IMPLNAME ));
}
//--------------------------------------------------------------------
Sequence< OUString > SAL_CALL OProductRegistration::getSupportedServiceNames_Static( ) throw (RuntimeException)
{
Sequence< OUString > aServiceNames( 1 );
- aServiceNames[ 0 ] = OUString::createFromAscii( PRODREG_SERVNAME );
+ aServiceNames[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( PRODREG_SERVNAME ));
return aServiceNames;
}
@@ -472,7 +472,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
xNewKey = xRegistryKey->createKey(
OUString( RTL_CONSTASCII_USTRINGPARAM( "/" PRODREG_IMPLNAME "/UNO/SERVICES" )));
xNewKey->createKey(
- OUString::createFromAscii( PRODREG_SERVNAME ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM( PRODREG_SERVNAME )));
return sal_True;
}
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 7fdcedc867fe..48010373a091 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -113,7 +113,7 @@ namespace svt
OAddressBookSourceDialogUno::OAddressBookSourceDialogUno(const Reference< XMultiServiceFactory >& _rxORB)
:OGenericUnoDialog(_rxORB)
{
- registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_ALIASES), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY,
+ registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_ALIASES)), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY,
&m_aAliases, getCppuType(&m_aAliases));
}
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index b1c050fe3eff..a5bffed006b7 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -67,9 +67,9 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XMultiServiceFactory >& _r
,m_bNeedInitialization( false )
,m_aContext( _rxORB )
{
- registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
+ registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_TITLE)), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
&m_sTitle, getCppuType(&m_sTitle));
- registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
+ registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_PARENT)), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
&m_xParent, getCppuType(&m_xParent));
}
@@ -84,9 +84,9 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo
,m_bNeedInitialization( false )
,m_aContext(_rxContext)
{
- registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
+ registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_TITLE)), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
&m_sTitle, getCppuType(&m_sTitle));
- registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
+ registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_PARENT)), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
&m_xParent, getCppuType(&m_xParent));
}
@@ -189,7 +189,7 @@ void SAL_CALL OGenericUnoDialog::setTitle( const ::rtl::OUString& _rTitle ) thro
try
{
- setPropertyValue(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_TITLE), makeAny(_rTitle));
+ setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_TITLE)), makeAny(_rTitle));
}
catch(RuntimeException&)
{