diff options
Diffstat (limited to 'xmlhelp/source/cxxhelp/provider/databases.cxx')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 4f55d7571910..6c0652515ee0 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 &) |