[Libreoffice-commits] .: xmlhelp/source xmlscript/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Nov 5 07:40:33 PDT 2010
xmlhelp/source/cxxhelp/provider/content.cxx | 22 +-
xmlhelp/source/cxxhelp/provider/databases.cxx | 146 +++++++++---------
xmlhelp/source/cxxhelp/provider/provider.cxx | 40 ++--
xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 20 +-
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 24 +-
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 8
xmlhelp/source/cxxhelp/provider/services.cxx | 4
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 16 -
xmlhelp/source/cxxhelp/test/searchdemo.cxx | 12 -
xmlhelp/source/treeview/tvfactory.cxx | 14 -
xmlhelp/source/treeview/tvread.cxx | 74 ++++-----
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 2
12 files changed, 191 insertions(+), 191 deletions(-)
New commits:
commit ec4d520527b6c3e88e22c9667692cb42715ea58f
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Fri Nov 5 14:38:22 2010 +0000
use RTL_CONSTASCII_USTRINGPARAM
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 5422396..348c099 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -165,7 +165,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
rtl::OUString SAL_CALL Content::getImplementationName()
throw( uno::RuntimeException )
{
- return rtl::OUString::createFromAscii( "CHelpContent" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CHelpContent" ));
}
//=========================================================================
@@ -175,7 +175,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
{
uno::Sequence< rtl::OUString > aSNS( 1 );
aSNS.getArray()[ 0 ]
- = rtl::OUString::createFromAscii( MYUCP_CONTENT_SERVICE_NAME );
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_SERVICE_NAME ));
return aSNS;
}
@@ -189,7 +189,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
rtl::OUString SAL_CALL Content::getContentType()
throw( uno::RuntimeException )
{
- return rtl::OUString::createFromAscii( MYUCP_CONTENT_TYPE );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_TYPE ));
}
//=========================================================================
@@ -462,8 +462,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if ( rProp.Name.compareToAscii( "ContentType" ) == 0 )
xRow->appendString(
rProp,
- rtl::OUString::createFromAscii(
- "application/vnd.sun.star.help" ) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "application/vnd.sun.star.help" )) );
else if( rProp.Name.compareToAscii( "Title" ) == 0 )
xRow->appendString ( rProp,m_aURLParameter.get_title() );
else if( rProp.Name.compareToAscii( "IsReadOnly" ) == 0 )
@@ -482,18 +482,18 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if( m_aURLParameter.isPicture() )
xRow->appendString(
rProp,
- rtl::OUString::createFromAscii( "image/gif" ) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "image/gif" )) );
else if( m_aURLParameter.isActive() )
xRow->appendString(
rProp,
- rtl::OUString::createFromAscii( "text/plain" ) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) );
else if( m_aURLParameter.isFile() )
xRow->appendString(
- rProp,rtl::OUString::createFromAscii( "text/html" ) );
+ rProp,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/html" )) );
else if( m_aURLParameter.isRoot() )
xRow->appendString(
rProp,
- rtl::OUString::createFromAscii( "text/css" ) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/css" )) );
else
xRow->appendVoid( rProp );
else if( m_aURLParameter.isModule() )
@@ -544,8 +544,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
else if( rProp.Name.compareToAscii( "SearchScopes" ) == 0 )
{
uno::Sequence< rtl::OUString > seq( 2 );
- seq[0] = rtl::OUString::createFromAscii( "Heading" );
- seq[1] = rtl::OUString::createFromAscii( "FullText" );
+ seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Heading" ));
+ seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FullText" ));
uno::Any aAny;
aAny <<= seq;
xRow->appendObject( rProp,aAny );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index fac8b15..e05fa20 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -80,8 +80,8 @@ using namespace com::sun::star::deployment;
using namespace com::sun::star::beans;
-static rtl::OUString aSlash( rtl::OUString::createFromAscii( "/" ) );
-static rtl::OUString aHelpFilesBaseName( rtl::OUString::createFromAscii( "help" ) );
+static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
+static rtl::OUString aHelpFilesBaseName(RTL_CONSTASCII_USTRINGPARAM("help"));
rtl::OUString Databases::expandURL( const rtl::OUString& aURL )
{
@@ -103,18 +103,18 @@ rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::X
Reference< XMultiComponentFactory > xSMgr( xContext->getServiceManager(), UNO_QUERY );
xFac = Reference< uri::XUriReferenceFactory >(
- xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii(
- "com.sun.star.uri.UriReferenceFactory"), xContext ) , UNO_QUERY );
+ xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.uri.UriReferenceFactory")), xContext ) , UNO_QUERY );
if( !xFac.is() )
{
throw RuntimeException(
- ::rtl::OUString::createFromAscii( "Databases::expand(), could not instatiate UriReferenceFactory." ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Databases::expand(), could not instatiate UriReferenceFactory." )),
Reference< XInterface >() );
}
xMacroExpander = Reference< util::XMacroExpander >(
xContext->getValueByName(
- ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.util.theMacroExpander" ) ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" )) ),
UNO_QUERY_THROW );
}
@@ -152,13 +152,13 @@ Databases::Databases( sal_Bool showBasic,
m_nCustomCSSDocLength( 0 ),
m_pCustomCSSDoc( 0 ),
m_aCSS(styleSheet.toAsciiLowerCase()),
- newProdName(rtl::OUString::createFromAscii( "$[officename]" ) ),
- newProdVersion(rtl::OUString::createFromAscii( "$[officeversion]" ) ),
- prodName( rtl::OUString::createFromAscii( "%PRODUCTNAME" ) ),
- prodVersion( rtl::OUString::createFromAscii( "%PRODUCTVERSION" ) ),
- vendName( rtl::OUString::createFromAscii( "%VENDORNAME" ) ),
- vendVersion( rtl::OUString::createFromAscii( "%VENDORVERSION" ) ),
- vendShort( rtl::OUString::createFromAscii( "%VENDORSHORT" ) ),
+ newProdName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$[officename]" )) ),
+ newProdVersion(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$[officeversion]" )) ),
+ prodName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTNAME" )) ),
+ prodVersion( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTVERSION" )) ),
+ vendName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%VENDORNAME" )) ),
+ vendVersion( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%VENDORVERSION" )) ),
+ vendShort( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%VENDORSHORT" )) ),
m_aImagesZipPaths( imagesZipPaths ),
m_nSymbolsStyle( 0 )
{
@@ -181,7 +181,7 @@ Databases::Databases( sal_Bool showBasic,
setInstallPath( instPath );
m_xSFA = Reference< ucb::XSimpleFileAccess >(
- m_xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
+ m_xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )),
m_xContext ), UNO_QUERY_THROW );
}
@@ -245,7 +245,7 @@ static bool impl_getZipFile(
{
if ( 1 + rFileName.lastIndexOf( '/' ) != rFileName.getLength() )
{
- rFileName += rtl::OUString::createFromAscii( "/" );
+ rFileName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
}
rFileName += rZipName;
@@ -265,23 +265,23 @@ rtl::OString Databases::getImagesZipFileURL()
try
{
uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
- m_xSMgr ->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"), m_xContext), uno::UNO_QUERY_THROW);
+ m_xSMgr ->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")), m_xContext), uno::UNO_QUERY_THROW);
// set root path
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
- aParam.Name = ::rtl::OUString::createFromAscii("nodepath");
- aParam.Value <<= ::rtl::OUString::createFromAscii("org.openoffice.Office.Common");
+ aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+ aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common"));
lParams[0] = uno::makeAny(aParam);
// open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
lParams) );
bool bChanged = false;
uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW);
- uno::Any aResult = xAccess->getByHierarchicalName(::rtl::OUString::createFromAscii("Misc/SymbolSet"));
+ uno::Any aResult = xAccess->getByHierarchicalName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc/SymbolSet")));
if ( (aResult >>= nSymbolsStyle) && m_nSymbolsStyle != nSymbolsStyle )
{
m_nSymbolsStyle = nSymbolsStyle;
@@ -291,21 +291,21 @@ rtl::OString Databases::getImagesZipFileURL()
if ( !m_aImagesZipFileURL.getLength() || bChanged )
{
rtl::OUString aImageZip, aSymbolsStyleName;
- aResult = xAccess->getByHierarchicalName(::rtl::OUString::createFromAscii("Misc/SymbolStyle"));
+ aResult = xAccess->getByHierarchicalName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc/SymbolStyle")));
aResult >>= aSymbolsStyleName;
bool bFound = false;
if ( aSymbolsStyleName.getLength() != 0 )
{
- rtl::OUString aZipName = rtl::OUString::createFromAscii( "images_" );
+ rtl::OUString aZipName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_" ));
aZipName += aSymbolsStyleName;
- aZipName += rtl::OUString::createFromAscii( ".zip" );
+ aZipName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".zip" ));
bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
}
if ( ! bFound )
- bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString::createFromAscii( "images.zip" ), aImageZip );
+ bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images.zip" )), aImageZip );
if ( ! bFound )
aImageZip = rtl::OUString();
@@ -476,7 +476,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
{
osl::MutexGuard aGuard( m_aMutex );
- rtl::OUString key = processLang(Language) + rtl::OUString::createFromAscii( "/" ) + Module;
+ rtl::OUString key = processLang(Language) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) + Module;
std::pair< ModInfoTable::iterator,bool > aPair =
m_aModInfo.insert( ModInfoTable::value_type( key,0 ) );
@@ -487,7 +487,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
{
osl::File cfgFile( getInstallPathAsURL() +
key +
- rtl::OUString::createFromAscii( ".cfg" ) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".cfg" )) );
if( osl::FileBase::E_None != cfgFile.open( OpenFlag_Read ) )
it->second = 0;
@@ -506,7 +506,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
const sal_Unicode* str = fileContent.getStr();
rtl::OUString current,lang_,program,startid,title,heading,fulltext;
- rtl::OUString order = rtl::OUString::createFromAscii( "1" );
+ rtl::OUString order(RTL_CONSTASCII_USTRINGPARAM( "1" ));
for( sal_Int32 i = 0;i < fileContent.getLength();i++ )
{
@@ -622,7 +622,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
osl::MutexGuard aGuard( m_aMutex );
- rtl::OUString aFileExt( rtl::OUString::createFromAscii( helpText ? ".ht" : ".db" ) );
+ rtl::OUString aFileExt( helpText ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ht")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".db" )) );
rtl::OUString dbFileName = aSlash + Database + aFileExt;
rtl::OUString key;
if( pExtensionPath == NULL )
@@ -654,7 +654,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
rtl::OUString fileNameDBHelp( fileNameOU );
if( pExtensionPath != NULL )
- fileNameDBHelp += rtl::OUString::createFromAscii( "_" );
+ fileNameDBHelp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" ));
if( m_xSFA->exists( fileNameDBHelp ) )
{
DBHelp* pDBHelp = new DBHelp( fileNameDBHelp, m_xSFA );
@@ -699,28 +699,28 @@ Databases::getCollator( const rtl::OUString& Language,
{
it->second =
Reference< XCollator > (
- m_xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.i18n.Collator" ),
+ m_xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Collator" )),
m_xContext ), UNO_QUERY );
rtl::OUString langStr = processLang(Language);
rtl::OUString countryStr = country(Language);
if( !countryStr.getLength() )
{
if( langStr.compareToAscii("de") == 0 )
- countryStr = rtl::OUString::createFromAscii("DE");
+ countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE"));
else if( langStr.compareToAscii("en") == 0 )
- countryStr = rtl::OUString::createFromAscii("US");
+ countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
else if( langStr.compareToAscii("es") == 0 )
- countryStr = rtl::OUString::createFromAscii("ES");
+ countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ES"));
else if( langStr.compareToAscii("it") == 0 )
- countryStr = rtl::OUString::createFromAscii("IT");
+ countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IT"));
else if( langStr.compareToAscii("fr") == 0 )
- countryStr = rtl::OUString::createFromAscii("FR");
+ countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FR"));
else if( langStr.compareToAscii("sv") == 0 )
- countryStr = rtl::OUString::createFromAscii("SE");
+ countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SE"));
else if( langStr.compareToAscii("ja") == 0 )
- countryStr = rtl::OUString::createFromAscii("JP");
+ countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JP"));
else if( langStr.compareToAscii("ko") == 0 )
- countryStr = rtl::OUString::createFromAscii("KR");
+ countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KR"));
}
it->second->loadDefaultCollator( Locale( langStr,
countryStr,
@@ -935,7 +935,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
{
osl::MutexGuard aGuard( m_aMutex );
- rtl::OUString key = processLang(Language) + rtl::OUString::createFromAscii( "/" ) + Database;
+ rtl::OUString key = processLang(Language) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) + Database;
std::pair< KeywordInfoTable::iterator,bool > aPair =
m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,0 ) );
@@ -959,7 +959,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
rtl::OUString fileNameDBHelp( fileNameOU );
if( bExtension )
- fileNameDBHelp += rtl::OUString::createFromAscii( "_" );
+ fileNameDBHelp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" ));
if( m_xSFA->exists( fileNameDBHelp ) )
{
DBHelp aDBHelp( fileNameDBHelp, m_xSFA );
@@ -1133,8 +1133,8 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
Reference< XInterface > xIfc
= m_xSMgr->createInstanceWithArgumentsAndContext(
- rtl::OUString::createFromAscii(
- "com.sun.star.packages.comp.ZipPackage" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.packages.comp.ZipPackage" )),
aArguments, m_xContext );
if ( xIfc.is() )
@@ -1294,9 +1294,9 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
uno::Reference< awt::XVclWindowPeer > xVclWindowPeer( xTopWindow, uno::UNO_QUERY );
if ( xVclWindowPeer.is() )
{
- uno::Any aHCMode = xVclWindowPeer->getProperty( rtl::OUString::createFromAscii( "HighContrastMode" ) );
+ uno::Any aHCMode = xVclWindowPeer->getProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HighContrastMode" )) );
if ( ( aHCMode >>= bHighContrastMode ) && bHighContrastMode )
- aCSS = rtl::OUString::createFromAscii( "highcontrastblack" );
+ aCSS = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "highcontrastblack" ));
}
}
}
@@ -1310,14 +1310,14 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
fileURL =
getInstallPathAsURL() +
processLang( Language ) +
- rtl::OUString::createFromAscii( "/" ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) +
aCSS +
- rtl::OUString::createFromAscii( ".css" );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".css" ));
else if( retry == 1 )
fileURL =
getInstallPathAsURL() +
aCSS +
- rtl::OUString::createFromAscii( ".css" );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".css" ));
osl::DirectoryItem aDirItem;
osl::File aFile( fileURL );
@@ -1340,7 +1340,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
if ( !retry && error && bHighContrastMode )
{
// fall back to default css
- aCSS = rtl::OUString::createFromAscii( "default" );
+ aCSS = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "default" ));
retry = 2;
bHighContrastMode = sal_False;
}
@@ -1447,7 +1447,7 @@ void Databases::setInstallPath( const rtl::OUString& aInstDir )
//TODO: check returned error code
if( m_aInstallDirectory.lastIndexOf( sal_Unicode( '/' ) ) != m_aInstallDirectory.getLength() - 1 )
- m_aInstallDirectory += rtl::OUString::createFromAscii( "/" );
+ m_aInstallDirectory += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
m_aInstallDirectoryWithoutEncoding = rtl::Uri::decode( m_aInstallDirectory,
rtl_UriDecodeWithCharset,
@@ -1498,13 +1498,13 @@ void ExtensionIteratorBase::init()
if( !m_xContext.is() )
{
throw RuntimeException(
- ::rtl::OUString::createFromAscii( "ExtensionIteratorBase::init(), no XComponentContext" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ExtensionIteratorBase::init(), no XComponentContext" )),
Reference< XInterface >() );
}
Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
m_xSFA = Reference< ucb::XSimpleFileAccess >(
- xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
+ xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )),
m_xContext ), UNO_QUERY_THROW );
m_bUserPackagesLoaded = false;
@@ -1587,7 +1587,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
if( !m_bUserPackagesLoaded )
{
Reference< XPackageManager > xUserManager =
- thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("user") );
+ thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")) );
m_aUserPackagesSeq = xUserManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
m_bUserPackagesLoaded = true;
@@ -1616,7 +1616,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
if( !m_bSharedPackagesLoaded )
{
Reference< XPackageManager > xSharedManager =
- thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("shared") );
+ thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shared")) );
m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
m_bSharedPackagesLoaded = true;
@@ -1645,7 +1645,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
if( !m_bBundledPackagesLoaded )
{
Reference< XPackageManager > xBundledManager =
- thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("bundled") );
+ thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")) );
m_aBundledPackagesSeq = xBundledManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
m_bBundledPackagesLoaded = true;
@@ -1880,7 +1880,7 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
aRetFile =
m_rDatabases.getInstallPathAsSystemPath() +
m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule +
- rtl::OUString::createFromAscii( ".key" );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".key" ));
o_rbExtension = false;
@@ -1940,7 +1940,7 @@ rtl::OUString KeyDataBaseFileIterator::implGetDbFileFromPackage
( Reference< deployment::XPackage > xPackage )
{
rtl::OUString aExpandedURL =
- implGetFileFromPackage( rtl::OUString::createFromAscii( ".key" ), xPackage );
+ implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".key" )), xPackage );
rtl::OUString aRetFile;
osl::FileBase::getSystemPathFromFileURL( aExpandedURL, aRetFile );
@@ -2016,7 +2016,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
Reference< XHierarchicalNameAccess > xNA;
rtl::OUString zipFile =
- implGetFileFromPackage( rtl::OUString::createFromAscii( ".jar" ), xPackage );
+ implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".jar" )), xPackage );
try
{
@@ -2032,8 +2032,8 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
Reference< XMultiComponentFactory >xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
Reference< XInterface > xIfc
= xSMgr->createInstanceWithArgumentsAndContext(
- rtl::OUString::createFromAscii(
- "com.sun.star.packages.comp.ZipPackage" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.packages.comp.ZipPackage" )),
aArguments, m_xContext );
if ( xIfc.is() )
@@ -2086,7 +2086,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
aIndexFolder =
m_rDatabases.getInstallPathAsURL() +
m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule +
- rtl::OUString::createFromAscii( ".idxl" );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".idxl" ));
o_rbTemporary = false;
o_rbExtension = false;
@@ -2146,7 +2146,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary, Reference< deployment::XPackage > xPackage )
{
rtl::OUString aIndexFolder =
- implGetFileFromPackage( rtl::OUString::createFromAscii( ".idxl" ), xPackage );
+ implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".idxl" )), xPackage );
o_rbTemporary = false;
if( !m_xSFA->isFolder( aIndexFolder ) )
@@ -2159,7 +2159,7 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
bool bIsWriteAccess = false;
try
{
- rtl::OUString aCreateTestFolder = aLangURL + rtl::OUString::createFromAscii( "CreateTestFolder" );
+ rtl::OUString aCreateTestFolder = aLangURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CreateTestFolder" ));
m_xSFA->createFolder( aCreateTestFolder );
if( m_xSFA->isFolder( aCreateTestFolder ) )
bIsWriteAccess = true;
@@ -2177,25 +2177,25 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
try
{
xInvocation = Reference< script::XInvocation >(
- m_xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
- "com.sun.star.help.HelpIndexer" ), m_xContext ) , UNO_QUERY );
+ m_xContext->getServiceManager()->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.help.HelpIndexer" )), m_xContext ) , UNO_QUERY );
if( xInvocation.is() )
{
Sequence<uno::Any> aParamsSeq( bIsWriteAccess ? 6 : 8 );
- aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+ aParamsSeq[0] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-lang" )) );
rtl::OUString aLang;
sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
if( nLastSlash != -1 )
aLang = aLangURL.copy( nLastSlash + 1 );
else
- aLang = rtl::OUString::createFromAscii( "en" );
+ aLang = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "en" ));
aParamsSeq[1] = uno::makeAny( aLang );
- aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-mod" ) );
- aParamsSeq[3] = uno::makeAny( rtl::OUString::createFromAscii( "help" ) );
+ aParamsSeq[2] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-mod" )) );
+ aParamsSeq[3] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "help" )) );
rtl::OUString aZipDir = aLangURL;
if( !bIsWriteAccess )
@@ -2218,14 +2218,14 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
}
}
- aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-zipdir" ) );
+ aParamsSeq[4] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-zipdir" )) );
rtl::OUString aSystemPath;
osl::FileBase::getSystemPathFromFileURL( aZipDir, aSystemPath );
aParamsSeq[5] = uno::makeAny( aSystemPath );
if( !bIsWriteAccess )
{
- aParamsSeq[6] = uno::makeAny( rtl::OUString::createFromAscii( "-srcdir" ) );
+ aParamsSeq[6] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-srcdir" )) );
rtl::OUString aSrcDirVal;
osl::FileBase::getSystemPathFromFileURL( aLangURL, aSrcDirVal );
aParamsSeq[7] = uno::makeAny( aSrcDirVal );
@@ -2233,13 +2233,13 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
Sequence< sal_Int16 > aOutParamIndex;
Sequence< uno::Any > aOutParam;
- uno::Any aRet = xInvocation->invoke( rtl::OUString::createFromAscii( "createIndex" ),
+ uno::Any aRet = xInvocation->invoke( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "createIndex" )),
aParamsSeq, aOutParamIndex, aOutParam );
if( bIsWriteAccess )
- aIndexFolder = implGetFileFromPackage( rtl::OUString::createFromAscii( ".idxl" ), xPackage );
+ aIndexFolder = implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".idxl" )), xPackage );
else
- aIndexFolder = aZipDir + rtl::OUString::createFromAscii( "/help.idxl" );
+ aIndexFolder = aZipDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/help.idxl" ));
}
}
catch (Exception &)
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 365fff0..cc2fab6 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -69,7 +69,7 @@ ContentProvider::ContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
: ::ucbhelper::ContentProviderImplHelper( rSMgr ),
isInitialized( false ),
- m_aScheme( rtl::OUString::createFromAscii( MYUCP_URL_SCHEME ) ),
+ m_aScheme(RTL_CONSTASCII_USTRINGPARAM(MYUCP_URL_SCHEME)),
m_pDatabases( 0 )
{
}
@@ -122,7 +122,7 @@ rtl::OUString SAL_CALL ContentProvider::getImplementationName()
rtl::OUString ContentProvider::getImplementationName_Static()
{
- return rtl::OUString::createFromAscii("CHelpContentProvider" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHelpContentProvider" ));
}
sal_Bool SAL_CALL
@@ -162,11 +162,11 @@ ContentProvider::getSupportedServiceNames_Static()
{
uno::Sequence< rtl::OUString > aSNS( 2 );
aSNS.getArray()[ 0 ] =
- rtl::OUString::createFromAscii(
- MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 ));
aSNS.getArray()[ 1 ] =
- rtl::OUString::createFromAscii(
- MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 ));
return aSNS;
}
@@ -277,7 +277,7 @@ void ContentProvider::init()
rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( ! instPath.getLength() )
// try to determine path from default
- instPath = rtl::OUString::createFromAscii( "$(instpath)/help" );
+ instPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$(instpath)/help" ));
// replace anything like $(instpath);
subst( instPath );
@@ -290,7 +290,7 @@ void ContentProvider::init()
if( xAccess.is() )
{
uno::Any aAny =
- xAccess->getByName( rtl::OUString::createFromAscii( "Help" ) );
+ xAccess->getByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Help" )) );
aAny >>= m_xContainer;
if( m_xContainer.is() )
m_xContainer->addContainerListener( this );
@@ -317,21 +317,21 @@ void ContentProvider::init()
try
{
uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
- m_xSMgr ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY_THROW);
+ m_xSMgr ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), uno::UNO_QUERY_THROW);
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
- aParam.Name = ::rtl::OUString::createFromAscii("nodepath");
- aParam.Value <<= ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Product");
+ aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+ aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Product"));
lParams[0] = uno::makeAny(aParam);
// open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
lParams) );
uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
- uno::Any aRet = xDirectAccess->getByName(::rtl::OUString::createFromAscii("ooSetupExtension"));
+ uno::Any aRet = xDirectAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension")));
aRet >>= setupextension;
}
@@ -341,7 +341,7 @@ void ContentProvider::init()
rtl::OUString productversion(
setupversion +
- rtl::OUString::createFromAscii( " " ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) +
setupextension );
uno::Sequence< rtl::OUString > aImagesZipPaths( 2 );
@@ -384,8 +384,8 @@ ContentProvider::getConfiguration() const
try
{
rtl::OUString sProviderService =
- rtl::OUString::createFromAscii(
- "com.sun.star.configuration.ConfigurationProvider" );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.configuration.ConfigurationProvider" ));
sProvider =
uno::Reference< lang::XMultiServiceFactory >(
m_xSMgr->createInstance( sProviderService ),
@@ -411,8 +411,8 @@ ContentProvider::getHierAccess(
{
uno::Sequence< uno::Any > seq( 1 );
rtl::OUString sReaderService(
- rtl::OUString::createFromAscii(
- "com.sun.star.configuration.ConfigurationAccess" ) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.configuration.ConfigurationAccess" )) );
seq[ 0 ] <<= rtl::OUString::createFromAscii( file );
@@ -489,8 +489,8 @@ void ContentProvider::subst( rtl::OUString& instpath ) const
xCfgMgr =
uno::Reference< frame::XConfigManager >(
m_xSMgr->createInstance(
- rtl::OUString::createFromAscii(
- "com.sun.star.config.SpecialConfigManager" ) ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.config.SpecialConfigManager" )) ),
uno::UNO_QUERY );
}
catch( const uno::Exception&)
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 31585a6..89831c0 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -505,12 +505,12 @@ ResultSetBase::getPropertySetInfo()
throw( uno::RuntimeException)
{
uno::Sequence< beans::Property > seq(2);
- seq[0].Name = rtl::OUString::createFromAscii( "RowCount" );
+ seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" ));
seq[0].Handle = -1;
seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
seq[0].Attributes = beans::PropertyAttribute::READONLY;
- seq[1].Name = rtl::OUString::createFromAscii( "IsRowCountFinal" );
+ seq[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" ));
seq[1].Handle = -1;
seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) );
seq[1].Attributes = beans::PropertyAttribute::READONLY;
@@ -531,8 +531,8 @@ void SAL_CALL ResultSetBase::setPropertyValue(
{
(void)aValue;
- if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) ||
- aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+ if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) ||
+ aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) )
return;
throw beans::UnknownPropertyException();
@@ -545,13 +545,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
lang::WrappedTargetException,
uno::RuntimeException)
{
- if( PropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+ if( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) )
{
uno::Any aAny;
aAny <<= m_bRowCountFinal;
return aAny;
}
- else if ( PropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+ else if ( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) )
{
uno::Any aAny;
sal_Int32 count = m_aItems.size();
@@ -570,7 +570,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
lang::WrappedTargetException,
uno::RuntimeException)
{
- if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+ if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) )
{
osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pIsFinalListeners )
@@ -579,7 +579,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
m_pIsFinalListeners->addInterface( xListener );
}
- else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+ else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) )
{
osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pRowCountListeners )
@@ -599,13 +599,13 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
lang::WrappedTargetException,
uno::RuntimeException)
{
- if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) &&
+ if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) &&
m_pIsFinalListeners )
{
osl::MutexGuard aGuard( m_aMutex );
m_pIsFinalListeners->removeInterface( aListener );
}
- else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) &&
+ else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) &&
m_pRowCountListeners )
{
osl::MutexGuard aGuard( m_aMutex );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 109e306..0501c1e 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -90,7 +90,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
m_aURLParameter( aURLParameter )
{
Reference< XTransliteration > xTrans(
- xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.Transliteration" ) ),
+ xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Transliteration" )) ),
UNO_QUERY );
Locale aLocale( aURLParameter.get_language(),
rtl::OUString(),
@@ -101,7 +101,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
// Access Lucene via XInvocation
Reference< script::XInvocation > xInvocation(
- xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.help.HelpSearch" ) ),
+ xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.HelpSearch" )) ),
UNO_QUERY );
vector< vector< rtl::OUString > > queryList;
@@ -182,27 +182,27 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
int nParamCount = bCaptionsOnly ? 7 : 6;
Sequence<uno::Any> aParamsSeq( nParamCount );
- aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+ aParamsSeq[0] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-lang" )) );
aParamsSeq[1] = uno::makeAny( m_aURLParameter.get_language() );
- aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-index" ) );
+ aParamsSeq[2] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-index" )) );
rtl::OUString aSystemPath;
osl::FileBase::getSystemPathFromFileURL( idxDir, aSystemPath );
aParamsSeq[3] = uno::makeAny( aSystemPath );
- aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-query" ) );
+ aParamsSeq[4] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-query" )) );
const std::vector< rtl::OUString >& aListItem = queryList[i];
::rtl::OUString aNewQueryStr = aListItem[0];
aParamsSeq[5] = uno::makeAny( aNewQueryStr );
if( bCaptionsOnly )
- aParamsSeq[6] = uno::makeAny( rtl::OUString::createFromAscii( "-caption" ) );
+ aParamsSeq[6] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-caption" )) );
Sequence< sal_Int16 > aOutParamIndex;
Sequence< uno::Any > aOutParam;
- uno::Any aRet = xInvocation->invoke( rtl::OUString::createFromAscii( "search" ),
+ uno::Any aRet = xInvocation->invoke( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "search" )),
aParamsSeq, aOutParamIndex, aOutParam );
Sequence< float > aScoreSeq;
@@ -412,8 +412,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
#endif
}
- sal_Int32 replIdx = rtl::OUString::createFromAscii( "#HLP#" ).getLength();
- rtl::OUString replWith = rtl::OUString::createFromAscii( "vnd.sun.star.help://" );
+ sal_Int32 replIdx = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" )).getLength();
+ rtl::OUString replWith = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ));
int nResultCount = aCompleteResultVector.size();
for( int r = 0 ; r < nResultCount ; ++r )
@@ -427,16 +427,16 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
m_aIdents.resize( m_aPath.size() );
Command aCommand;
- aCommand.Name = rtl::OUString::createFromAscii( "getPropertyValues" );
+ aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ));
aCommand.Argument <<= m_sProperty;
for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow )
{
m_aPath[m_nRow] =
m_aPath[m_nRow] +
- rtl::OUString::createFromAscii( "?Language=" ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" )) +
m_aURLParameter.get_language() +
- rtl::OUString::createFromAscii( "&System=" ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" )) +
m_aURLParameter.get_system();
uno::Reference< XContent > content = queryContent();
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index 7774f84..46f2926 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -57,17 +57,17 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< lang::XMultiServiceFac
m_aIdents.resize( m_aPath.size() );
Command aCommand;
- aCommand.Name = rtl::OUString::createFromAscii( "getPropertyValues" );
+ aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ));
aCommand.Argument <<= m_sProperty;
for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
{
m_aPath[i] =
- rtl::OUString::createFromAscii( "vnd.sun.star.help://" ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" )) +
m_aPath[i] +
- rtl::OUString::createFromAscii( "?Language=" ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" )) +
m_aURLParameter.get_language() +
- rtl::OUString::createFromAscii( "&System=" ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" )) +
m_aURLParameter.get_system();
m_nRow = sal_Int32( i );
diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index aeecd30..a3c2f15 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -42,9 +42,9 @@ static sal_Bool writeInfo(
const rtl::OUString & rImplementationName,
uno::Sequence< rtl::OUString > const & rServiceNames )
{
- rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) );
+ rtl::OUString aKeyName(RTL_CONSTASCII_USTRINGPARAM("/"));
aKeyName += rImplementationName;
- aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+ aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
uno::Reference< registry::XRegistryKey > xKey;
try
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index eb66f26..0d5aa3e 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -185,7 +185,7 @@ rtl::OUString URLParameter::get_title()
m_aTitle = inf->get_title();
}
else // This must be the root
- m_aTitle = rtl::OUString::createFromAscii("root");
+ m_aTitle = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("root"));
return m_aTitle;
}
@@ -280,7 +280,7 @@ rtl::OUString URLParameter::get_the_jar()
return m_aJar;
}
else
- return get_module() + rtl::OUString::createFromAscii(".jar");
+ return get_module() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".jar"));
}
@@ -288,7 +288,7 @@ rtl::OUString URLParameter::get_the_jar()
void URLParameter::readBerkeley()
{
- static rtl::OUString aQuestionMark( rtl::OUString::createFromAscii( "?" ) );
+ static rtl::OUString aQuestionMark(RTL_CONSTASCII_USTRINGPARAM("?"));
if( get_id().compareToAscii("") == 0 )
return;
@@ -450,7 +450,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
{
Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA =
- m_pDatabases->jarFile( rtl::OUString::createFromAscii( "picture.jar" ),
+ m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )),
get_language() );
rtl::OUString path = get_path();
@@ -520,7 +520,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
{
Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA =
- m_pDatabases->jarFile( rtl::OUString::createFromAscii( "picture.jar" ),
+ m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )),
get_language() );
rtl::OUString path = get_path();
@@ -578,7 +578,7 @@ bool URLParameter::scheme()
if( aLastStr.compareToAscii( "DbPAR=" ) == 0 )
{
rtl::OUString aNewExpr = m_aExpr.copy( 0, 20 );
- rtl::OUString aSharedStr = rtl::OUString::createFromAscii( "shared" );
+ rtl::OUString aSharedStr(RTL_CONSTASCII_USTRINGPARAM("shared"));
aNewExpr += aSharedStr;
aNewExpr += m_aExpr.copy( 20 );
aNewExpr += aSharedStr;
@@ -695,7 +695,7 @@ bool URLParameter::query()
if( ! m_aQuery.getLength() )
m_aQuery = value;
else
- m_aQuery += ( rtl::OUString::createFromAscii( " " ) + value );
+ m_aQuery += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) + value );
}
else if( parameter.compareToAscii( "Scope" ) == 0 )
m_aScope = value;
@@ -1035,7 +1035,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
if( !xContext.is() )
{
throw RuntimeException(
- ::rtl::OUString::createFromAscii( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" )),
Reference< XInterface >() );
}
diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
index 046624a..1ed7737 100644
--- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx
+++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
@@ -78,21 +78,21 @@ int main( int argc,char* argv[] )
try
{
- rtl::OUString installDir = rtl::OUString::createFromAscii( "//./e|/index/" );
+ rtl::OUString installDir(RTL_CONSTASCII_USTRINGPARAM("//./e|/index/"));
QueryProcessor queryProcessor( installDir );
std::vector<rtl::OUString> Query(2);
- Query[0] = rtl::OUString::createFromAscii( "text*" );
- Query[1] = rtl::OUString::createFromAscii( "abbildung" );
- rtl::OUString Scope = rtl::OUString::createFromAscii( "headingheading" );
+ Query[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text*" ));
+ Query[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "abbildung" ));
+ rtl::OUString Scope = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "headingheading" ));
int HitCount = 40;
QueryStatement queryStatement( HitCount,Query,Scope );
queryResults = queryProcessor.processQuery( queryStatement );
rtl::OUString translations[2];
- translations[0] = rtl::OUString::createFromAscii( "#HLP#" );
- translations[1] = rtl::OUString::createFromAscii( "vnd.sun.star.help://" );
+ translations[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" ));
+ translations[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ));
PrefixTranslator* translator = PrefixTranslator::makePrefixTranslator( translations,2 );
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index 50e80dc..9d64a64 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -147,7 +147,7 @@ TVFactory::createInstance(
aAny <<= rtl::OUString();
Sequence< Any > seq( 1 );
seq[0] <<= PropertyValue(
- rtl::OUString::createFromAscii( "nodepath" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "nodepath" )),
-1,
aAny,
PropertyState_DIRECT_VALUE );
@@ -208,7 +208,7 @@ TVFactory::getAvailableServiceNames( )
throw( RuntimeException )
{
Sequence< rtl::OUString > seq( 1 );
- seq[0] = rtl::OUString::createFromAscii( "com.sun.star.ucb.HierarchyDataReadAccess" );
+ seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.HierarchyDataReadAccess" ));
return seq;
}
@@ -220,7 +220,7 @@ TVFactory::getAvailableServiceNames( )
rtl::OUString SAL_CALL
TVFactory::getImplementationName_static()
{
- return rtl::OUString::createFromAscii( "com.sun.star.help.TreeViewImpl" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.TreeViewImpl" ));
}
@@ -228,8 +228,8 @@ Sequence< rtl::OUString > SAL_CALL
TVFactory::getSupportedServiceNames_static()
{
Sequence< rtl::OUString > seq( 2 );
- seq[0] = rtl::OUString::createFromAscii( "com.sun.star.help.TreeView" );
- seq[1] = rtl::OUString::createFromAscii( "com.sun.star.ucb.HiearchyDataSource" );
+ seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.TreeView" ));
+ seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.HiearchyDataSource" ));
return seq;
}
@@ -263,9 +263,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
const rtl::OUString & rImplementationName,
Sequence< rtl::OUString > const & rServiceNames )
{
- rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) );
+ rtl::OUString aKeyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) );
aKeyName += rImplementationName;
- aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+ aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
Reference< registry::XRegistryKey > xKey;
try
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 988a775..7fe54b7 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -185,11 +185,11 @@ using namespace com::sun::star::deployment;
ConfigData::ConfigData()
- : prodName( rtl::OUString::createFromAscii( "%PRODUCTNAME" ) ),
- prodVersion( rtl::OUString::createFromAscii( "%PRODUCTVERSION" ) ),
- vendName( rtl::OUString::createFromAscii( "%VENDORNAME" ) ),
- vendVersion( rtl::OUString::createFromAscii( "%VENDORVERSION" ) ),
- vendShort( rtl::OUString::createFromAscii( "%VENDORSHORT" ) )
+ : prodName(RTL_CONSTASCII_USTRINGPARAM("%PRODUCTNAME")),
+ prodVersion(RTL_CONSTASCII_USTRINGPARAM("%PRODUCTVERSION")),
+ vendName(RTL_CONSTASCII_USTRINGPARAM("%VENDORNAME")),
+ vendVersion(RTL_CONSTASCII_USTRINGPARAM("%VENDORVERSION")),
+ vendShort(RTL_CONSTASCII_USTRINGPARAM("%VENDORSHORT"))
{
}
@@ -308,7 +308,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )
{
TargetURL = ( tvDom->getTargetURL() + configData.appendix );
if( tvDom->anchor.getLength() )
- TargetURL += ( rtl::OUString::createFromAscii( "#" ) +
+ TargetURL += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#" )) +
tvDom->anchor );
}
else
@@ -363,9 +363,9 @@ TVRead::getElementNames( )
{
Sequence< rtl::OUString > seq( 3 );
- seq[0] = rtl::OUString::createFromAscii( "Title" );
- seq[1] = rtl::OUString::createFromAscii( "TargetURL" );
- seq[2] = rtl::OUString::createFromAscii( "Children" );
+ seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" ));
+ seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ));
+ seq[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Children" ));
return seq;
}
@@ -667,7 +667,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( ! instPath.getLength() )
// try to determine path from default
- instPath = rtl::OUString::createFromAscii( "$(instpath)/help" );
+ instPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$(instpath)/help" ));
// replace anything like $(instpath);
subst( xSMgr,instPath );
@@ -686,21 +686,21 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
try
{
uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
- xSMgr ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY_THROW);
+ xSMgr ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), uno::UNO_QUERY_THROW);
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
- aParam.Name = ::rtl::OUString::createFromAscii("nodepath");
- aParam.Value <<= ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Product");
+ aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+ aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Product"));
lParams[0] = uno::makeAny(aParam);
// open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
lParams) );
uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
- uno::Any aRet = xDirectAccess->getByName(::rtl::OUString::createFromAscii("ooSetupExtension"));
+ uno::Any aRet = xDirectAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension")));
aRet >>= setupextension;
}
@@ -709,7 +709,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
}
rtl::OUString productVersion( setupversion +
- rtl::OUString::createFromAscii( " " ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) +
setupextension );
rtl::OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) );
@@ -719,7 +719,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
osl::FileBase::RC errFile = osl::FileBase::getFileURLFromSystemPath( instPath,url );
if( errFile != osl::FileBase::E_None ) return configData;
if( url.lastIndexOf( sal_Unicode( '/' ) ) != url.getLength() - 1 )
- url += rtl::OUString::createFromAscii( "/" );
+ url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
rtl::OUString ret;
sal_Int32 idx;
osl::DirectoryItem aDirItem;
@@ -732,8 +732,8 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
ret = locale.copy( 0,idx );
else
{
- locale = rtl::OUString::createFromAscii( "en-US" );
- ret = rtl::OUString::createFromAscii("en");
+ locale = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "en-US" ));
+ ret = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
}
url = url + ret;
@@ -800,11 +800,11 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
configData.system = system;
configData.locale = locale;
configData.appendix =
- rtl::OUString::createFromAscii( "?Language=" ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" )) +
configData.locale +
- rtl::OUString::createFromAscii( "&System=" ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" )) +
configData.system +
- rtl::OUString::createFromAscii( "&UseDB=no" ) ;
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&UseDB=no" )) ;
return configData;
}
@@ -826,7 +826,7 @@ TVChildTarget::getConfiguration(const Reference< XMultiServiceFactory >& m_xSMgr
try
{
rtl::OUString sProviderService =
- rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ));
sProvider =
Reference< XMultiServiceFactory >(
m_xSMgr->createInstance( sProviderService ),
@@ -853,7 +853,7 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider
{
Sequence< Any > seq(1);
rtl::OUString sReaderService =
- rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ));
seq[0] <<= rtl::OUString::createFromAscii( file );
@@ -930,7 +930,7 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr,
{
xCfgMgr =
Reference< XConfigManager >(
- m_xSMgr->createInstance( rtl::OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) ),
+ m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" )) ),
UNO_QUERY );
}
catch( const com::sun::star::uno::Exception& )
@@ -949,9 +949,9 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr,
//===================================================================
// class ExtensionIteratorBase
-static rtl::OUString aSlash( rtl::OUString::createFromAscii( "/" ) );
-static rtl::OUString aHelpFilesBaseName( rtl::OUString::createFromAscii( "help" ) );
-static rtl::OUString aHelpMediaType( rtl::OUString::createFromAscii( "application/vnd.sun.star.help" ) );
+static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
+static rtl::OUString aHelpFilesBaseName(RTL_CONSTASCII_USTRINGPARAM("help"));
+static rtl::OUString aHelpMediaType(RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.help"));
ExtensionIteratorBase::ExtensionIteratorBase( const rtl::OUString& aLanguage )
: m_eState( USER_EXTENSIONS )
@@ -974,13 +974,13 @@ void ExtensionIteratorBase::init()
if( !m_xContext.is() )
{
throw RuntimeException(
- ::rtl::OUString::createFromAscii( "ExtensionIteratorBase::init(), no XComponentContext" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ExtensionIteratorBase::init(), no XComponentContext" )),
Reference< XInterface >() );
}
Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
m_xSFA = Reference< ucb::XSimpleFileAccess >(
- xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
+ xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )),
m_xContext ), UNO_QUERY_THROW );
m_bUserPackagesLoaded = false;
@@ -1051,7 +1051,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
if( !m_bUserPackagesLoaded )
{
Reference< XPackageManager > xUserManager =
- thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("user") );
+ thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")) );
m_aUserPackagesSeq = xUserManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
@@ -1081,7 +1081,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
if( !m_bSharedPackagesLoaded )
{
Reference< XPackageManager > xSharedManager =
- thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("shared") );
+ thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shared")) );
m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
@@ -1111,7 +1111,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
if( !m_bBundledPackagesLoaded )
{
Reference< XPackageManager > xBundledManager =
- thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("bundled") );
+ thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")) );
m_aBundledPackagesSeq = xBundledManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
@@ -1236,18 +1236,18 @@ rtl::OUString TreeFileIterator::expandURL( const rtl::OUString& aURL )
Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
xFac = Reference< uri::XUriReferenceFactory >(
- xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii(
- "com.sun.star.uri.UriReferenceFactory"), m_xContext ) , UNO_QUERY );
+ xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.uri.UriReferenceFactory")), m_xContext ) , UNO_QUERY );
if( !xFac.is() )
{
throw RuntimeException(
- ::rtl::OUString::createFromAscii( "Databases::expand(), could not instatiate UriReferenceFactory." ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Databases::expand(), could not instatiate UriReferenceFactory." )),
Reference< XInterface >() );
}
xMacroExpander = Reference< util::XMacroExpander >(
m_xContext->getValueByName(
- ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.util.theMacroExpander" ) ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" )) ),
UNO_QUERY_THROW );
}
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 4575baa..13a724c 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -55,7 +55,7 @@ Reference< xml::input::XElement > MultiPage::startChildElement(
throw (xml::sax::SAXException, RuntimeException)
{
// event
-rtl::OUString _label = rtl::OUString::createFromAscii("foo");
+ rtl::OUString _label(RTL_CONSTASCII_USTRINGPARAM("foo"));
if (_pImport->isEventElement( nUid, rLocalName ))
{
return new EventElement(
More information about the Libreoffice-commits
mailing list