Skip to content

C
core
Kaydet (Commit) c9337a8b authored tarafından Thorsten Behrens's avatar Thorsten Behrens
Dosyalara gözat
Seçenekler

Targeted string re-work xmlhelp/xmlscript

üst 721bb0f9
Show whitespace changes
Inline Side-by-side
Showing with 182 additions and 182 deletions
xmlhelp/source/cxxhelp/provider/content.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -163,7 +163,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() ...@@ -163,7 +163,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
rtl::OUString SAL_CALL Content::getImplementationName() rtl::OUString SAL_CALL Content::getImplementationName()
throw( uno::RuntimeException ) throw( uno::RuntimeException )
{ {
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CHelpContent" )); return rtl::OUString( "CHelpContent" );
} }
//========================================================================= //=========================================================================
...@@ -173,7 +173,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() ...@@ -173,7 +173,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
{ {
uno::Sequence< rtl::OUString > aSNS( 1 ); uno::Sequence< rtl::OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] aSNS.getArray()[ 0 ]
= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_SERVICE_NAME )); = rtl::OUString( MYUCP_CONTENT_SERVICE_NAME );
return aSNS; return aSNS;
} }
...@@ -187,7 +187,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() ...@@ -187,7 +187,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
rtl::OUString SAL_CALL Content::getContentType() rtl::OUString SAL_CALL Content::getContentType()
throw( uno::RuntimeException ) throw( uno::RuntimeException )
{ {
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_TYPE )); return rtl::OUString( MYUCP_CONTENT_TYPE );
} }
//========================================================================= //=========================================================================
...@@ -460,8 +460,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ...@@ -460,8 +460,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if ( rProp.Name == "ContentType" ) if ( rProp.Name == "ContentType" )
xRow->appendString( xRow->appendString(
rProp, rProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
"application/vnd.sun.star.help" )) ); "application/vnd.sun.star.help" ) );
else if ( rProp.Name == "Title" ) else if ( rProp.Name == "Title" )
xRow->appendString ( rProp,m_aURLParameter.get_title() ); xRow->appendString ( rProp,m_aURLParameter.get_title() );
else if ( rProp.Name == "IsReadOnly" ) else if ( rProp.Name == "IsReadOnly" )
...@@ -480,18 +480,18 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ...@@ -480,18 +480,18 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if( m_aURLParameter.isPicture() ) if( m_aURLParameter.isPicture() )
xRow->appendString( xRow->appendString(
rProp, rProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "image/gif" )) ); rtl::OUString( "image/gif" ) );
else if( m_aURLParameter.isActive() ) else if( m_aURLParameter.isActive() )
xRow->appendString( xRow->appendString(
rProp, rProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) ); rtl::OUString( "text/plain" ) );
else if( m_aURLParameter.isFile() ) else if( m_aURLParameter.isFile() )
xRow->appendString( xRow->appendString(
rProp,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/html" )) ); rProp,rtl::OUString( "text/html" ) );
else if( m_aURLParameter.isRoot() ) else if( m_aURLParameter.isRoot() )
xRow->appendString( xRow->appendString(
rProp, rProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/css" )) ); rtl::OUString( "text/css" ) );
else else
xRow->appendVoid( rProp ); xRow->appendVoid( rProp );
else if( m_aURLParameter.isModule() ) else if( m_aURLParameter.isModule() )
...@@ -542,8 +542,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ...@@ -542,8 +542,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
else if ( rProp.Name == "SearchScopes" ) else if ( rProp.Name == "SearchScopes" )
{ {
uno::Sequence< rtl::OUString > seq( 2 ); uno::Sequence< rtl::OUString > seq( 2 );
seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Heading" )); seq[0] = rtl::OUString( "Heading" );
seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FullText" )); seq[1] = rtl::OUString( "FullText" );
uno::Any aAny; uno::Any aAny;
aAny <<= seq; aAny <<= seq;
xRow->appendObject( rProp,aAny ); xRow->appendObject( rProp,aAny );
...@@ -562,7 +562,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ...@@ -562,7 +562,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
} }
else else
xRow->appendVoid( rProp ); xRow->appendVoid( rProp );
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AnchorName")) && else if( "AnchorName" == rProp.Name &&
m_aURLParameter.isFile() ) m_aURLParameter.isFile() )
xRow->appendString( rProp,m_aURLParameter.get_tag() ); xRow->appendString( rProp,m_aURLParameter.get_tag() );
else else
......
xmlhelp/source/cxxhelp/provider/databases.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -82,7 +82,7 @@ using namespace com::sun::star::deployment; ...@@ -82,7 +82,7 @@ using namespace com::sun::star::deployment;
using namespace com::sun::star::beans; using namespace com::sun::star::beans;
static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/")); static rtl::OUString aSlash("/");
rtl::OUString Databases::expandURL( const rtl::OUString& aURL ) rtl::OUString Databases::expandURL( const rtl::OUString& aURL )
{ {
...@@ -104,18 +104,18 @@ rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::X ...@@ -104,18 +104,18 @@ rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::X
Reference< XMultiComponentFactory > xSMgr( xContext->getServiceManager(), UNO_QUERY ); Reference< XMultiComponentFactory > xSMgr( xContext->getServiceManager(), UNO_QUERY );
xFac = Reference< uri::XUriReferenceFactory >( xFac = Reference< uri::XUriReferenceFactory >(
xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( xSMgr->createInstanceWithContext( rtl::OUString(
"com.sun.star.uri.UriReferenceFactory")), xContext ) , UNO_QUERY ); "com.sun.star.uri.UriReferenceFactory"), xContext ) , UNO_QUERY );
if( !xFac.is() ) if( !xFac.is() )
{ {
throw RuntimeException( throw RuntimeException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Databases::expand(), could not instatiate UriReferenceFactory." )), ::rtl::OUString( "Databases::expand(), could not instatiate UriReferenceFactory." ),
Reference< XInterface >() ); Reference< XInterface >() );
} }
xMacroExpander = Reference< util::XMacroExpander >( xMacroExpander = Reference< util::XMacroExpander >(
xContext->getValueByName( xContext->getValueByName(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" )) ), ::rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ),
UNO_QUERY_THROW ); UNO_QUERY_THROW );
} }
...@@ -153,13 +153,13 @@ Databases::Databases( sal_Bool showBasic, ...@@ -153,13 +153,13 @@ Databases::Databases( sal_Bool showBasic,
m_nCustomCSSDocLength( 0 ), m_nCustomCSSDocLength( 0 ),
m_pCustomCSSDoc( 0 ), m_pCustomCSSDoc( 0 ),
m_aCSS(styleSheet.toAsciiLowerCase()), m_aCSS(styleSheet.toAsciiLowerCase()),
newProdName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$[officename]" )) ), newProdName(rtl::OUString( "$[officename]" ) ),
newProdVersion(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$[officeversion]" )) ), newProdVersion(rtl::OUString( "$[officeversion]" ) ),
prodName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTNAME" )) ), prodName( rtl::OUString( "%PRODUCTNAME" ) ),
prodVersion( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTVERSION" )) ), prodVersion( rtl::OUString( "%PRODUCTVERSION" ) ),
vendName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%VENDORNAME" )) ), vendName( rtl::OUString( "%VENDORNAME" ) ),
vendVersion( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%VENDORVERSION" )) ), vendVersion( rtl::OUString( "%VENDORVERSION" ) ),
vendShort( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%VENDORSHORT" )) ), vendShort( rtl::OUString( "%VENDORSHORT" ) ),
m_aImagesZipPaths( imagesZipPaths ), m_aImagesZipPaths( imagesZipPaths ),
m_nSymbolsStyle( 0 ) m_nSymbolsStyle( 0 )
{ {
...@@ -182,7 +182,7 @@ Databases::Databases( sal_Bool showBasic, ...@@ -182,7 +182,7 @@ Databases::Databases( sal_Bool showBasic,
setInstallPath( instPath ); setInstallPath( instPath );
m_xSFA = Reference< ucb::XSimpleFileAccess >( m_xSFA = Reference< ucb::XSimpleFileAccess >(
m_xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )), m_xSMgr->createInstanceWithContext( rtl::OUString( "com.sun.star.ucb.SimpleFileAccess" ),
m_xContext ), UNO_QUERY_THROW ); m_xContext ), UNO_QUERY_THROW );
} }
...@@ -248,7 +248,7 @@ static bool impl_getZipFile( ...@@ -248,7 +248,7 @@ static bool impl_getZipFile(
{ {
if ( 1 + aFileName.lastIndexOf( '/' ) != aFileName.getLength() ) if ( 1 + aFileName.lastIndexOf( '/' ) != aFileName.getLength() )
{ {
aFileName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )); aFileName += rtl::OUString( "/" );
} }
aFileName += rZipName; aFileName += rZipName;
// the icons are not read when the URL is a symlink // the icons are not read when the URL is a symlink
...@@ -270,23 +270,23 @@ rtl::OString Databases::getImagesZipFileURL() ...@@ -270,23 +270,23 @@ rtl::OString Databases::getImagesZipFileURL()
try try
{ {
uno::Reference< lang::XMultiServiceFactory > xConfigProvider( uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
m_xSMgr ->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")), m_xContext), uno::UNO_QUERY_THROW); m_xSMgr ->createInstanceWithContext(::rtl::OUString("com.sun.star.configuration.ConfigurationProvider"), m_xContext), uno::UNO_QUERY_THROW);
// set root path // set root path
uno::Sequence < uno::Any > lParams(1); uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ; beans::PropertyValue aParam ;
aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); aParam.Name = ::rtl::OUString("nodepath");
aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common")); aParam.Value <<= ::rtl::OUString("org.openoffice.Office.Common");
lParams[0] = uno::makeAny(aParam); lParams[0] = uno::makeAny(aParam);
// open it // open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"),
lParams) ); lParams) );
bool bChanged = false; bool bChanged = false;
uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW); uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW);
uno::Any aResult = xAccess->getByHierarchicalName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc/SymbolSet"))); uno::Any aResult = xAccess->getByHierarchicalName(::rtl::OUString("Misc/SymbolSet"));
if ( (aResult >>= nSymbolsStyle) && m_nSymbolsStyle != nSymbolsStyle ) if ( (aResult >>= nSymbolsStyle) && m_nSymbolsStyle != nSymbolsStyle )
{ {
m_nSymbolsStyle = nSymbolsStyle; m_nSymbolsStyle = nSymbolsStyle;
...@@ -296,21 +296,21 @@ rtl::OString Databases::getImagesZipFileURL() ...@@ -296,21 +296,21 @@ rtl::OString Databases::getImagesZipFileURL()
if ( m_aImagesZipFileURL.isEmpty() || bChanged ) if ( m_aImagesZipFileURL.isEmpty() || bChanged )
{ {
rtl::OUString aImageZip, aSymbolsStyleName; rtl::OUString aImageZip, aSymbolsStyleName;
aResult = xAccess->getByHierarchicalName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc/SymbolStyle"))); aResult = xAccess->getByHierarchicalName(::rtl::OUString("Misc/SymbolStyle"));
aResult >>= aSymbolsStyleName; aResult >>= aSymbolsStyleName;
bool bFound = false; bool bFound = false;
if ( !aSymbolsStyleName.isEmpty() ) if ( !aSymbolsStyleName.isEmpty() )
{ {
rtl::OUString aZipName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_" )); rtl::OUString aZipName = rtl::OUString( "images_" );
aZipName += aSymbolsStyleName; aZipName += aSymbolsStyleName;
aZipName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".zip" )); aZipName += rtl::OUString( ".zip" );
bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip ); bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
} }
if ( ! bFound ) if ( ! bFound )
bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images.zip" )), aImageZip ); bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString( "images.zip" ), aImageZip );
if ( ! bFound ) if ( ! bFound )
aImageZip = rtl::OUString(); aImageZip = rtl::OUString();
...@@ -455,7 +455,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU ...@@ -455,7 +455,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
rtl::OUString key = processLang(Language) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) + Module; rtl::OUString key = processLang(Language) + rtl::OUString( "/" ) + Module;
std::pair< ModInfoTable::iterator,bool > aPair = std::pair< ModInfoTable::iterator,bool > aPair =
m_aModInfo.insert( ModInfoTable::value_type( key,0 ) ); m_aModInfo.insert( ModInfoTable::value_type( key,0 ) );
...@@ -466,7 +466,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU ...@@ -466,7 +466,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
{ {
osl::File cfgFile( getInstallPathAsURL() + osl::File cfgFile( getInstallPathAsURL() +
key + key +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".cfg" )) ); rtl::OUString( ".cfg" ) );
if( osl::FileBase::E_None != cfgFile.open( osl_File_OpenFlag_Read ) ) if( osl::FileBase::E_None != cfgFile.open( osl_File_OpenFlag_Read ) )
it->second = 0; it->second = 0;
...@@ -485,7 +485,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU ...@@ -485,7 +485,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
const sal_Unicode* str = fileContent.getStr(); const sal_Unicode* str = fileContent.getStr();
rtl::OUString current,lang_,program,startid,title,heading,fulltext; rtl::OUString current,lang_,program,startid,title,heading,fulltext;
rtl::OUString order(RTL_CONSTASCII_USTRINGPARAM( "1" )); rtl::OUString order( "1" );
for( sal_Int32 i = 0;i < fileContent.getLength();i++ ) for( sal_Int32 i = 0;i < fileContent.getLength();i++ )
{ {
...@@ -601,7 +601,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database, ...@@ -601,7 +601,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
rtl::OUString aFileExt( helpText ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ht")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".db" )) ); rtl::OUString aFileExt( helpText ? rtl::OUString(".ht") : rtl::OUString(".db") );
rtl::OUString dbFileName = aSlash + Database + aFileExt; rtl::OUString dbFileName = aSlash + Database + aFileExt;
rtl::OUString key; rtl::OUString key;
if( pExtensionPath == NULL ) if( pExtensionPath == NULL )
...@@ -627,7 +627,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database, ...@@ -627,7 +627,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
rtl::OUString fileNameDBHelp( fileURL ); rtl::OUString fileNameDBHelp( fileURL );
//Extensions always use the new format //Extensions always use the new format
if( pExtensionPath != NULL ) if( pExtensionPath != NULL )
fileNameDBHelp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" )); fileNameDBHelp += rtl::OUString( "_" );
//SimpleFileAccess takes file URLs as arguments!!! Using filenames works accidentally but //SimpleFileAccess takes file URLs as arguments!!! Using filenames works accidentally but
//fails for example when using long path names on Windows (starting with \\?\) //fails for example when using long path names on Windows (starting with \\?\)
if( m_xSFA->exists( fileNameDBHelp ) ) if( m_xSFA->exists( fileNameDBHelp ) )
...@@ -665,28 +665,28 @@ Databases::getCollator( const rtl::OUString& Language, ...@@ -665,28 +665,28 @@ Databases::getCollator( const rtl::OUString& Language,
{ {
it->second = it->second =
Reference< XCollator > ( Reference< XCollator > (
m_xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Collator" )), m_xSMgr->createInstanceWithContext( rtl::OUString( "com.sun.star.i18n.Collator" ),
m_xContext ), UNO_QUERY ); m_xContext ), UNO_QUERY );
rtl::OUString langStr = processLang(Language); rtl::OUString langStr = processLang(Language);
rtl::OUString countryStr = country(Language); rtl::OUString countryStr = country(Language);
if( countryStr.isEmpty() ) if( countryStr.isEmpty() )
{ {
if( langStr.compareToAscii("de") == 0 ) if( langStr.compareToAscii("de") == 0 )
countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")); countryStr = rtl::OUString("DE");
else if( langStr.compareToAscii("en") == 0 ) else if( langStr.compareToAscii("en") == 0 )
countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); countryStr = rtl::OUString("US");
else if( langStr.compareToAscii("es") == 0 ) else if( langStr.compareToAscii("es") == 0 )
countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ES")); countryStr = rtl::OUString("ES");
else if( langStr.compareToAscii("it") == 0 ) else if( langStr.compareToAscii("it") == 0 )
countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IT")); countryStr = rtl::OUString("IT");
else if( langStr.compareToAscii("fr") == 0 ) else if( langStr.compareToAscii("fr") == 0 )
countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FR")); countryStr = rtl::OUString("FR");
else if( langStr.compareToAscii("sv") == 0 ) else if( langStr.compareToAscii("sv") == 0 )
countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SE")); countryStr = rtl::OUString("SE");
else if( langStr.compareToAscii("ja") == 0 ) else if( langStr.compareToAscii("ja") == 0 )
countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JP")); countryStr = rtl::OUString("JP");
else if( langStr.compareToAscii("ko") == 0 ) else if( langStr.compareToAscii("ko") == 0 )
countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KR")); countryStr = rtl::OUString("KR");
} }
it->second->loadDefaultCollator( Locale( langStr, it->second->loadDefaultCollator( Locale( langStr,
countryStr, countryStr,
...@@ -901,7 +901,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, ...@@ -901,7 +901,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
rtl::OUString key = processLang(Language) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) + Database; rtl::OUString key = processLang(Language) + rtl::OUString( "/" ) + Database;
std::pair< KeywordInfoTable::iterator,bool > aPair = std::pair< KeywordInfoTable::iterator,bool > aPair =
m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,0 ) ); m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,0 ) );
...@@ -921,7 +921,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, ...@@ -921,7 +921,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
rtl::OUString fileNameDBHelp( fileURL ); rtl::OUString fileNameDBHelp( fileURL );
if( bExtension ) if( bExtension )
fileNameDBHelp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" )); fileNameDBHelp += rtl::OUString( "_" );
if( m_xSFA->exists( fileNameDBHelp ) ) if( m_xSFA->exists( fileNameDBHelp ) )
{ {
DBHelp aDBHelp( fileNameDBHelp, m_xSFA ); DBHelp aDBHelp( fileNameDBHelp, m_xSFA );
...@@ -1077,14 +1077,14 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja ...@@ -1077,14 +1077,14 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
// let ZipPackage be used ( no manifest.xml is required ) // let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg; beans::NamedValue aArg;
aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) ); aArg.Name = ::rtl::OUString( "StorageFormat" );
aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
aArguments[ 1 ] <<= aArg; aArguments[ 1 ] <<= aArg;
Reference< XInterface > xIfc Reference< XInterface > xIfc
= m_xSMgr->createInstanceWithArgumentsAndContext( = m_xSMgr->createInstanceWithArgumentsAndContext(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
"com.sun.star.packages.comp.ZipPackage" )), "com.sun.star.packages.comp.ZipPackage" ),
aArguments, m_xContext ); aArguments, m_xContext );
if ( xIfc.is() ) if ( xIfc.is() )
...@@ -1231,7 +1231,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, ...@@ -1231,7 +1231,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
{ {
// #i50760: "default" needs to adapt HC mode // #i50760: "default" needs to adapt HC mode
uno::Reference< awt::XToolkit > xToolkit = uno::Reference< awt::XToolkit >( uno::Reference< awt::XToolkit > xToolkit = uno::Reference< awt::XToolkit >(
::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ) ), uno::UNO_QUERY ); ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( "com.sun.star.awt.Toolkit" ) ), uno::UNO_QUERY );
if ( xToolkit.is() ) if ( xToolkit.is() )
{ {
uno::Reference< awt::XExtendedToolkit > xExtToolkit( xToolkit, uno::UNO_QUERY ); uno::Reference< awt::XExtendedToolkit > xExtToolkit( xToolkit, uno::UNO_QUERY );
...@@ -1243,9 +1243,9 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, ...@@ -1243,9 +1243,9 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
uno::Reference< awt::XVclWindowPeer > xVclWindowPeer( xTopWindow, uno::UNO_QUERY ); uno::Reference< awt::XVclWindowPeer > xVclWindowPeer( xTopWindow, uno::UNO_QUERY );
if ( xVclWindowPeer.is() ) if ( xVclWindowPeer.is() )
{ {
uno::Any aHCMode = xVclWindowPeer->getProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HighContrastMode" )) ); uno::Any aHCMode = xVclWindowPeer->getProperty( rtl::OUString( "HighContrastMode" ) );
if ( ( aHCMode >>= bHighContrastMode ) && bHighContrastMode ) if ( ( aHCMode >>= bHighContrastMode ) && bHighContrastMode )
aCSS = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "highcontrastblack" )); aCSS = rtl::OUString( "highcontrastblack" );
} }
} }
} }
...@@ -1259,14 +1259,14 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, ...@@ -1259,14 +1259,14 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
fileURL = fileURL =
getInstallPathAsURL() + getInstallPathAsURL() +
processLang( Language ) + processLang( Language ) +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) + rtl::OUString( "/" ) +
aCSS + aCSS +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".css" )); rtl::OUString( ".css" );
else if( retry == 1 ) else if( retry == 1 )
fileURL = fileURL =
getInstallPathAsURL() + getInstallPathAsURL() +
aCSS + aCSS +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".css" )); rtl::OUString( ".css" );
osl::DirectoryItem aDirItem; osl::DirectoryItem aDirItem;
osl::File aFile( fileURL ); osl::File aFile( fileURL );
...@@ -1291,7 +1291,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, ...@@ -1291,7 +1291,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
if ( !retry && error && bHighContrastMode ) if ( !retry && error && bHighContrastMode )
{ {
// fall back to default css // fall back to default css
aCSS = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "default" )); aCSS = rtl::OUString( "default" );
retry = 2; retry = 2;
bHighContrastMode = sal_False; bHighContrastMode = sal_False;
} }
...@@ -1398,7 +1398,7 @@ void Databases::setInstallPath( const rtl::OUString& aInstDir ) ...@@ -1398,7 +1398,7 @@ void Databases::setInstallPath( const rtl::OUString& aInstDir )
//TODO: check returned error code //TODO: check returned error code
if( m_aInstallDirectory.lastIndexOf( sal_Unicode( '/' ) ) != m_aInstallDirectory.getLength() - 1 ) if( m_aInstallDirectory.lastIndexOf( sal_Unicode( '/' ) ) != m_aInstallDirectory.getLength() - 1 )
m_aInstallDirectory += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )); m_aInstallDirectory += rtl::OUString( "/" );
} }
...@@ -1438,20 +1438,20 @@ void ExtensionIteratorBase::init() ...@@ -1438,20 +1438,20 @@ void ExtensionIteratorBase::init()
if (xProps.is()) if (xProps.is())
{ {
xProps->getPropertyValue( xProps->getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= m_xContext; ::rtl::OUString( "DefaultContext" ) ) >>= m_xContext;
OSL_ASSERT( m_xContext.is() ); OSL_ASSERT( m_xContext.is() );
} }
} }
if( !m_xContext.is() ) if( !m_xContext.is() )
{ {
throw RuntimeException( throw RuntimeException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ExtensionIteratorBase::init(), no XComponentContext" )), ::rtl::OUString( "ExtensionIteratorBase::init(), no XComponentContext" ),
Reference< XInterface >() ); Reference< XInterface >() );
} }
Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY ); Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
m_xSFA = Reference< ucb::XSimpleFileAccess >( m_xSFA = Reference< ucb::XSimpleFileAccess >(
xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )), xSMgr->createInstanceWithContext( rtl::OUString( "com.sun.star.ucb.SimpleFileAccess" ),
m_xContext ), UNO_QUERY_THROW ); m_xContext ), UNO_QUERY_THROW );
m_bUserPackagesLoaded = false; m_bUserPackagesLoaded = false;
...@@ -1491,7 +1491,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP ...@@ -1491,7 +1491,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
} }
if( bRegistered ) if( bRegistered )
{ {
rtl::OUString aHelpMediaType( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.help" ) ); rtl::OUString aHelpMediaType( "application/vnd.sun.star.help" );
if( xPackage->isBundle() ) if( xPackage->isBundle() )
{ {
Sequence< Reference< deployment::XPackage > > aPkgSeq = xPackage->getBundle Sequence< Reference< deployment::XPackage > > aPkgSeq = xPackage->getBundle
...@@ -1535,7 +1535,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack ...@@ -1535,7 +1535,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
{ {
Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext); Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
m_aUserPackagesSeq = xExtensionManager->getDeployedExtensions m_aUserPackagesSeq = xExtensionManager->getDeployedExtensions
( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); ( rtl::OUString("user"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
m_bUserPackagesLoaded = true; m_bUserPackagesLoaded = true;
} }
...@@ -1563,7 +1563,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa ...@@ -1563,7 +1563,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
{ {
Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext); Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
m_aSharedPackagesSeq = xExtensionManager->getDeployedExtensions m_aSharedPackagesSeq = xExtensionManager->getDeployedExtensions
( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shared")), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); ( rtl::OUString("shared"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
m_bSharedPackagesLoaded = true; m_bSharedPackagesLoaded = true;
} }
...@@ -1591,7 +1591,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP ...@@ -1591,7 +1591,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
{ {
Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext); Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
m_aBundledPackagesSeq = xExtensionManager->getDeployedExtensions m_aBundledPackagesSeq = xExtensionManager->getDeployedExtensions
( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); ( rtl::OUString("bundled"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
m_bBundledPackagesLoaded = true; m_bBundledPackagesLoaded = true;
} }
...@@ -1826,7 +1826,7 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension ) ...@@ -1826,7 +1826,7 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
aRetFile = aRetFile =
m_rDatabases.getInstallPathAsURL() + m_rDatabases.getInstallPathAsURL() +
m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule + m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".key" )); rtl::OUString( ".key" );
o_rbExtension = false; o_rbExtension = false;
...@@ -1887,7 +1887,7 @@ rtl::OUString KeyDataBaseFileIterator::implGetDbFileFromPackage ...@@ -1887,7 +1887,7 @@ rtl::OUString KeyDataBaseFileIterator::implGetDbFileFromPackage
( Reference< deployment::XPackage > xPackage ) ( Reference< deployment::XPackage > xPackage )
{ {
rtl::OUString aExpandedURL = rtl::OUString aExpandedURL =
implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".key" )), xPackage ); implGetFileFromPackage( rtl::OUString( ".key" ), xPackage );
return aExpandedURL; return aExpandedURL;
} }
...@@ -1960,7 +1960,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage ...@@ -1960,7 +1960,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
Reference< XHierarchicalNameAccess > xNA; Reference< XHierarchicalNameAccess > xNA;
rtl::OUString zipFile = rtl::OUString zipFile =
implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".jar" )), xPackage ); implGetFileFromPackage( rtl::OUString( ".jar" ), xPackage );
try try
{ {
...@@ -1969,15 +1969,15 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage ...@@ -1969,15 +1969,15 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
// let ZipPackage be used ( no manifest.xml is required ) // let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg; beans::NamedValue aArg;
aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) ); aArg.Name = ::rtl::OUString( "StorageFormat" );
aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
aArguments[ 1 ] <<= aArg; aArguments[ 1 ] <<= aArg;
Reference< XMultiComponentFactory >xSMgr( m_xContext->getServiceManager(), UNO_QUERY ); Reference< XMultiComponentFactory >xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
Reference< XInterface > xIfc Reference< XInterface > xIfc
= xSMgr->createInstanceWithArgumentsAndContext( = xSMgr->createInstanceWithArgumentsAndContext(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
"com.sun.star.packages.comp.ZipPackage" )), "com.sun.star.packages.comp.ZipPackage" ),
aArguments, m_xContext ); aArguments, m_xContext );
if ( xIfc.is() ) if ( xIfc.is() )
...@@ -2030,7 +2030,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o ...@@ -2030,7 +2030,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
aIndexFolder = aIndexFolder =
m_rDatabases.getInstallPathAsURL() + m_rDatabases.getInstallPathAsURL() +
m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule + m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".idxl" )); rtl::OUString( ".idxl" );
o_rbTemporary = false; o_rbTemporary = false;
o_rbExtension = false; o_rbExtension = false;
...@@ -2090,7 +2090,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o ...@@ -2090,7 +2090,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary, Reference< deployment::XPackage > xPackage ) rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary, Reference< deployment::XPackage > xPackage )
{ {
rtl::OUString aIndexFolder = rtl::OUString aIndexFolder =
implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".idxl" )), xPackage ); implGetFileFromPackage( rtl::OUString( ".idxl" ), xPackage );
o_rbTemporary = false; o_rbTemporary = false;
if( !m_xSFA->isFolder( aIndexFolder ) ) if( !m_xSFA->isFolder( aIndexFolder ) )
...@@ -2103,7 +2103,7 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp ...@@ -2103,7 +2103,7 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
bool bIsWriteAccess = false; bool bIsWriteAccess = false;
try try
{ {
rtl::OUString aCreateTestFolder = aLangURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CreateTestFolder" )); rtl::OUString aCreateTestFolder = aLangURL + rtl::OUString( "CreateTestFolder" );
m_xSFA->createFolder( aCreateTestFolder ); m_xSFA->createFolder( aCreateTestFolder );
if( m_xSFA->isFolder( aCreateTestFolder ) ) if( m_xSFA->isFolder( aCreateTestFolder ) )
bIsWriteAccess = true; bIsWriteAccess = true;
...@@ -2124,9 +2124,9 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp ...@@ -2124,9 +2124,9 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
if( nLastSlash != -1 ) if( nLastSlash != -1 )
aLang = aLangURL.copy( nLastSlash + 1 ); aLang = aLangURL.copy( nLastSlash + 1 );
else else
aLang = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "en" )); aLang = rtl::OUString( "en" );
rtl::OUString aMod(RTL_CONSTASCII_USTRINGPARAM("help")); rtl::OUString aMod("help");
rtl::OUString aZipDir = aLangURL; rtl::OUString aZipDir = aLangURL;
if( !bIsWriteAccess ) if( !bIsWriteAccess )
...@@ -2154,9 +2154,9 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp ...@@ -2154,9 +2154,9 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
aIndexer.indexDocuments(); aIndexer.indexDocuments();
if( bIsWriteAccess ) if( bIsWriteAccess )
aIndexFolder = implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".idxl" )), xPackage ); aIndexFolder = implGetFileFromPackage( rtl::OUString( ".idxl" ), xPackage );
else else
aIndexFolder = aZipDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/help.idxl" )); aIndexFolder = aZipDir + rtl::OUString( "/help.idxl" );
} }
catch (const Exception &) catch (const Exception &)
{ {
......
xmlhelp/source/cxxhelp/provider/provider.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -67,7 +67,7 @@ ContentProvider::ContentProvider( ...@@ -67,7 +67,7 @@ ContentProvider::ContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& rSMgr ) const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
: ::ucbhelper::ContentProviderImplHelper( rSMgr ), : ::ucbhelper::ContentProviderImplHelper( rSMgr ),
isInitialized( false ), isInitialized( false ),
m_aScheme(RTL_CONSTASCII_USTRINGPARAM(MYUCP_URL_SCHEME)), m_aScheme(MYUCP_URL_SCHEME),
m_pDatabases( 0 ) m_pDatabases( 0 )
{ {
} }
...@@ -120,7 +120,7 @@ rtl::OUString SAL_CALL ContentProvider::getImplementationName() ...@@ -120,7 +120,7 @@ rtl::OUString SAL_CALL ContentProvider::getImplementationName()
rtl::OUString ContentProvider::getImplementationName_Static() rtl::OUString ContentProvider::getImplementationName_Static()
{ {
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHelpContentProvider" )); return rtl::OUString("CHelpContentProvider" );
} }
sal_Bool SAL_CALL sal_Bool SAL_CALL
...@@ -160,11 +160,11 @@ ContentProvider::getSupportedServiceNames_Static() ...@@ -160,11 +160,11 @@ ContentProvider::getSupportedServiceNames_Static()
{ {
uno::Sequence< rtl::OUString > aSNS( 2 ); uno::Sequence< rtl::OUString > aSNS( 2 );
aSNS.getArray()[ 0 ] = aSNS.getArray()[ 0 ] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 )); MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 );
aSNS.getArray()[ 1 ] = aSNS.getArray()[ 1 ] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 )); MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 );
return aSNS; return aSNS;
} }
...@@ -275,7 +275,7 @@ void ContentProvider::init() ...@@ -275,7 +275,7 @@ void ContentProvider::init()
rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) ); rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( instPath.isEmpty() ) if( instPath.isEmpty() )
// try to determine path from default // try to determine path from default
instPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$(instpath)/help" )); instPath = rtl::OUString( "$(instpath)/help" );
// replace anything like $(instpath); // replace anything like $(instpath);
subst( instPath ); subst( instPath );
...@@ -288,7 +288,7 @@ void ContentProvider::init() ...@@ -288,7 +288,7 @@ void ContentProvider::init()
if( xAccess.is() ) if( xAccess.is() )
{ {
uno::Any aAny = uno::Any aAny =
xAccess->getByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Help" )) ); xAccess->getByName( rtl::OUString( "Help" ) );
aAny >>= m_xContainer; aAny >>= m_xContainer;
if( m_xContainer.is() ) if( m_xContainer.is() )
m_xContainer->addContainerListener( this ); m_xContainer->addContainerListener( this );
...@@ -307,21 +307,21 @@ void ContentProvider::init() ...@@ -307,21 +307,21 @@ void ContentProvider::init()
try try
{ {
uno::Reference< lang::XMultiServiceFactory > xConfigProvider( uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
m_xSMgr ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), uno::UNO_QUERY_THROW); m_xSMgr ->createInstance(::rtl::OUString("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY_THROW);
uno::Sequence < uno::Any > lParams(1); uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ; beans::PropertyValue aParam ;
aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); aParam.Name = ::rtl::OUString("nodepath");
aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Product")); aParam.Value <<= ::rtl::OUString("/org.openoffice.Setup/Product");
lParams[0] = uno::makeAny(aParam); lParams[0] = uno::makeAny(aParam);
// open it // open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"),
lParams) ); lParams) );
uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY); uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
uno::Any aRet = xDirectAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension"))); uno::Any aRet = xDirectAccess->getByName(::rtl::OUString("ooSetupExtension"));
aRet >>= setupextension; aRet >>= setupextension;
} }
...@@ -331,7 +331,7 @@ void ContentProvider::init() ...@@ -331,7 +331,7 @@ void ContentProvider::init()
rtl::OUString productversion( rtl::OUString productversion(
setupversion + setupversion +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) + rtl::OUString( " " ) +
setupextension ); setupextension );
uno::Sequence< rtl::OUString > aImagesZipPaths( 2 ); uno::Sequence< rtl::OUString > aImagesZipPaths( 2 );
...@@ -341,7 +341,7 @@ void ContentProvider::init() ...@@ -341,7 +341,7 @@ void ContentProvider::init()
subst( aPath ); subst( aPath );
aImagesZipPaths[ 0 ] = aPath; aImagesZipPaths[ 0 ] = aPath;
aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config")); aPath = rtl::OUString("$BRAND_BASE_DIR/share/config");
rtl::Bootstrap::expandMacros(aPath); rtl::Bootstrap::expandMacros(aPath);
aImagesZipPaths[ 1 ] = aPath; aImagesZipPaths[ 1 ] = aPath;
...@@ -351,7 +351,7 @@ void ContentProvider::init() ...@@ -351,7 +351,7 @@ void ContentProvider::init()
if (xProps.is()) if (xProps.is())
{ {
xProps->getPropertyValue( xProps->getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext; ::rtl::OUString( "DefaultContext" ) ) >>= xContext;
OSL_ASSERT( xContext.is() ); OSL_ASSERT( xContext.is() );
} }
...@@ -374,8 +374,8 @@ ContentProvider::getConfiguration() const ...@@ -374,8 +374,8 @@ ContentProvider::getConfiguration() const
try try
{ {
rtl::OUString sProviderService = rtl::OUString sProviderService =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
"com.sun.star.configuration.ConfigurationProvider" )); "com.sun.star.configuration.ConfigurationProvider" );
sProvider = sProvider =
uno::Reference< lang::XMultiServiceFactory >( uno::Reference< lang::XMultiServiceFactory >(
m_xSMgr->createInstance( sProviderService ), m_xSMgr->createInstance( sProviderService ),
...@@ -401,8 +401,8 @@ ContentProvider::getHierAccess( ...@@ -401,8 +401,8 @@ ContentProvider::getHierAccess(
{ {
uno::Sequence< uno::Any > seq( 1 ); uno::Sequence< uno::Any > seq( 1 );
rtl::OUString sReaderService( rtl::OUString sReaderService(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
"com.sun.star.configuration.ConfigurationAccess" )) ); "com.sun.star.configuration.ConfigurationAccess" ) );
seq[ 0 ] <<= rtl::OUString::createFromAscii( file ); seq[ 0 ] <<= rtl::OUString::createFromAscii( file );
...@@ -479,8 +479,8 @@ void ContentProvider::subst( rtl::OUString& instpath ) const ...@@ -479,8 +479,8 @@ void ContentProvider::subst( rtl::OUString& instpath ) const
xCfgMgr = xCfgMgr =
uno::Reference< frame::XConfigManager >( uno::Reference< frame::XConfigManager >(
m_xSMgr->createInstance( m_xSMgr->createInstance(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
"com.sun.star.config.SpecialConfigManager" )) ), "com.sun.star.config.SpecialConfigManager" ) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
} }
catch( const uno::Exception&) catch( const uno::Exception&)
......
xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -503,12 +503,12 @@ ResultSetBase::getPropertySetInfo() ...@@ -503,12 +503,12 @@ ResultSetBase::getPropertySetInfo()
throw( uno::RuntimeException) throw( uno::RuntimeException)
{ {
uno::Sequence< beans::Property > seq(2); uno::Sequence< beans::Property > seq(2);
seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )); seq[0].Name = rtl::OUString( "RowCount" );
seq[0].Handle = -1; seq[0].Handle = -1;
seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) ); seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
seq[0].Attributes = beans::PropertyAttribute::READONLY; seq[0].Attributes = beans::PropertyAttribute::READONLY;
seq[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )); seq[1].Name = rtl::OUString( "IsRowCountFinal" );
seq[1].Handle = -1; seq[1].Handle = -1;
seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) ); seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) );
seq[1].Attributes = beans::PropertyAttribute::READONLY; seq[1].Attributes = beans::PropertyAttribute::READONLY;
...@@ -529,8 +529,8 @@ void SAL_CALL ResultSetBase::setPropertyValue( ...@@ -529,8 +529,8 @@ void SAL_CALL ResultSetBase::setPropertyValue(
{ {
(void)aValue; (void)aValue;
if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) || if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) ||
aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) ) aPropertyName == rtl::OUString( "RowCount" ) )
return; return;
throw beans::UnknownPropertyException(); throw beans::UnknownPropertyException();
...@@ -543,13 +543,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue( ...@@ -543,13 +543,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
lang::WrappedTargetException, lang::WrappedTargetException,
uno::RuntimeException) uno::RuntimeException)
{ {
if( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) ) if( PropertyName == rtl::OUString( "IsRowCountFinal" ) )
{ {
uno::Any aAny; uno::Any aAny;
aAny <<= m_bRowCountFinal; aAny <<= m_bRowCountFinal;
return aAny; return aAny;
} }
else if ( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) ) else if ( PropertyName == rtl::OUString( "RowCount" ) )
{ {
uno::Any aAny; uno::Any aAny;
sal_Int32 count = m_aItems.size(); sal_Int32 count = m_aItems.size();
...@@ -568,7 +568,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( ...@@ -568,7 +568,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
lang::WrappedTargetException, lang::WrappedTargetException,
uno::RuntimeException) uno::RuntimeException)
{ {
if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) ) if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) )
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pIsFinalListeners ) if ( ! m_pIsFinalListeners )
...@@ -577,7 +577,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( ...@@ -577,7 +577,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
m_pIsFinalListeners->addInterface( xListener ); m_pIsFinalListeners->addInterface( xListener );
} }
else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) ) else if ( aPropertyName == rtl::OUString( "RowCount" ) )
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pRowCountListeners ) if ( ! m_pRowCountListeners )
...@@ -597,13 +597,13 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener( ...@@ -597,13 +597,13 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
lang::WrappedTargetException, lang::WrappedTargetException,
uno::RuntimeException) uno::RuntimeException)
{ {
if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) && if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) &&
m_pIsFinalListeners ) m_pIsFinalListeners )
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
m_pIsFinalListeners->removeInterface( aListener ); m_pIsFinalListeners->removeInterface( aListener );
} }
else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) && else if ( aPropertyName == rtl::OUString( "RowCount" ) &&
m_pRowCountListeners ) m_pRowCountListeners )
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
......
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -94,7 +94,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF ...@@ -94,7 +94,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
m_aURLParameter( aURLParameter ) m_aURLParameter( aURLParameter )
{ {
Reference< XTransliteration > xTrans( Reference< XTransliteration > xTrans(
xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Transliteration" )) ), xMSF->createInstance( rtl::OUString( "com.sun.star.i18n.Transliteration" ) ),
UNO_QUERY ); UNO_QUERY );
Locale aLocale( aURLParameter.get_language(), Locale aLocale( aURLParameter.get_language(),
rtl::OUString(), rtl::OUString(),
...@@ -323,8 +323,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF ...@@ -323,8 +323,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
delete pIndexFolderVector; delete pIndexFolderVector;
} }
sal_Int32 replIdx = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" )).getLength(); sal_Int32 replIdx = rtl::OUString( "#HLP#" ).getLength();
rtl::OUString replWith = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" )); rtl::OUString replWith = rtl::OUString( "vnd.sun.star.help://" );
int nResultCount = aCompleteResultVector.size(); int nResultCount = aCompleteResultVector.size();
for( int r = 0 ; r < nResultCount ; ++r ) for( int r = 0 ; r < nResultCount ; ++r )
...@@ -338,16 +338,16 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF ...@@ -338,16 +338,16 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
m_aIdents.resize( m_aPath.size() ); m_aIdents.resize( m_aPath.size() );
Command aCommand; Command aCommand;
aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" )); aCommand.Name = rtl::OUString( "getPropertyValues" );
aCommand.Argument <<= m_sProperty; aCommand.Argument <<= m_sProperty;
for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow ) 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] =
m_aPath[m_nRow] + m_aPath[m_nRow] +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" )) + rtl::OUString( "?Language=" ) +
m_aURLParameter.get_language() + m_aURLParameter.get_language() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" )) + rtl::OUString( "&System=" ) +
m_aURLParameter.get_system(); m_aURLParameter.get_system();
uno::Reference< XContent > content = queryContent(); uno::Reference< XContent > content = queryContent();
......
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -55,17 +55,17 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< lang::XMultiServiceFac ...@@ -55,17 +55,17 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< lang::XMultiServiceFac
m_aIdents.resize( m_aPath.size() ); m_aIdents.resize( m_aPath.size() );
Command aCommand; Command aCommand;
aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" )); aCommand.Name = rtl::OUString( "getPropertyValues" );
aCommand.Argument <<= m_sProperty; aCommand.Argument <<= m_sProperty;
for( sal_uInt32 i = 0; i < m_aPath.size(); ++i ) for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
{ {
m_aPath[i] = m_aPath[i] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" )) + rtl::OUString( "vnd.sun.star.help://" ) +
m_aPath[i] + m_aPath[i] +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" )) + rtl::OUString( "?Language=" ) +
m_aURLParameter.get_language() + m_aURLParameter.get_language() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" )) + rtl::OUString( "&System=" ) +
m_aURLParameter.get_system(); m_aURLParameter.get_system();
m_nRow = sal_Int32( i ); m_nRow = sal_Int32( i );
......
xmlhelp/source/cxxhelp/provider/urlparameter.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -179,7 +179,7 @@ rtl::OUString URLParameter::get_title() ...@@ -179,7 +179,7 @@ rtl::OUString URLParameter::get_title()
m_aTitle = inf->get_title(); m_aTitle = inf->get_title();
} }
else // This must be the root else // This must be the root
m_aTitle = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("root")); m_aTitle = rtl::OUString("root");
return m_aTitle; return m_aTitle;
} }
...@@ -274,7 +274,7 @@ rtl::OUString URLParameter::get_the_jar() ...@@ -274,7 +274,7 @@ rtl::OUString URLParameter::get_the_jar()
return m_aJar; return m_aJar;
} }
else else
return get_module() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".jar")); return get_module() + rtl::OUString(".jar");
} }
...@@ -282,7 +282,7 @@ rtl::OUString URLParameter::get_the_jar() ...@@ -282,7 +282,7 @@ rtl::OUString URLParameter::get_the_jar()
void URLParameter::readBerkeley() void URLParameter::readBerkeley()
{ {
static rtl::OUString aQuestionMark(RTL_CONSTASCII_USTRINGPARAM("?")); static rtl::OUString aQuestionMark("?");
if( get_id().compareToAscii("") == 0 ) if( get_id().compareToAscii("") == 0 )
return; return;
...@@ -444,7 +444,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr, ...@@ -444,7 +444,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
{ {
Reference< XInputStream > xStream; Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA = Reference< XHierarchicalNameAccess > xNA =
m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )), m_pDatabases->jarFile( rtl::OUString( "picture.jar" ),
get_language() ); get_language() );
rtl::OUString path = get_path(); rtl::OUString path = get_path();
...@@ -514,7 +514,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr, ...@@ -514,7 +514,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
{ {
Reference< XInputStream > xStream; Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA = Reference< XHierarchicalNameAccess > xNA =
m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )), m_pDatabases->jarFile( rtl::OUString( "picture.jar" ),
get_language() ); get_language() );
rtl::OUString path = get_path(); rtl::OUString path = get_path();
...@@ -568,7 +568,7 @@ bool URLParameter::scheme() ...@@ -568,7 +568,7 @@ bool URLParameter::scheme()
if( aLastStr.compareToAscii( "DbPAR=" ) == 0 ) if( aLastStr.compareToAscii( "DbPAR=" ) == 0 )
{ {
rtl::OUString aNewExpr = m_aExpr.copy( 0, 20 ); rtl::OUString aNewExpr = m_aExpr.copy( 0, 20 );
rtl::OUString aSharedStr(RTL_CONSTASCII_USTRINGPARAM("shared")); rtl::OUString aSharedStr("shared");
aNewExpr += aSharedStr; aNewExpr += aSharedStr;
aNewExpr += m_aExpr.copy( 20 ); aNewExpr += m_aExpr.copy( 20 );
aNewExpr += aSharedStr; aNewExpr += aSharedStr;
...@@ -681,7 +681,7 @@ bool URLParameter::query() ...@@ -681,7 +681,7 @@ bool URLParameter::query()
if( m_aQuery.isEmpty() ) if( m_aQuery.isEmpty() )
m_aQuery = value; m_aQuery = value;
else else
m_aQuery += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) + value ); m_aQuery += ( rtl::OUString( " " ) + value );
} }
else if( parameter.compareToAscii( "Scope" ) == 0 ) else if( parameter.compareToAscii( "Scope" ) == 0 )
m_aScope = value; m_aScope = value;
...@@ -1006,12 +1006,12 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, ...@@ -1006,12 +1006,12 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
if (xProps.is()) if (xProps.is())
{ {
xProps->getPropertyValue( xProps->getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext; ::rtl::OUString( "DefaultContext" ) ) >>= xContext;
} }
if( !xContext.is() ) if( !xContext.is() )
{ {
throw RuntimeException( throw RuntimeException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" )), ::rtl::OUString( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" ),
Reference< XInterface >() ); Reference< XInterface >() );
} }
......
xmlhelp/source/cxxhelp/test/searchdemo.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -76,21 +76,21 @@ int main( int argc,char* argv[] ) ...@@ -76,21 +76,21 @@ int main( int argc,char* argv[] )
try try
{ {
rtl::OUString installDir(RTL_CONSTASCII_USTRINGPARAM("//./e|/index/")); rtl::OUString installDir("//./e|/index/");
QueryProcessor queryProcessor( installDir ); QueryProcessor queryProcessor( installDir );
std::vector<rtl::OUString> Query(2); std::vector<rtl::OUString> Query(2);
Query[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text*" )); Query[0] = rtl::OUString( "text*" );
Query[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "abbildung" )); Query[1] = rtl::OUString( "abbildung" );
rtl::OUString Scope = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "headingheading" )); rtl::OUString Scope = rtl::OUString( "headingheading" );
int HitCount = 40; int HitCount = 40;
QueryStatement queryStatement( HitCount,Query,Scope ); QueryStatement queryStatement( HitCount,Query,Scope );
queryResults = queryProcessor.processQuery( queryStatement ); queryResults = queryProcessor.processQuery( queryStatement );
rtl::OUString translations[2]; rtl::OUString translations[2];
translations[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" )); translations[0] = rtl::OUString( "#HLP#" );
translations[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" )); translations[1] = rtl::OUString( "vnd.sun.star.help://" );
PrefixTranslator* translator = PrefixTranslator::makePrefixTranslator( translations,2 ); PrefixTranslator* translator = PrefixTranslator::makePrefixTranslator( translations,2 );
......
xmlhelp/source/treeview/tvfactory.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -145,7 +145,7 @@ TVFactory::createInstance( ...@@ -145,7 +145,7 @@ TVFactory::createInstance(
aAny <<= rtl::OUString(); aAny <<= rtl::OUString();
Sequence< Any > seq( 1 ); Sequence< Any > seq( 1 );
seq[0] <<= PropertyValue( seq[0] <<= PropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "nodepath" )), rtl::OUString( "nodepath" ),
-1, -1,
aAny, aAny,
PropertyState_DIRECT_VALUE ); PropertyState_DIRECT_VALUE );
...@@ -206,7 +206,7 @@ TVFactory::getAvailableServiceNames( ) ...@@ -206,7 +206,7 @@ TVFactory::getAvailableServiceNames( )
throw( RuntimeException ) throw( RuntimeException )
{ {
Sequence< rtl::OUString > seq( 1 ); Sequence< rtl::OUString > seq( 1 );
seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.HierarchyDataReadAccess" )); seq[0] = rtl::OUString( "com.sun.star.ucb.HierarchyDataReadAccess" );
return seq; return seq;
} }
...@@ -218,7 +218,7 @@ TVFactory::getAvailableServiceNames( ) ...@@ -218,7 +218,7 @@ TVFactory::getAvailableServiceNames( )
rtl::OUString SAL_CALL rtl::OUString SAL_CALL
TVFactory::getImplementationName_static() TVFactory::getImplementationName_static()
{ {
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.TreeViewImpl" )); return rtl::OUString( "com.sun.star.help.TreeViewImpl" );
} }
...@@ -226,8 +226,8 @@ Sequence< rtl::OUString > SAL_CALL ...@@ -226,8 +226,8 @@ Sequence< rtl::OUString > SAL_CALL
TVFactory::getSupportedServiceNames_static() TVFactory::getSupportedServiceNames_static()
{ {
Sequence< rtl::OUString > seq( 2 ); Sequence< rtl::OUString > seq( 2 );
seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.TreeView" )); seq[0] = rtl::OUString( "com.sun.star.help.TreeView" );
seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.HiearchyDataSource" )); seq[1] = rtl::OUString( "com.sun.star.ucb.HiearchyDataSource" );
return seq; return seq;
} }
......
xmlhelp/source/treeview/tvread.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -185,11 +185,11 @@ using namespace com::sun::star::deployment; ...@@ -185,11 +185,11 @@ using namespace com::sun::star::deployment;
ConfigData::ConfigData() ConfigData::ConfigData()
: prodName(RTL_CONSTASCII_USTRINGPARAM("%PRODUCTNAME")), : prodName("%PRODUCTNAME"),
prodVersion(RTL_CONSTASCII_USTRINGPARAM("%PRODUCTVERSION")), prodVersion("%PRODUCTVERSION"),
vendName(RTL_CONSTASCII_USTRINGPARAM("%VENDORNAME")), vendName("%VENDORNAME"),
vendVersion(RTL_CONSTASCII_USTRINGPARAM("%VENDORVERSION")), vendVersion("%VENDORVERSION"),
vendShort(RTL_CONSTASCII_USTRINGPARAM("%VENDORSHORT")) vendShort("%VENDORSHORT")
{ {
} }
...@@ -308,7 +308,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom ) ...@@ -308,7 +308,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )
{ {
TargetURL = ( tvDom->getTargetURL() + configData.appendix ); TargetURL = ( tvDom->getTargetURL() + configData.appendix );
if( !tvDom->anchor.isEmpty() ) if( !tvDom->anchor.isEmpty() )
TargetURL += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#" )) + TargetURL += ( rtl::OUString( "#" ) +
tvDom->anchor ); tvDom->anchor );
} }
else else
...@@ -363,9 +363,9 @@ TVRead::getElementNames( ) ...@@ -363,9 +363,9 @@ TVRead::getElementNames( )
{ {
Sequence< rtl::OUString > seq( 3 ); Sequence< rtl::OUString > seq( 3 );
seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )); seq[0] = rtl::OUString( "Title" );
seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )); seq[1] = rtl::OUString( "TargetURL" );
seq[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Children" )); seq[2] = rtl::OUString( "Children" );
return seq; return seq;
} }
...@@ -666,7 +666,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) ...@@ -666,7 +666,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) ); rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( instPath.isEmpty() ) if( instPath.isEmpty() )
// try to determine path from default // try to determine path from default
instPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$(instpath)/help" )); instPath = rtl::OUString( "$(instpath)/help" );
// replace anything like $(instpath); // replace anything like $(instpath);
subst( xSMgr,instPath ); subst( xSMgr,instPath );
...@@ -684,21 +684,21 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) ...@@ -684,21 +684,21 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
try try
{ {
uno::Reference< lang::XMultiServiceFactory > xConfigProvider( uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
xSMgr ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), uno::UNO_QUERY_THROW); xSMgr ->createInstance(::rtl::OUString("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY_THROW);
uno::Sequence < uno::Any > lParams(1); uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ; beans::PropertyValue aParam ;
aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); aParam.Name = ::rtl::OUString("nodepath");
aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Product")); aParam.Value <<= ::rtl::OUString("/org.openoffice.Setup/Product");
lParams[0] = uno::makeAny(aParam); lParams[0] = uno::makeAny(aParam);
// open it // open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"),
lParams) ); lParams) );
uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY); uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
uno::Any aRet = xDirectAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension"))); uno::Any aRet = xDirectAccess->getByName(::rtl::OUString("ooSetupExtension"));
aRet >>= setupextension; aRet >>= setupextension;
} }
...@@ -707,7 +707,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) ...@@ -707,7 +707,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
} }
rtl::OUString productVersion( setupversion + rtl::OUString productVersion( setupversion +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) + rtl::OUString( " " ) +
setupextension ); setupextension );
rtl::OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) ); rtl::OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) );
...@@ -717,7 +717,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) ...@@ -717,7 +717,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
osl::FileBase::RC errFile = osl::FileBase::getFileURLFromSystemPath( instPath,url ); osl::FileBase::RC errFile = osl::FileBase::getFileURLFromSystemPath( instPath,url );
if( errFile != osl::FileBase::E_None ) return configData; if( errFile != osl::FileBase::E_None ) return configData;
if( url.lastIndexOf( sal_Unicode( '/' ) ) != url.getLength() - 1 ) if( url.lastIndexOf( sal_Unicode( '/' ) ) != url.getLength() - 1 )
url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )); url += rtl::OUString( "/" );
rtl::OUString ret; rtl::OUString ret;
sal_Int32 idx; sal_Int32 idx;
osl::DirectoryItem aDirItem; osl::DirectoryItem aDirItem;
...@@ -730,8 +730,8 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) ...@@ -730,8 +730,8 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
ret = locale.copy( 0,idx ); ret = locale.copy( 0,idx );
else else
{ {
locale = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "en-US" )); locale = rtl::OUString( "en-US" );
ret = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); ret = rtl::OUString("en");
} }
url = url + ret; url = url + ret;
...@@ -804,11 +804,11 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) ...@@ -804,11 +804,11 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
configData.system = system; configData.system = system;
configData.locale = locale; configData.locale = locale;
configData.appendix = configData.appendix =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" )) + rtl::OUString( "?Language=" ) +
configData.locale + configData.locale +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" )) + rtl::OUString( "&System=" ) +
configData.system + configData.system +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&UseDB=no" )) ; rtl::OUString( "&UseDB=no" ) ;
return configData; return configData;
} }
...@@ -830,7 +830,7 @@ TVChildTarget::getConfiguration(const Reference< XMultiServiceFactory >& m_xSMgr ...@@ -830,7 +830,7 @@ TVChildTarget::getConfiguration(const Reference< XMultiServiceFactory >& m_xSMgr
try try
{ {
rtl::OUString sProviderService = rtl::OUString sProviderService =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" )); rtl::OUString( "com.sun.star.configuration.ConfigurationProvider" );
sProvider = sProvider =
Reference< XMultiServiceFactory >( Reference< XMultiServiceFactory >(
m_xSMgr->createInstance( sProviderService ), m_xSMgr->createInstance( sProviderService ),
...@@ -857,7 +857,7 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider ...@@ -857,7 +857,7 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider
{ {
Sequence< Any > seq(1); Sequence< Any > seq(1);
rtl::OUString sReaderService = rtl::OUString sReaderService =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )); rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" );
seq[0] <<= rtl::OUString::createFromAscii( file ); seq[0] <<= rtl::OUString::createFromAscii( file );
...@@ -934,7 +934,7 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr, ...@@ -934,7 +934,7 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr,
{ {
xCfgMgr = xCfgMgr =
Reference< XConfigManager >( Reference< XConfigManager >(
m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" )) ), m_xSMgr->createInstance( rtl::OUString( "com.sun.star.config.SpecialConfigManager" ) ),
UNO_QUERY ); UNO_QUERY );
} }
catch( const com::sun::star::uno::Exception& ) catch( const com::sun::star::uno::Exception& )
...@@ -953,9 +953,9 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr, ...@@ -953,9 +953,9 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr,
//=================================================================== //===================================================================
// class ExtensionIteratorBase // class ExtensionIteratorBase
static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/")); static rtl::OUString aSlash("/");
static rtl::OUString aHelpFilesBaseName(RTL_CONSTASCII_USTRINGPARAM("help")); static rtl::OUString aHelpFilesBaseName("help");
static rtl::OUString aHelpMediaType(RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.help")); static rtl::OUString aHelpMediaType("application/vnd.sun.star.help");
ExtensionIteratorBase::ExtensionIteratorBase( const rtl::OUString& aLanguage ) ExtensionIteratorBase::ExtensionIteratorBase( const rtl::OUString& aLanguage )
: m_eState( USER_EXTENSIONS ) : m_eState( USER_EXTENSIONS )
...@@ -972,19 +972,19 @@ void ExtensionIteratorBase::init() ...@@ -972,19 +972,19 @@ void ExtensionIteratorBase::init()
if (xProps.is()) if (xProps.is())
{ {
xProps->getPropertyValue( xProps->getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= m_xContext; ::rtl::OUString( "DefaultContext" ) ) >>= m_xContext;
OSL_ASSERT( m_xContext.is() ); OSL_ASSERT( m_xContext.is() );
} }
if( !m_xContext.is() ) if( !m_xContext.is() )
{ {
throw RuntimeException( throw RuntimeException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ExtensionIteratorBase::init(), no XComponentContext" )), ::rtl::OUString( "ExtensionIteratorBase::init(), no XComponentContext" ),
Reference< XInterface >() ); Reference< XInterface >() );
} }
Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY ); Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
m_xSFA = Reference< ucb::XSimpleFileAccess >( m_xSFA = Reference< ucb::XSimpleFileAccess >(
xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )), xSMgr->createInstanceWithContext( rtl::OUString( "com.sun.star.ucb.SimpleFileAccess" ),
m_xContext ), UNO_QUERY_THROW ); m_xContext ), UNO_QUERY_THROW );
m_bUserPackagesLoaded = false; m_bUserPackagesLoaded = false;
...@@ -1055,7 +1055,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack ...@@ -1055,7 +1055,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
if( !m_bUserPackagesLoaded ) if( !m_bUserPackagesLoaded )
{ {
Reference< XPackageManager > xUserManager = Reference< XPackageManager > xUserManager =
thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")) ); thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString("user") );
m_aUserPackagesSeq = xUserManager->getDeployedPackages m_aUserPackagesSeq = xUserManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
...@@ -1085,7 +1085,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa ...@@ -1085,7 +1085,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
if( !m_bSharedPackagesLoaded ) if( !m_bSharedPackagesLoaded )
{ {
Reference< XPackageManager > xSharedManager = Reference< XPackageManager > xSharedManager =
thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shared")) ); thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString("shared") );
m_aSharedPackagesSeq = xSharedManager->getDeployedPackages m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
...@@ -1115,7 +1115,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP ...@@ -1115,7 +1115,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
if( !m_bBundledPackagesLoaded ) if( !m_bBundledPackagesLoaded )
{ {
Reference< XPackageManager > xBundledManager = Reference< XPackageManager > xBundledManager =
thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")) ); thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString("bundled") );
m_aBundledPackagesSeq = xBundledManager->getDeployedPackages m_aBundledPackagesSeq = xBundledManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
...@@ -1239,18 +1239,18 @@ rtl::OUString TreeFileIterator::expandURL( const rtl::OUString& aURL ) ...@@ -1239,18 +1239,18 @@ rtl::OUString TreeFileIterator::expandURL( const rtl::OUString& aURL )
Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY ); Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
xFac = Reference< uri::XUriReferenceFactory >( xFac = Reference< uri::XUriReferenceFactory >(
xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( xSMgr->createInstanceWithContext( rtl::OUString(
"com.sun.star.uri.UriReferenceFactory")), m_xContext ) , UNO_QUERY ); "com.sun.star.uri.UriReferenceFactory"), m_xContext ) , UNO_QUERY );
if( !xFac.is() ) if( !xFac.is() )
{ {
throw RuntimeException( throw RuntimeException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Databases::expand(), could not instatiate UriReferenceFactory." )), ::rtl::OUString( "Databases::expand(), could not instatiate UriReferenceFactory." ),
Reference< XInterface >() ); Reference< XInterface >() );
} }
xMacroExpander = Reference< util::XMacroExpander >( xMacroExpander = Reference< util::XMacroExpander >(
m_xContext->getValueByName( m_xContext->getValueByName(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" )) ), ::rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ),
UNO_QUERY_THROW ); UNO_QUERY_THROW );
} }
......
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
Dosyayı görüntüle @ c9337a8b
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment