diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2010-11-22 12:22:41 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-11-22 12:22:41 +0000 |
| commit | 51838cd27feb1219b2f1f5e387539efa129c58b6 (patch) | |
| tree | d6997a331156fe136186d3613448a006e68f48bf /scripting/source | |
| parent | b61f6b3eadd624cfb6d0645fdb1ae681f5309712 (diff) | |
cleanup createFromAscii calls
Diffstat (limited to 'scripting/source')
| -rw-r--r-- | scripting/source/storage/ScriptSecurityManager.cxx | 2 | ||||
| -rw-r--r-- | scripting/source/storage/ScriptStorage.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripting/source/storage/ScriptSecurityManager.cxx b/scripting/source/storage/ScriptSecurityManager.cxx index 57fd00c8003b..b653f6ce92c6 100644 --- a/scripting/source/storage/ScriptSecurityManager.cxx +++ b/scripting/source/storage/ScriptSecurityManager.cxx @@ -137,7 +137,7 @@ throw ( RuntimeException ) Reference< XInterface > xInterface; Any a = m_xContext->getValueByName( - OUString::createFromAscii( SCRIPTSTORAGEMANAGER_SERVICE ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( SCRIPTSTORAGEMANAGER_SERVICE )) ); if ( sal_False == ( a >>= xInterface ) ) { throw RuntimeException( diff --git a/scripting/source/storage/ScriptStorage.cxx b/scripting/source/storage/ScriptStorage.cxx index 02f49fb47239..c32e1683f638 100644 --- a/scripting/source/storage/ScriptStorage.cxx +++ b/scripting/source/storage/ScriptStorage.cxx @@ -290,8 +290,8 @@ throw ( RuntimeException, Exception ) validateXRef( xSMI, "ScriptStorage::create: failed to obtain valid XExtendedDocumentHandler" ); - xStringUri = xStringUri.concat( ::rtl::OUString::createFromAscii( - SCRIPT_DIR ) ); + xStringUri = xStringUri.concat( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + SCRIPT_DIR )) ); // No Scripts directory - just return if ( ! m_xSimpleFileAccess->isFolder( xStringUri ) ) @@ -329,7 +329,7 @@ throw ( RuntimeException, Exception ) RTL_TEXTENCODING_ASCII_US ).pData->buffer ); OUString parcelFile = parcelDirs[ j ].concat( - ::rtl::OUString::createFromAscii( SCRIPT_PARCEL ) ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCRIPT_PARCEL )) ); // Do not have a valid parcel.xml if ( !m_xSimpleFileAccess->exists( parcelFile ) || @@ -559,8 +559,8 @@ throw ( RuntimeException ) // xScriptInvocation = Reference<XScriptInvocation>(xx, UNO_QUERY_THROW); Reference< xml::sax::XExtendedDocumentHandler > xHandler; - OUString parcel_suffix = OUString::createFromAscii( SCRIPT_PARCEL ); - OUString ou_parcel = OUString( + OUString parcel_suffix(RTL_CONSTASCII_USTRINGPARAM( SCRIPT_PARCEL )); + OUString ou_parcel( RTL_CONSTASCII_USTRINGPARAM( SCRIPT_PARCEL_NAME_ONLY ) ); try |