mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TL_CONSTASCII_USTRINGPARAM in libs core 15

Browse Source
This commit is contained in:
Gert Faller
2010-11-19 19:43:57 +01:00
parent 60fec7754d
commit c33f4c624b
23 changed files with 282 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scripting/source/storage/ScriptStorageManager.cxx
View File

@@ -55,12 +55,10 @@ using namespace ::drafts::com::sun::star::script::framework;
namespace scripting_impl
{
static OUString s_implName =
::rtl::OUString::createFromAscii(
"drafts.com.sun.star.script.framework.storage.ScriptStorageManager" );
static OUString s_serviceName =
::rtl::OUString::createFromAscii(
static OUString s_implName(RTL_CONSTASCII_USTRINGPARAM(
"drafts.com.sun.star.script.framework.storage.ScriptStorageManager" );
static OUString s_serviceName(RTL_CONSTASCII_USTRINGPARAM(
"drafts.com.sun.star.script.framework.storage.ScriptStorageManager" ));
static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceName, 1 );
//extern ::rtl_StandardModuleCount s_moduleCount = MODULE_COUNT_INIT;
@@ -87,8 +85,8 @@ ScriptStorageManager::ScriptStorageManager( const Reference<
{
// obtain the macro expander singleton to use in determining the
// location of the application script storage
Any aAny = m_xContext->getValueByName( OUString::createFromAscii(
"/singletons/com.sun.star.util.theMacroExpander" ) );
Any aAny = m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM(
"/singletons/com.sun.star.util.theMacroExpander" )) );
Reference< util::XMacroExpander > xME;
if ( sal_False == ( aAny >>= xME ) )
{
@@ -98,14 +96,14 @@ ScriptStorageManager::ScriptStorageManager( const Reference<
}
validateXRef( xME, "ScriptStorageManager constructor: can't get MacroExpander" );
OUString base = OUString::createFromAscii(
SAL_CONFIGFILE( "${$BRAND_BASE_DIR/program/bootstrap" ) );
OUString base(RTL_CONSTASCII_USTRINGPARAM(
SAL_CONFIGFILE( "${$BRAND_BASE_DIR/program/bootstrap" )) );
setupAppStorage( xME,
base.concat( OUString::createFromAscii( "::BaseInstallation}/share" ) ),
base.concat( OUString(RTL_CONSTASCII_USTRINGPARAM("::BaseInstallation}/share")) ),
OUSTR( "SHARE" ) );
setupAppStorage( xME,
base.concat( OUString::createFromAscii( "::UserInstallation}/user" ) ),
base.concat( OUString(RTL_CONSTASCII_USTRINGPARAM("::UserInstallation}/user")) ),
OUSTR( "USER" ) );
}
@@ -129,7 +127,7 @@ SAL_THROW ( ( RuntimeException ) )
{
Reference< XInterface > xInterface =
m_xMgr->createInstanceWithContext(
OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), m_xContext );
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), m_xContext );
validateXRef( xInterface,
"ScriptStorageManager constructor: can't get SimpleFileAccess XInterface" );
Reference< ucb::XSimpleFileAccess > xSFA( xInterface, UNO_QUERY_THROW );
@@ -171,8 +169,8 @@ SAL_THROW ( ( RuntimeException ) )
Reference< XInterface > xInterface =
m_xMgr->createInstanceWithArgumentsAndContext(
OUString::createFromAscii(
"drafts.com.sun.star.script.framework.storage.ScriptStorage" ),
OUString(RTL_CONSTASCII_USTRINGPARAM(
"drafts.com.sun.star.script.framework.storage.ScriptStorage" )),
aArgs, m_xContext );
validateXRef( xInterface, "ScriptStorageManager:: setupAnyStorage: Can't create ScriptStorage for share" );
@@ -219,8 +217,8 @@ throw ( RuntimeException )
validateXRef( xSFA,
"ScriptStorageManager::createScriptStorage: XSimpleFileAccess is not valid" );
return setupAnyStorage( xSFA, ::rtl::OUString::createFromAscii( "" ),
::rtl::OUString::createFromAscii( "" ) );
return setupAnyStorage( xSFA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
}
//*************************************************************************
@@ -237,7 +235,7 @@ throw ( RuntimeException )
// workaround issue: no functionProvider created on doc open
// if NODIALOG tag, strip from stringURI, set boolean=true
bool displayDialog = true;
::rtl::OUString dialogTag = ::rtl::OUString::createFromAscii( "NoDialog::" );
::rtl::OUString dialogTag(RTL_CONSTASCII_USTRINGPARAM("NoDialog::"));
::rtl::OUString stringURI = cStringURI;
if( stringURI.indexOf( dialogTag ) == 0 )
{
@@ -249,8 +247,7 @@ throw ( RuntimeException )
// convert file:///... url to vnd... syntax
::rtl::OUString canonicalURI(
::rtl::OUString::createFromAscii( "vnd.sun.star.pkg://" ) );
::rtl::OUString canonicalURI(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.pkg://"));
canonicalURI = canonicalURI.concat( ::rtl::Uri::encode( stringURI,
rtl_UriCharClassUricNoSlash, rtl_UriEncodeCheckEscapes,
RTL_TEXTENCODING_ASCII_US ) );