summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /xmlhelp
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.cxx30
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.hxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx398
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.hxx216
-rw-r--r--xmlhelp/source/cxxhelp/provider/db.cxx8
-rw-r--r--xmlhelp/source/cxxhelp/provider/db.hxx14
-rw-r--r--xmlhelp/source/cxxhelp/provider/inputstream.cxx4
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx72
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.cxx42
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx48
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx8
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx138
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.hxx110
-rw-r--r--xmlhelp/source/cxxhelp/test/searchdemo.cxx2
-rw-r--r--xmlhelp/source/treeview/tvfactory.cxx34
-rw-r--r--xmlhelp/source/treeview/tvread.cxx196
-rw-r--r--xmlhelp/source/treeview/tvread.hxx64
17 files changed, 693 insertions, 693 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index cab021519304..04837f2deed9 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -152,20 +152,20 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
//=========================================================================
// virtual
-rtl::OUString SAL_CALL Content::getImplementationName()
+OUString SAL_CALL Content::getImplementationName()
throw( uno::RuntimeException )
{
- return rtl::OUString( "CHelpContent" );
+ return OUString( "CHelpContent" );
}
//=========================================================================
// virtual
-uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
throw( uno::RuntimeException )
{
- uno::Sequence< rtl::OUString > aSNS( 1 );
+ uno::Sequence< OUString > aSNS( 1 );
aSNS.getArray()[ 0 ]
- = rtl::OUString( MYUCP_CONTENT_SERVICE_NAME );
+ = OUString( MYUCP_CONTENT_SERVICE_NAME );
return aSNS;
}
@@ -176,10 +176,10 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
//=========================================================================
// virtual
-rtl::OUString SAL_CALL Content::getContentType()
+OUString SAL_CALL Content::getContentType()
throw( uno::RuntimeException )
{
- return rtl::OUString( MYUCP_CONTENT_TYPE );
+ return OUString( MYUCP_CONTENT_TYPE );
}
//=========================================================================
@@ -450,7 +450,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if ( rProp.Name == "ContentType" )
xRow->appendString(
rProp,
- rtl::OUString(
+ OUString(
"application/vnd.sun.star.help" ) );
else if ( rProp.Name == "Title" )
xRow->appendString ( rProp,m_aURLParameter.get_title() );
@@ -470,18 +470,18 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if( m_aURLParameter.isPicture() )
xRow->appendString(
rProp,
- rtl::OUString( "image/gif" ) );
+ OUString( "image/gif" ) );
else if( m_aURLParameter.isActive() )
xRow->appendString(
rProp,
- rtl::OUString( "text/plain" ) );
+ OUString( "text/plain" ) );
else if( m_aURLParameter.isFile() )
xRow->appendString(
- rProp,rtl::OUString( "text/html" ) );
+ rProp,OUString( "text/html" ) );
else if( m_aURLParameter.isRoot() )
xRow->appendString(
rProp,
- rtl::OUString( "text/css" ) );
+ OUString( "text/css" ) );
else
xRow->appendVoid( rProp );
else if( m_aURLParameter.isModule() )
@@ -531,9 +531,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
}
else if ( rProp.Name == "SearchScopes" )
{
- uno::Sequence< rtl::OUString > seq( 2 );
- seq[0] = rtl::OUString( "Heading" );
- seq[1] = rtl::OUString( "FullText" );
+ uno::Sequence< OUString > seq( 2 );
+ seq[0] = OUString( "Heading" );
+ seq[1] = OUString( "FullText" );
uno::Any aAny;
aAny <<= seq;
xRow->appendObject( rProp,aAny );
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index f8a1a63914b7..98b80dcee541 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -86,7 +86,7 @@ namespace chelp
throw( ::com::sun::star::uno::RuntimeException );
// XContent
- virtual rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getContentType()
throw( com::sun::star::uno::RuntimeException );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 4d5328c2335e..2428c66741d3 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -77,14 +77,14 @@ using namespace com::sun::star::deployment;
using namespace com::sun::star::beans;
-rtl::OUString Databases::expandURL( const rtl::OUString& aURL )
+OUString Databases::expandURL( const OUString& aURL )
{
osl::MutexGuard aGuard( m_aMutex );
- rtl::OUString aRetURL = expandURL( aURL, m_xContext );
+ OUString aRetURL = expandURL( aURL, m_xContext );
return aRetURL;
}
-rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::XComponentContext > xContext )
+OUString Databases::expandURL( const OUString& aURL, Reference< uno::XComponentContext > xContext )
{
static Reference< util::XMacroExpander > xMacroExpander;
static Reference< uri::XUriReferenceFactory > xFac;
@@ -96,7 +96,7 @@ rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::X
xMacroExpander = util::theMacroExpander::get(xContext);
}
- rtl::OUString aRetURL = aURL;
+ OUString aRetURL = aURL;
if( xMacroExpander.is() )
{
Reference< uri::XUriReference > uriRef;
@@ -117,11 +117,11 @@ rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::X
}
Databases::Databases( sal_Bool showBasic,
- const rtl::OUString& instPath,
- const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths,
- const rtl::OUString& productName,
- const rtl::OUString& productVersion,
- const rtl::OUString& styleSheet,
+ const OUString& instPath,
+ const com::sun::star::uno::Sequence< OUString >& imagesZipPaths,
+ const OUString& productName,
+ const OUString& productVersion,
+ const OUString& styleSheet,
Reference< uno::XComponentContext > xContext )
: m_xContext( xContext ),
m_bShowBasic(showBasic),
@@ -129,13 +129,13 @@ Databases::Databases( sal_Bool showBasic,
m_nCustomCSSDocLength( 0 ),
m_pCustomCSSDoc( 0 ),
m_aCSS(styleSheet.toAsciiLowerCase()),
- newProdName(rtl::OUString( "$[officename]" ) ),
- newProdVersion(rtl::OUString( "$[officeversion]" ) ),
- prodName( rtl::OUString( "%PRODUCTNAME" ) ),
- prodVersion( rtl::OUString( "%PRODUCTVERSION" ) ),
- vendName( rtl::OUString( "%VENDORNAME" ) ),
- vendVersion( rtl::OUString( "%VENDORVERSION" ) ),
- vendShort( rtl::OUString( "%VENDORSHORT" ) ),
+ newProdName(OUString( "$[officename]" ) ),
+ newProdVersion(OUString( "$[officeversion]" ) ),
+ prodName( OUString( "%PRODUCTNAME" ) ),
+ prodVersion( OUString( "%PRODUCTVERSION" ) ),
+ vendName( OUString( "%VENDORNAME" ) ),
+ vendVersion( OUString( "%VENDORVERSION" ) ),
+ vendShort( OUString( "%VENDORSHORT" ) ),
m_aImagesZipPaths( imagesZipPaths ),
m_aSymbolsStyleName( "" )
{
@@ -206,21 +206,21 @@ Databases::~Databases()
}
static bool impl_getZipFile(
- Sequence< rtl::OUString > & rImagesZipPaths,
- const rtl::OUString & rZipName,
- rtl::OUString & rFileName )
+ Sequence< OUString > & rImagesZipPaths,
+ const OUString & rZipName,
+ OUString & rFileName )
{
- rtl::OUString aWorkingDir;
+ OUString aWorkingDir;
osl_getProcessWorkingDir( &aWorkingDir.pData );
- const rtl::OUString *pPathArray = rImagesZipPaths.getArray();
+ const OUString *pPathArray = rImagesZipPaths.getArray();
for ( int i = 0; i < rImagesZipPaths.getLength(); ++i )
{
- rtl::OUString aFileName = pPathArray[ i ];
+ OUString aFileName = pPathArray[ i ];
if ( !aFileName.isEmpty() )
{
if ( 1 + aFileName.lastIndexOf( '/' ) != aFileName.getLength() )
{
- aFileName += rtl::OUString( "/" );
+ aFileName += OUString( "/" );
}
aFileName += rZipName;
// the icons are not read when the URL is a symlink
@@ -235,7 +235,7 @@ static bool impl_getZipFile(
return false;
}
-rtl::OString Databases::getImagesZipFileURL()
+OString Databases::getImagesZipFileURL()
{
OUString aSymbolsStyleName;
try
@@ -246,18 +246,18 @@ rtl::OString Databases::getImagesZipFileURL()
// set root path
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
- aParam.Name = ::rtl::OUString("nodepath");
- aParam.Value <<= ::rtl::OUString("org.openoffice.Office.Common");
+ aParam.Name = OUString("nodepath");
+ aParam.Value <<= OUString("org.openoffice.Office.Common");
lParams[0] = uno::makeAny(aParam);
// open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"),
+ OUString("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("Misc/SymbolStyle"));
+ uno::Any aResult = xAccess->getByHierarchicalName(OUString("Misc/SymbolStyle"));
if ( (aResult >>= aSymbolsStyleName) && m_aSymbolsStyleName != aSymbolsStyleName )
{
m_aSymbolsStyleName = aSymbolsStyleName;
@@ -266,7 +266,7 @@ rtl::OString Databases::getImagesZipFileURL()
if ( m_aImagesZipFileURL.isEmpty() || bChanged )
{
- rtl::OUString aImageZip;
+ OUString aImageZip;
bool bFound = false;
if ( !aSymbolsStyleName.isEmpty() )
@@ -282,20 +282,20 @@ rtl::OString Databases::getImagesZipFileURL()
else
aSymbolsStyleName = "tango";
}
- rtl::OUString aZipName = rtl::OUString( "images_" );
+ OUString aZipName = OUString( "images_" );
aZipName += aSymbolsStyleName;
- aZipName += rtl::OUString( ".zip" );
+ aZipName += OUString( ".zip" );
bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
}
if ( ! bFound )
- bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString( "images.zip" ), aImageZip );
+ bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip );
if ( ! bFound )
- aImageZip = rtl::OUString();
+ aImageZip = OUString();
- m_aImagesZipFileURL = rtl::OUStringToOString(
+ m_aImagesZipFileURL = OUStringToOString(
rtl::Uri::encode(
aImageZip,
rtl_UriCharClassPchar,
@@ -310,11 +310,11 @@ rtl::OString Databases::getImagesZipFileURL()
return m_aImagesZipFileURL;
}
-void Databases::replaceName( rtl::OUString& oustring ) const
+void Databases::replaceName( OUString& oustring ) const
{
sal_Int32 idx = -1,idx1 = -1,idx2 = -1,k = 0,off;
bool cap = false;
- rtl::OUStringBuffer aStrBuf( 0 );
+ OUStringBuffer aStrBuf( 0 );
while( true )
{
@@ -376,18 +376,18 @@ void Databases::replaceName( rtl::OUString& oustring ) const
}
}
-rtl::OUString Databases::getInstallPathAsURL()
+OUString Databases::getInstallPathAsURL()
{
osl::MutexGuard aGuard( m_aMutex );
return m_aInstallDirectory;
}
-const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUString& Language )
+const std::vector< OUString >& Databases::getModuleList( const OUString& Language )
{
if( m_avModules.empty() )
{
- rtl::OUString fileName,dirName = getInstallPathAsURL() + processLang( Language );
+ OUString fileName,dirName = getInstallPathAsURL() + processLang( Language );
osl::Directory dirFile( dirName );
osl::DirectoryItem aDirItem;
@@ -430,12 +430,12 @@ const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUStrin
-StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OUString& Module,
- const rtl::OUString& Language )
+StaticModuleInformation* Databases::getStaticInformationForModule( const OUString& Module,
+ const OUString& Language )
{
osl::MutexGuard aGuard( m_aMutex );
- rtl::OUString key = processLang(Language) + rtl::OUString( "/" ) + Module;
+ OUString key = processLang(Language) + OUString( "/" ) + Module;
std::pair< ModInfoTable::iterator,bool > aPair =
m_aModInfo.insert( ModInfoTable::value_type( key,(StaticModuleInformation*)0 ) );
@@ -446,7 +446,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
{
osl::File cfgFile( getInstallPathAsURL() +
key +
- rtl::OUString( ".cfg" ) );
+ OUString( ".cfg" ) );
if( osl::FileBase::E_None != cfgFile.open( osl_File_OpenFlag_Read ) )
it->second = 0;
@@ -456,16 +456,16 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
sal_uInt64 nRead;
sal_Char buffer[2048];
sal_Unicode lineBuffer[1028];
- rtl::OUString fileContent;
+ OUString fileContent;
while( osl::FileBase::E_None == cfgFile.read( &buffer,2048,nRead ) && nRead )
- fileContent += rtl::OUString( buffer,sal_Int32( nRead ),RTL_TEXTENCODING_UTF8 );
+ fileContent += OUString( buffer,sal_Int32( nRead ),RTL_TEXTENCODING_UTF8 );
cfgFile.close();
const sal_Unicode* str = fileContent.getStr();
- rtl::OUString current,lang_,program,startid,title,heading,fulltext;
- rtl::OUString order( "1" );
+ OUString current,lang_,program,startid,title,heading,fulltext;
+ OUString order( "1" );
for( sal_Int32 i = 0;i < fileContent.getLength();i++ )
{
@@ -474,7 +474,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
{
if( pos )
{
- current = rtl::OUString( lineBuffer,pos );
+ current = OUString( lineBuffer,pos );
if( current.startsWith("Title") )
{
@@ -526,11 +526,11 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
-rtl::OUString Databases::processLang( const rtl::OUString& Language )
+OUString Databases::processLang( const OUString& Language )
{
osl::MutexGuard aGuard( m_aMutex );
- rtl::OUString ret;
+ OUString ret;
LangSetTable::iterator it = m_aLangSet.find( Language );
if( it == m_aLangSet.end() )
@@ -559,21 +559,21 @@ rtl::OUString Databases::processLang( const rtl::OUString& Language )
}
-rtl::OUString Databases::country( const rtl::OUString& Language )
+OUString Databases::country( const OUString& Language )
{
sal_Int32 idx;
if( ( idx = Language.indexOf( '-' ) ) != -1 ||
( idx = Language.indexOf( '_' ) ) != -1 )
return Language.copy( 1+idx );
- return rtl::OUString();
+ return OUString();
}
-helpdatafileproxy::Hdf* Databases::getHelpDataFile( const rtl::OUString& Database,
- const rtl::OUString& Language, bool helpText,
- const rtl::OUString* pExtensionPath )
+helpdatafileproxy::Hdf* Databases::getHelpDataFile( const OUString& Database,
+ const OUString& Language, bool helpText,
+ const OUString* pExtensionPath )
{
if( Database.isEmpty() || Language.isEmpty() )
return 0;
@@ -581,9 +581,9 @@ helpdatafileproxy::Hdf* Databases::getHelpDataFile( const rtl::OUString& Databas
osl::MutexGuard aGuard( m_aMutex );
- rtl::OUString aFileExt( helpText ? rtl::OUString(".ht") : rtl::OUString(".db") );
- rtl::OUString dbFileName = rtl::OUStringBuffer().append('/').append(Database).append(aFileExt).makeStringAndClear();
- rtl::OUString key;
+ OUString aFileExt( helpText ? OUString(".ht") : OUString(".db") );
+ OUString dbFileName = OUStringBuffer().append('/').append(Database).append(aFileExt).makeStringAndClear();
+ OUString key;
if( pExtensionPath == NULL )
key = processLang( Language ) + dbFileName;
else
@@ -598,16 +598,16 @@ helpdatafileproxy::Hdf* Databases::getHelpDataFile( const rtl::OUString& Databas
{
helpdatafileproxy::Hdf* pHdf = 0;
- rtl::OUString fileURL;
+ OUString fileURL;
if( pExtensionPath )
fileURL = expandURL(*pExtensionPath) + Language + dbFileName;
else
fileURL = getInstallPathAsURL() + key;
- rtl::OUString fileNameHDFHelp( fileURL );
+ OUString fileNameHDFHelp( fileURL );
//Extensions always use the new format
if( pExtensionPath != NULL )
- fileNameHDFHelp += rtl::OUString( "_" );
+ fileNameHDFHelp += OUString( "_" );
//SimpleFileAccess takes file URLs as arguments!!! Using filenames works accidentally but
//fails for example when using long path names on Windows (starting with \\?\)
if( m_xSFA->exists( fileNameHDFHelp ) )
@@ -622,12 +622,12 @@ helpdatafileproxy::Hdf* Databases::getHelpDataFile( const rtl::OUString& Databas
}
Reference< XCollator >
-Databases::getCollator( const rtl::OUString& Language,
- const rtl::OUString& System )
+Databases::getCollator( const OUString& Language,
+ const OUString& System )
{
(void)System;
- rtl::OUString key = Language;
+ OUString key = Language;
osl::MutexGuard aGuard( m_aMutex );
@@ -637,32 +637,32 @@ Databases::getCollator( const rtl::OUString& Language,
if( ! it->second.is() )
{
it->second = Collator::create(m_xContext);
- rtl::OUString langStr = processLang(Language);
- rtl::OUString countryStr = country(Language);
+ OUString langStr = processLang(Language);
+ OUString countryStr = country(Language);
if( countryStr.isEmpty() )
{
if( langStr.compareToAscii("de") == 0 )
- countryStr = rtl::OUString("DE");
+ countryStr = OUString("DE");
else if( langStr.compareToAscii("en") == 0 )
- countryStr = rtl::OUString("US");
+ countryStr = OUString("US");
else if( langStr.compareToAscii("es") == 0 )
- countryStr = rtl::OUString("ES");
+ countryStr = OUString("ES");
else if( langStr.compareToAscii("it") == 0 )
- countryStr = rtl::OUString("IT");
+ countryStr = OUString("IT");
else if( langStr.compareToAscii("fr") == 0 )
- countryStr = rtl::OUString("FR");
+ countryStr = OUString("FR");
else if( langStr.compareToAscii("sv") == 0 )
- countryStr = rtl::OUString("SE");
+ countryStr = OUString("SE");
else if( langStr.compareToAscii("ja") == 0 )
- countryStr = rtl::OUString("JP");
+ countryStr = OUString("JP");
else if( langStr.compareToAscii("ko") == 0 )
- countryStr = rtl::OUString("KR");
+ countryStr = OUString("KR");
}
/* FIXME-BCP47: all this does not look right for language tag context,
* also check processLang() and country() methods */
it->second->loadDefaultCollator( Locale( langStr,
countryStr,
- rtl::OUString() ),
+ OUString() ),
0 );
}
@@ -682,8 +682,8 @@ namespace chelp {
bool operator()( const KeywordInfo::KeywordElement& la,
const KeywordInfo::KeywordElement& ra ) const
{
- const rtl::OUString& l = la.key;
- const rtl::OUString& r = ra.key;
+ const OUString& l = la.key;
+ const OUString& r = ra.key;
bool ret;
@@ -723,8 +723,8 @@ namespace chelp {
KeywordInfo::KeywordElement::KeywordElement( Databases *pDatabases,
helpdatafileproxy::Hdf* pHdf,
- rtl::OUString& ky,
- rtl::OUString& data )
+ OUString& ky,
+ OUString& data )
: key( ky )
{
pDatabases->replaceName( key );
@@ -733,10 +733,10 @@ KeywordInfo::KeywordElement::KeywordElement( Databases *pDatabases,
-void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const rtl::OUString& ids )
+void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids )
{
const sal_Unicode* idstr = ids.getStr();
- std::vector< rtl::OUString > id,anchor;
+ std::vector< OUString > id,anchor;
int idx = -1,k;
while( ( idx = ids.indexOf( ';',k = ++idx ) ) != -1 )
{
@@ -744,13 +744,13 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy:
if( h < idx )
{
// found an anchor
- id.push_back( rtl::OUString( &idstr[k],h-k ) );
- anchor.push_back( rtl::OUString( &idstr[h+1],idx-h-1 ) );
+ id.push_back( OUString( &idstr[k],h-k ) );
+ anchor.push_back( OUString( &idstr[h+1],idx-h-1 ) );
}
else
{
- id.push_back( rtl::OUString( &idstr[k],idx-k ) );
- anchor.push_back( rtl::OUString() );
+ id.push_back( OUString( &idstr[k],idx-k ) );
+ anchor.push_back( OUString() );
}
}
@@ -769,7 +769,7 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy:
pData = pEmpty;
if( pHdf )
{
- rtl::OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 );
+ OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 );
helpdatafileproxy::HDFData aHDFData;
bool bSuccess = pHdf->getValueForKey( idi, aHDFData );
if( bSuccess )
@@ -778,7 +778,7 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy:
DbtToStringConverter converter( pData );
- rtl::OUString title = converter.getTitle();
+ OUString title = converter.getTitle();
pDatabases->replaceName( title );
listTitle[i] = title;
}
@@ -802,7 +802,7 @@ KeywordInfo::KeywordInfo( const std::vector< KeywordElement >& aVec )
}
bool Databases::checkModuleMatchForExtension
- ( const rtl::OUString& Database, const rtl::OUString& doclist )
+ ( const OUString& Database, const OUString& doclist )
{
bool bBelongsToDatabase = true;
@@ -825,8 +825,8 @@ bool Databases::checkModuleMatchForExtension
break;
}
- rtl::OUString aModule = doclist.copy( nFound + 1, nLastFound - nFound - 1 );
- std::vector< rtl::OUString >::iterator result = std::find( m_avModules.begin(), m_avModules.end(), aModule );
+ OUString aModule = doclist.copy( nFound + 1, nLastFound - nFound - 1 );
+ std::vector< OUString >::iterator result = std::find( m_avModules.begin(), m_avModules.end(), aModule );
if( result != m_avModules.end() )
{
bFoundAtLeastOneModule = true;
@@ -850,12 +850,12 @@ bool Databases::checkModuleMatchForExtension
}
-KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
- const rtl::OUString& Language )
+KeywordInfo* Databases::getKeyword( const OUString& Database,
+ const OUString& Language )
{
osl::MutexGuard aGuard( m_aMutex );
- rtl::OUString key = processLang(Language) + rtl::OUString( "/" ) + Database;
+ OUString key = processLang(Language) + OUString( "/" ) + Database;
std::pair< KeywordInfoTable::iterator,bool > aPair =
m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,(KeywordInfo*)0 ) );
@@ -867,13 +867,13 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
std::vector<KeywordInfo::KeywordElement> aVector;
KeyDataBaseFileIterator aDbFileIt( m_xContext, *this, Database, Language );
- rtl::OUString fileURL;
+ OUString fileURL;
bool bExtension = false;
while( !(fileURL = aDbFileIt.nextDbFile( bExtension )).isEmpty() )
{
- rtl::OUString fileNameHDFHelp( fileURL );
+ OUString fileNameHDFHelp( fileURL );
if( bExtension )
- fileNameHDFHelp += rtl::OUString::createFromAscii( "_" );
+ fileNameHDFHelp += OUString::createFromAscii( "_" );
if( m_xSFA->exists( fileNameHDFHelp ) )
{
helpdatafileproxy::Hdf aHdf( fileNameHDFHelp, m_xSFA );
@@ -891,9 +891,9 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
while( aHdf.getNextKeyAndValue( aKey, aValue ) )
{
- rtl::OUString keyword( aKey.getData(), aKey.getSize(),
+ OUString keyword( aKey.getData(), aKey.getSize(),
RTL_TEXTENCODING_UTF8 );
- rtl::OUString doclist( aValue.getData(), aValue.getSize(),
+ OUString doclist( aValue.getData(), aValue.getSize(),
RTL_TEXTENCODING_UTF8 );
bool bBelongsToDatabase = true;
@@ -917,7 +917,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
}
// sorting
- Reference< XCollator > xCollator = getCollator( Language,rtl::OUString());
+ Reference< XCollator > xCollator = getCollator( Language,OUString());
KeywordElementComparator aComparator( xCollator );
std::sort(aVector.begin(),aVector.end(),aComparator);
@@ -928,14 +928,14 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
return it->second;
}
-Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& jar,
- const rtl::OUString& Language )
+Reference< XHierarchicalNameAccess > Databases::jarFile( const OUString& jar,
+ const OUString& Language )
{
if( jar.isEmpty() || Language.isEmpty() )
{
return Reference< XHierarchicalNameAccess >( 0 );
}
- rtl::OUString key = rtl::OUStringBuffer(processLang(Language)).append('/').append(jar).makeStringAndClear();
+ OUString key = OUStringBuffer(processLang(Language)).append('/').append(jar).makeStringAndClear();
osl::MutexGuard aGuard( m_aMutex );
@@ -944,7 +944,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
if( ! it->second.is() )
{
- rtl::OUString zipFile;
+ OUString zipFile;
try
{
// Extension jar file? Search for ?
@@ -952,10 +952,10 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
sal_Int32 nQuestionMark2 = jar.lastIndexOf( sal_Unicode('?') );
if( nQuestionMark1 != -1 && nQuestionMark2 != -1 && nQuestionMark1 != nQuestionMark2 )
{
- ::rtl::OUString aExtensionPath = jar.copy( nQuestionMark1 + 1, nQuestionMark2 - nQuestionMark1 - 1 );
- ::rtl::OUString aPureJar = jar.copy( nQuestionMark2 + 1 );
+ OUString aExtensionPath = jar.copy( nQuestionMark1 + 1, nQuestionMark2 - nQuestionMark1 - 1 );
+ OUString aPureJar = jar.copy( nQuestionMark2 + 1 );
- rtl::OUStringBuffer aStrBuf;
+ OUStringBuffer aStrBuf;
aStrBuf.append( aExtensionPath );
aStrBuf.append( '/' );
aStrBuf.append( aPureJar );
@@ -983,13 +983,13 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
// let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg;
- aArg.Name = ::rtl::OUString( "StorageFormat" );
+ aArg.Name = OUString( "StorageFormat" );
aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
aArguments[ 1 ] <<= aArg;
Reference< XInterface > xIfc
= m_xSMgr->createInstanceWithArgumentsAndContext(
- rtl::OUString(
+ OUString(
"com.sun.star.packages.comp.ZipPackage" ),
aArguments, m_xContext );
@@ -1015,9 +1015,9 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
}
Reference< XHierarchicalNameAccess > Databases::findJarFileForPath
- ( const rtl::OUString& jar, const rtl::OUString& Language,
- const rtl::OUString& path, rtl::OUString* o_pExtensionPath,
- rtl::OUString* o_pExtensionRegistryPath )
+ ( const OUString& jar, const OUString& Language,
+ const OUString& path, OUString* o_pExtensionPath,
+ OUString* o_pExtensionRegistryPath )
{
Reference< XHierarchicalNameAccess > xNA;
if( jar.isEmpty() || Language.isEmpty() )
@@ -1035,16 +1035,16 @@ Reference< XHierarchicalNameAccess > Databases::findJarFileForPath
bool bSuccess = true;
if( xParentPackageBundle.is() )
{
- rtl::OUString aIdentifierInPath;
+ OUString aIdentifierInPath;
sal_Int32 nFindSlash = path.indexOf( '/' );
if( nFindSlash != -1 )
aIdentifierInPath = path.copy( 0, nFindSlash );
- beans::Optional<rtl::OUString> aIdentifierOptional = xParentPackageBundle->getIdentifier();
+ beans::Optional<OUString> aIdentifierOptional = xParentPackageBundle->getIdentifier();
if( !aIdentifierInPath.isEmpty() && aIdentifierOptional.IsPresent )
{
- rtl::OUString aUnencodedIdentifier = aIdentifierOptional.Value;
- rtl::OUString aIdentifier = rtl::Uri::encode( aUnencodedIdentifier,
+ OUString aUnencodedIdentifier = aIdentifierOptional.Value;
+ OUString aIdentifier = rtl::Uri::encode( aUnencodedIdentifier,
rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 );
if( !aIdentifierInPath.equals( aIdentifier ) )
@@ -1092,12 +1092,12 @@ void Databases::popupDocument( URLParameter* urlPar,char **buffer,int *byteCount
const sal_Int32 l5 = strlen( pop5 );
sal_Int32 l2,l4;
- rtl::OUString val = urlPar->get_id();
- rtl::OString pop2O( val.getStr(),l2 = val.getLength(),RTL_TEXTENCODING_UTF8 );
+ OUString val = urlPar->get_id();
+ OString pop2O( val.getStr(),l2 = val.getLength(),RTL_TEXTENCODING_UTF8 );
const char* pop2 = pop2O.getStr();
val = urlPar->get_eid();
- rtl::OString pop4O( val.getStr(),l4 = val.getLength(),RTL_TEXTENCODING_UTF8 );
+ OString pop4O( val.getStr(),l4 = val.getLength(),RTL_TEXTENCODING_UTF8 );
const char* pop4 = pop4O.getStr();
(*byteCount) = l1 + l2 + l3 + l4 + l5;
@@ -1113,7 +1113,7 @@ void Databases::popupDocument( URLParameter* urlPar,char **buffer,int *byteCount
}
-void Databases::changeCSS(const rtl::OUString& newStyleSheet)
+void Databases::changeCSS(const OUString& newStyleSheet)
{
m_aCSS = newStyleSheet.toAsciiLowerCase();
delete[] m_pCustomCSSDoc, m_pCustomCSSDoc = 0,m_nCustomCSSDocLength = 0;
@@ -1121,7 +1121,7 @@ void Databases::changeCSS(const rtl::OUString& newStyleSheet)
-void Databases::cascadingStylesheet( const rtl::OUString& Language,
+void Databases::cascadingStylesheet( const OUString& Language,
char** buffer,
int* byteCount )
{
@@ -1129,10 +1129,10 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
{
int retry = 2;
bool error = true;
- rtl::OUString fileURL;
+ OUString fileURL;
sal_Bool bHighContrastMode = sal_False;
- rtl::OUString aCSS( m_aCSS );
+ OUString aCSS( m_aCSS );
if ( aCSS.compareToAscii( "default" ) == 0 )
{
// #i50760: "default" needs to adapt HC mode
@@ -1144,9 +1144,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( "HighContrastMode" ) );
+ uno::Any aHCMode = xVclWindowPeer->getProperty( OUString( "HighContrastMode" ) );
if ( ( aHCMode >>= bHighContrastMode ) && bHighContrastMode )
- aCSS = rtl::OUString( "highcontrastblack" );
+ aCSS = OUString( "highcontrastblack" );
}
}
}
@@ -1158,14 +1158,14 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
fileURL =
getInstallPathAsURL() +
processLang( Language ) +
- rtl::OUString( "/" ) +
+ OUString( "/" ) +
aCSS +
- rtl::OUString( ".css" );
+ OUString( ".css" );
else if( retry == 1 )
fileURL =
getInstallPathAsURL() +
aCSS +
- rtl::OUString( ".css" );
+ OUString( ".css" );
osl::DirectoryItem aDirItem;
osl::File aFile( fileURL );
@@ -1190,7 +1190,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
if ( !retry && error && bHighContrastMode )
{
// fall back to default css
- aCSS = rtl::OUString( "default" );
+ aCSS = OUString( "default" );
retry = 2;
bHighContrastMode = sal_False;
}
@@ -1211,16 +1211,16 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
}
-void Databases::setActiveText( const rtl::OUString& Module,
- const rtl::OUString& Language,
- const rtl::OUString& Id,
+void Databases::setActiveText( const OUString& Module,
+ const OUString& Language,
+ const OUString& Id,
char** buffer,
int* byteCount )
{
DataBaseIterator aDbIt( m_xContext, *this, Module, Language, true );
// #i84550 Cache information about failed ids
- rtl::OString id( Id.getStr(),Id.getLength(),RTL_TEXTENCODING_UTF8 );
+ OString id( Id.getStr(),Id.getLength(),RTL_TEXTENCODING_UTF8 );
EmptyActiveTextSet::iterator it = m_aEmptyActiveTextSet.find( id );
bool bFoundAsEmpty = ( it != m_aEmptyActiveTextSet.end() );
helpdatafileproxy::HDFData aHDFData;
@@ -1243,14 +1243,14 @@ void Databases::setActiveText( const rtl::OUString& Module,
if( bSuccess )
{
// ensure existence of tmp after for
- rtl::OString tmp;
+ OString tmp;
for( int i = 0; i < nSize; ++i )
if( pData[i] == '%' || pData[i] == '$' )
{
// need of replacement
- rtl::OUString temp = rtl::OUString( pData, nSize, RTL_TEXTENCODING_UTF8 );
+ OUString temp = OUString( pData, nSize, RTL_TEXTENCODING_UTF8 );
replaceName( temp );
- tmp = rtl::OString( temp.getStr(),
+ tmp = OString( temp.getStr(),
temp.getLength(),
RTL_TEXTENCODING_UTF8 );
nSize = tmp.getLength();
@@ -1273,7 +1273,7 @@ void Databases::setActiveText( const rtl::OUString& Module,
}
-void Databases::setInstallPath( const rtl::OUString& aInstDir )
+void Databases::setInstallPath( const OUString& aInstDir )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -1281,7 +1281,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( "/" );
+ m_aInstallDirectory += OUString( "/" );
}
@@ -1291,7 +1291,7 @@ void Databases::setInstallPath( const rtl::OUString& aInstDir )
ExtensionHelpExistanceMap ExtensionIteratorBase::aHelpExistanceMap;
ExtensionIteratorBase::ExtensionIteratorBase( Reference< XComponentContext > xContext,
- Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage )
+ Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage )
: m_xContext( xContext )
, m_rDatabases( rDatabases )
, m_eState( INITIAL_MODULE )
@@ -1303,7 +1303,7 @@ ExtensionIteratorBase::ExtensionIteratorBase( Reference< XComponentContext > xCo
}
ExtensionIteratorBase::ExtensionIteratorBase( Databases& rDatabases,
- const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage )
+ const OUString& aInitialModule, const OUString& aLanguage )
: m_xContext( comphelper::getProcessComponentContext() )
, m_rDatabases( rDatabases )
, m_eState( INITIAL_MODULE )
@@ -1335,7 +1335,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
return xHelpPackage;
// #i84550 Cache information about help content in extension
- rtl::OUString aExtensionPath = xPackage->getURL();
+ OUString aExtensionPath = xPackage->getURL();
ExtensionHelpExistanceMap::iterator it = aHelpExistanceMap.find( aExtensionPath );
bool bFound = ( it != aHelpExistanceMap.end() );
bool bHasHelp = bFound ? it->second : false;
@@ -1354,7 +1354,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
}
if( bRegistered )
{
- rtl::OUString aHelpMediaType( "application/vnd.sun.star.help" );
+ OUString aHelpMediaType( "application/vnd.sun.star.help" );
if( xPackage->isBundle() )
{
Sequence< Reference< deployment::XPackage > > aPkgSeq = xPackage->getBundle
@@ -1365,7 +1365,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
{
const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ];
const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType();
- rtl::OUString aMediaType = xPackageTypeInfo->getMediaType();
+ OUString aMediaType = xPackageTypeInfo->getMediaType();
if( aMediaType.equals( aHelpMediaType ) )
{
xHelpPackage = xSubPkg;
@@ -1377,7 +1377,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
else
{
const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType();
- rtl::OUString aMediaType = xPackageTypeInfo->getMediaType();
+ OUString aMediaType = xPackageTypeInfo->getMediaType();
if( aMediaType.equals( aHelpMediaType ) )
xHelpPackage = xPackage;
}
@@ -1398,7 +1398,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
{
Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
m_aUserPackagesSeq = xExtensionManager->getDeployedExtensions
- ( rtl::OUString("user"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+ ( OUString("user"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
m_bUserPackagesLoaded = true;
}
@@ -1426,7 +1426,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
{
Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
m_aSharedPackagesSeq = xExtensionManager->getDeployedExtensions
- ( rtl::OUString("shared"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+ ( OUString("shared"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
m_bSharedPackagesLoaded = true;
}
@@ -1454,7 +1454,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
{
Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
m_aBundledPackagesSeq = xExtensionManager->getDeployedExtensions
- ( rtl::OUString("bundled"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+ ( OUString("bundled"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
m_bBundledPackagesLoaded = true;
}
@@ -1474,17 +1474,17 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
return xHelpPackage;
}
-rtl::OUString ExtensionIteratorBase::implGetFileFromPackage(
- const rtl::OUString& rFileExtension, Reference< deployment::XPackage > xPackage )
+OUString ExtensionIteratorBase::implGetFileFromPackage(
+ const OUString& rFileExtension, Reference< deployment::XPackage > xPackage )
{
// No extension -> search for pure language folder
bool bLangFolderOnly = rFileExtension.isEmpty();
- rtl::OUString aFile;
- rtl::OUString aLanguage = m_aLanguage;
+ OUString aFile;
+ OUString aLanguage = m_aLanguage;
for( sal_Int32 iPass = 0 ; iPass < 2 ; ++iPass )
{
- rtl::OUStringBuffer aStrBuf;
+ OUStringBuffer aStrBuf;
aStrBuf.append( xPackage->getRegistrationDataURL().Value);
aStrBuf.append( '/' );
aStrBuf.append( aLanguage );
@@ -1501,9 +1501,9 @@ rtl::OUString ExtensionIteratorBase::implGetFileFromPackage(
if( m_xSFA->exists( aFile ) )
break;
- ::std::vector< ::rtl::OUString > av;
+ ::std::vector< OUString > av;
implGetLanguageVectorFromPackage( av, xPackage );
- ::std::vector< ::rtl::OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage );
+ ::std::vector< OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage );
if( pFound != av.end() )
aLanguage = *pFound;
}
@@ -1516,24 +1516,24 @@ inline bool isLetter( sal_Unicode c )
return comphelper::string::isalphaAscii(c);
}
-void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv,
+void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv,
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage )
{
rv.clear();
- rtl::OUString aExtensionPath = xPackage->getURL();
- Sequence< rtl::OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true );
+ OUString aExtensionPath = xPackage->getURL();
+ Sequence< OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true );
- const rtl::OUString* pSeq = aEntrySeq.getConstArray();
+ const OUString* pSeq = aEntrySeq.getConstArray();
sal_Int32 nCount = aEntrySeq.getLength();
for( sal_Int32 i = 0 ; i < nCount ; ++i )
{
- rtl::OUString aEntry = pSeq[i];
+ OUString aEntry = pSeq[i];
if( m_xSFA->isFolder( aEntry ) )
{
sal_Int32 nLastSlash = aEntry.lastIndexOf( '/' );
if( nLastSlash != -1 )
{
- rtl::OUString aPureEntry = aEntry.copy( nLastSlash + 1 );
+ OUString aPureEntry = aEntry.copy( nLastSlash + 1 );
// Check language scheme
int nLen = aPureEntry.getLength();
@@ -1552,7 +1552,7 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::r
//===================================================================
// class DataBaseIterator
-helpdatafileproxy::Hdf* DataBaseIterator::nextHdf( rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath )
+helpdatafileproxy::Hdf* DataBaseIterator::nextHdf( OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath )
{
helpdatafileproxy::Hdf* pRetHdf = NULL;
@@ -1611,10 +1611,10 @@ helpdatafileproxy::Hdf* DataBaseIterator::nextHdf( rtl::OUString* o_pExtensionPa
}
helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( Reference< deployment::XPackage > xPackage,
- rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath )
+ OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath )
{
- beans::Optional< ::rtl::OUString> optRegData;
+ beans::Optional< OUString> optRegData;
try
{
optRegData = xPackage->getRegistrationDataURL();
@@ -1627,20 +1627,20 @@ helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( Reference< depl
helpdatafileproxy::Hdf* pRetHdf = NULL;
if (optRegData.IsPresent && !optRegData.Value.isEmpty())
{
- rtl::OUString aRegDataUrl = rtl::OUStringBuffer(optRegData.Value).append('/').makeStringAndClear();
+ OUString aRegDataUrl = OUStringBuffer(optRegData.Value).append('/').makeStringAndClear();
- rtl::OUString aHelpFilesBaseName("help");
+ OUString aHelpFilesBaseName("help");
- rtl::OUString aUsedLanguage = m_aLanguage;
+ OUString aUsedLanguage = m_aLanguage;
pRetHdf = m_rDatabases.getHelpDataFile(
aHelpFilesBaseName, aUsedLanguage, m_bHelpText, &aRegDataUrl);
// Language fallback
if( !pRetHdf )
{
- ::std::vector< ::rtl::OUString > av;
+ ::std::vector< OUString > av;
implGetLanguageVectorFromPackage( av, xPackage );
- ::std::vector< ::rtl::OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage );
+ ::std::vector< OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage );
if( pFound != av.end() )
{
aUsedLanguage = *pFound;
@@ -1653,7 +1653,7 @@ helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( Reference< depl
*o_pExtensionPath = aRegDataUrl + aUsedLanguage;
if( o_pExtensionRegistryPath )
- *o_pExtensionRegistryPath = rtl::OUStringBuffer(xPackage->getURL()).append('/').append(aUsedLanguage).makeStringAndClear();
+ *o_pExtensionRegistryPath = OUStringBuffer(xPackage->getURL()).append('/').append(aUsedLanguage).makeStringAndClear();
}
return pRetHdf;
@@ -1664,16 +1664,16 @@ helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( Reference< depl
// class KeyDataBaseFileIterator
//returns a file URL
-rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
+OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
{
- rtl::OUString aRetFile;
+ OUString aRetFile;
while( aRetFile.isEmpty() && m_eState != END_REACHED )
{
switch( m_eState )
{
case INITIAL_MODULE:
- aRetFile = rtl::OUStringBuffer(m_rDatabases.getInstallPathAsURL()).
+ aRetFile = OUStringBuffer(m_rDatabases.getInstallPathAsURL()).
append(m_rDatabases.processLang(m_aLanguage)).append('/').
append(m_aInitialModule).append(".key").makeStringAndClear();
@@ -1732,11 +1732,11 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
}
//Returns a file URL, that does not contain macros
-rtl::OUString KeyDataBaseFileIterator::implGetDbFileFromPackage
+OUString KeyDataBaseFileIterator::implGetDbFileFromPackage
( Reference< deployment::XPackage > xPackage )
{
- rtl::OUString aExpandedURL =
- implGetFileFromPackage( rtl::OUString( ".key" ), xPackage );
+ OUString aExpandedURL =
+ implGetFileFromPackage( OUString( ".key" ), xPackage );
return aExpandedURL;
}
@@ -1747,7 +1747,7 @@ rtl::OUString KeyDataBaseFileIterator::implGetDbFileFromPackage
Reference< XHierarchicalNameAccess > JarFileIterator::nextJarFile
( Reference< deployment::XPackage >& o_xParentPackageBundle,
- rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath )
+ OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath )
{
Reference< XHierarchicalNameAccess > xNA;
@@ -1804,12 +1804,12 @@ Reference< XHierarchicalNameAccess > JarFileIterator::nextJarFile
}
Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
-( Reference< deployment::XPackage > xPackage, rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath )
+( Reference< deployment::XPackage > xPackage, OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath )
{
Reference< XHierarchicalNameAccess > xNA;
- rtl::OUString zipFile =
- implGetFileFromPackage( rtl::OUString( ".jar" ), xPackage );
+ OUString zipFile =
+ implGetFileFromPackage( OUString( ".jar" ), xPackage );
try
{
@@ -1818,14 +1818,14 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
// let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg;
- aArg.Name = ::rtl::OUString( "StorageFormat" );
+ aArg.Name = OUString( "StorageFormat" );
aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
aArguments[ 1 ] <<= aArg;
Reference< XMultiComponentFactory >xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
Reference< XInterface > xIfc
= xSMgr->createInstanceWithArgumentsAndContext(
- rtl::OUString(
+ OUString(
"com.sun.star.packages.comp.ZipPackage" ),
aArguments, m_xContext );
@@ -1852,7 +1852,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
if( o_pExtensionRegistryPath != NULL )
{
- rtl::OUString& rPath = *o_pExtensionPath;
+ OUString& rPath = *o_pExtensionPath;
sal_Int32 nLastSlashInPath = rPath.lastIndexOf( '/', rPath.getLength() - 1 );
*o_pExtensionRegistryPath = xPackage->getURL();
@@ -1867,16 +1867,16 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
//===================================================================
// class IndexFolderIterator
-rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o_rbTemporary )
+OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o_rbTemporary )
{
- rtl::OUString aIndexFolder;
+ OUString aIndexFolder;
while( aIndexFolder.isEmpty() && m_eState != END_REACHED )
{
switch( m_eState )
{
case INITIAL_MODULE:
- aIndexFolder = rtl::OUStringBuffer(m_rDatabases.getInstallPathAsURL()).
+ aIndexFolder = OUStringBuffer(m_rDatabases.getInstallPathAsURL()).
append(m_rDatabases.processLang(m_aLanguage)).append('/').
append(m_aInitialModule).append(".idxl").makeStringAndClear();
@@ -1935,23 +1935,23 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
return aIndexFolder;
}
-rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary, Reference< deployment::XPackage > xPackage )
+OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary, Reference< deployment::XPackage > xPackage )
{
- rtl::OUString aIndexFolder =
- implGetFileFromPackage( rtl::OUString( ".idxl" ), xPackage );
+ OUString aIndexFolder =
+ implGetFileFromPackage( OUString( ".idxl" ), xPackage );
o_rbTemporary = false;
if( !m_xSFA->isFolder( aIndexFolder ) )
{
// i98680: Missing index? Try to generate now
- rtl::OUString aLangURL = implGetFileFromPackage( rtl::OUString(), xPackage );
+ OUString aLangURL = implGetFileFromPackage( OUString(), xPackage );
if( m_xSFA->isFolder( aLangURL ) )
{
// Test write access (shared extension may be read only)
bool bIsWriteAccess = false;
try
{
- rtl::OUString aCreateTestFolder = aLangURL + rtl::OUString( "CreateTestFolder" );
+ OUString aCreateTestFolder = aLangURL + OUString( "CreateTestFolder" );
m_xSFA->createFolder( aCreateTestFolder );
if( m_xSFA->isFolder( aCreateTestFolder ) )
bIsWriteAccess = true;
@@ -1967,23 +1967,23 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
try
{
- rtl::OUString aLang;
+ OUString aLang;
sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
if( nLastSlash != -1 )
aLang = aLangURL.copy( nLastSlash + 1 );
else
- aLang = rtl::OUString( "en" );
+ aLang = OUString( "en" );
- rtl::OUString aMod("help");
+ OUString aMod("help");
- rtl::OUString aZipDir = aLangURL;
+ OUString aZipDir = aLangURL;
if( !bIsWriteAccess )
{
- rtl::OUString aTempFileURL;
+ OUString aTempFileURL;
::osl::FileBase::RC eErr = ::osl::File::createTempFile( 0, 0, &aTempFileURL );
if( eErr == ::osl::FileBase::E_None )
{
- rtl::OUString aTempDirURL = aTempFileURL;
+ OUString aTempDirURL = aTempFileURL;
try
{
m_xSFA->kill( aTempDirURL );
@@ -2002,9 +2002,9 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
aIndexer.indexDocuments();
if( bIsWriteAccess )
- aIndexFolder = implGetFileFromPackage( rtl::OUString( ".idxl" ), xPackage );
+ aIndexFolder = implGetFileFromPackage( OUString( ".idxl" ), xPackage );
else
- aIndexFolder = aZipDir + rtl::OUString( "/help.idxl" );
+ aIndexFolder = aZipDir + OUString( "/help.idxl" );
}
catch (const Exception &)
{
@@ -2015,12 +2015,12 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
return aIndexFolder;
}
-void IndexFolderIterator::deleteTempIndexFolder( const rtl::OUString& aIndexFolder )
+void IndexFolderIterator::deleteTempIndexFolder( const OUString& aIndexFolder )
{
sal_Int32 nLastSlash = aIndexFolder.lastIndexOf( '/' );
if( nLastSlash != -1 )
{
- rtl::OUString aTmpFolder = aIndexFolder.copy( 0, nLastSlash );
+ OUString aTmpFolder = aIndexFolder.copy( 0, nLastSlash );
try
{
m_xSFA->kill( aTmpFolder );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index afb9cb70f567..905c86cf0f4d 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -60,22 +60,22 @@ namespace chelp {
{
private:
- rtl::OUString m_aStartId;
- rtl::OUString m_aProgramSwitch;
- rtl::OUString m_aTitle;
- rtl::OUString m_aHeading;
- rtl::OUString m_aFulltext;
+ OUString m_aStartId;
+ OUString m_aProgramSwitch;
+ OUString m_aTitle;
+ OUString m_aHeading;
+ OUString m_aFulltext;
int m_nOrder;
public:
- StaticModuleInformation( rtl::OUString aTitle,
- rtl::OUString aStartId,
- rtl::OUString aProgramSwitch,
- rtl::OUString aHeading,
- rtl::OUString aFulltext,
- rtl::OUString aOrder )
+ StaticModuleInformation( OUString aTitle,
+ OUString aStartId,
+ OUString aProgramSwitch,
+ OUString aHeading,
+ OUString aFulltext,
+ OUString aOrder )
: m_aStartId( aStartId ),
m_aProgramSwitch( aProgramSwitch ),
m_aTitle( aTitle ),
@@ -87,11 +87,11 @@ namespace chelp {
~StaticModuleInformation() { }
- rtl::OUString get_title() const { return m_aTitle; }
- rtl::OUString get_id() const { return m_aStartId; }
- rtl::OUString get_program() const { return m_aProgramSwitch; }
- rtl::OUString get_heading() const { return m_aHeading; }
- rtl::OUString get_fulltext() const { return m_aFulltext; }
+ OUString get_title() const { return m_aTitle; }
+ OUString get_id() const { return m_aStartId; }
+ OUString get_program() const { return m_aProgramSwitch; }
+ OUString get_heading() const { return m_aHeading; }
+ OUString get_fulltext() const { return m_aFulltext; }
int get_order() const { return m_nOrder; }
}; // end class StaticModuleInformation
@@ -110,17 +110,17 @@ namespace chelp {
KeywordElement( Databases* pDatabases,
helpdatafileproxy::Hdf* pHdf,
- rtl::OUString& key,
- rtl::OUString& ids );
+ OUString& key,
+ OUString& ids );
private:
- rtl::OUString key;
- com::sun::star::uno::Sequence< rtl::OUString > listId;
- com::sun::star::uno::Sequence< rtl::OUString > listAnchor;
- com::sun::star::uno::Sequence< rtl::OUString > listTitle;
+ OUString key;
+ com::sun::star::uno::Sequence< OUString > listId;
+ com::sun::star::uno::Sequence< OUString > listAnchor;
+ com::sun::star::uno::Sequence< OUString > listTitle;
- void init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const rtl::OUString& ids );
+ void init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids );
};
@@ -128,22 +128,22 @@ namespace chelp {
~KeywordInfo() { };
- com::sun::star::uno::Sequence< rtl::OUString >&
+ com::sun::star::uno::Sequence< OUString >&
getKeywordList() { return listKey; }
- com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > >&
+ com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > >&
getIdList() { return listId; }
- com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > >&
+ com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > >&
getAnchorList() { return listAnchor; }
- com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > >&
+ com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > >&
getTitleList() { return listTitle; }
private:
- com::sun::star::uno::Sequence< rtl::OUString > listKey;
- com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > > listId,listAnchor,listTitle;
+ com::sun::star::uno::Sequence< OUString > listKey;
+ com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > > listId,listAnchor,listTitle;
}; // end class KeywordInfo
@@ -154,7 +154,7 @@ namespace chelp {
struct eq
{
- bool operator()( const rtl::OUString& rKey1, const rtl::OUString& rKey2 ) const
+ bool operator()( const OUString& rKey1, const OUString& rKey2 ) const
{
return rKey1.compareTo( rKey2 ) == 0;
}
@@ -162,7 +162,7 @@ namespace chelp {
struct ha
{
- size_t operator()( const rtl::OUString& rName ) const
+ size_t operator()( const OUString& rName ) const
{
return rName.hashCode();
}
@@ -174,31 +174,31 @@ namespace chelp {
*/
Databases( sal_Bool showBasic,
- const rtl::OUString& instPath,
- const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths,
- const rtl::OUString& productName,
- const rtl::OUString& productVersion,
- const rtl::OUString& styleSheet,
+ const OUString& instPath,
+ const com::sun::star::uno::Sequence< OUString >& imagesZipPaths,
+ const OUString& productName,
+ const OUString& productVersion,
+ const OUString& styleSheet,
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext );
~Databases();
- rtl::OString getImagesZipFileURL();
+ OString getImagesZipFileURL();
- rtl::OUString getInstallPathAsURL();
+ OUString getInstallPathAsURL();
- const std::vector< rtl::OUString >& getModuleList( const rtl::OUString& Language );
+ const std::vector< OUString >& getModuleList( const OUString& Language );
- StaticModuleInformation* getStaticInformationForModule( const rtl::OUString& Module,
- const rtl::OUString& Language );
+ StaticModuleInformation* getStaticInformationForModule( const OUString& Module,
+ const OUString& Language );
- bool checkModuleMatchForExtension( const rtl::OUString& Database, const rtl::OUString& doclist );
- KeywordInfo* getKeyword( const rtl::OUString& Module,
- const rtl::OUString& Language );
+ bool checkModuleMatchForExtension( const OUString& Database, const OUString& doclist );
+ KeywordInfo* getKeyword( const OUString& Module,
+ const OUString& Language );
- helpdatafileproxy::Hdf* getHelpDataFile( const rtl::OUString& Module,
- const rtl::OUString& Language, bool helpText = false,
- const rtl::OUString* pExtensionPath = NULL );
+ helpdatafileproxy::Hdf* getHelpDataFile( const OUString& Module,
+ const OUString& Language, bool helpText = false,
+ const OUString* pExtensionPath = NULL );
/**
@@ -206,8 +206,8 @@ namespace chelp {
*/
com::sun::star::uno::Reference< com::sun::star::i18n::XCollator >
- getCollator( const rtl::OUString& Language,
- const rtl::OUString& System ); // System not used by current implementation
+ getCollator( const OUString& Language,
+ const OUString& System ); // System not used by current implementation
// // of XCollator
/**
@@ -222,7 +222,7 @@ namespace chelp {
* First try is language directory, second try is main installation directory.
*/
- void cascadingStylesheet( const rtl::OUString& Language,
+ void cascadingStylesheet( const OUString& Language,
char** buffer,
int* byteCount );
@@ -231,16 +231,16 @@ namespace chelp {
* Changes the stylesheet for further reads.
*/
- void changeCSS(const rtl::OUString& newStyleSheet);
+ void changeCSS(const OUString& newStyleSheet);
/**
* Returns the active help text for the given module, language and id.
*/
- void setActiveText( const rtl::OUString& Module,
- const rtl::OUString& Language,
- const rtl::OUString& Id,
+ void setActiveText( const OUString& Module,
+ const OUString& Language,
+ const OUString& Id,
char** buffer,
int* byteCount );
@@ -249,19 +249,19 @@ namespace chelp {
*/
com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >
- jarFile( const rtl::OUString& jar,
- const rtl::OUString& Language );
+ jarFile( const OUString& jar,
+ const OUString& Language );
com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >
- findJarFileForPath( const rtl::OUString& jar, const rtl::OUString& Language,
- const rtl::OUString& path, rtl::OUString* o_pExtensionPath = NULL,
- rtl::OUString* o_pExtensionRegistryPath = NULL );
+ findJarFileForPath( const OUString& jar, const OUString& Language,
+ const OUString& path, OUString* o_pExtensionPath = NULL,
+ OUString* o_pExtensionRegistryPath = NULL );
/**
* Maps a given language-locale combination to language.
*/
- rtl::OUString processLang( const rtl::OUString& Language );
+ OUString processLang( const OUString& Language );
/**
@@ -269,17 +269,17 @@ namespace chelp {
* The returned string maybe empty
*/
- rtl::OUString country( const rtl::OUString& Language );
+ OUString country( const OUString& Language );
- void replaceName( rtl::OUString& oustring ) const;
+ void replaceName( OUString& oustring ) const;
- rtl::OUString getProductName() const { return m_vReplacement[0]; }
- rtl::OUString getProductVersion() const { return m_vReplacement[1]; }
+ OUString getProductName() const { return m_vReplacement[0]; }
+ OUString getProductVersion() const { return m_vReplacement[1]; }
- rtl::OUString expandURL( const rtl::OUString& aURL );
+ OUString expandURL( const OUString& aURL );
- static rtl::OUString expandURL( const rtl::OUString& aURL,
+ static OUString expandURL( const OUString& aURL,
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext );
private:
@@ -294,7 +294,7 @@ namespace chelp {
int m_nCustomCSSDocLength;
char* m_pCustomCSSDoc;
- rtl::OUString m_aCSS;
+ OUString m_aCSS;
enum {
PRODUCTNAME = 0,
@@ -307,32 +307,32 @@ namespace chelp {
};
int m_vAdd[7];
- rtl::OUString m_vReplacement[7];
- rtl::OUString newProdName,newProdVersion,
+ OUString m_vReplacement[7];
+ OUString newProdName,newProdVersion,
prodName,prodVersion,vendName,vendVersion,vendShort;
- rtl::OUString m_aInstallDirectory; // Installation directory
- com::sun::star::uno::Sequence< rtl::OUString > m_aImagesZipPaths;
- rtl::OString m_aImagesZipFileURL;
- rtl::OUString m_aSymbolsStyleName;
+ OUString m_aInstallDirectory; // Installation directory
+ com::sun::star::uno::Sequence< OUString > m_aImagesZipPaths;
+ OString m_aImagesZipFileURL;
+ OUString m_aSymbolsStyleName;
- std::vector< rtl::OUString > m_avModules;
+ std::vector< OUString > m_avModules;
- typedef boost::unordered_map< rtl::OUString,helpdatafileproxy::Hdf*,ha,eq > DatabasesTable;
+ typedef boost::unordered_map< OUString,helpdatafileproxy::Hdf*,ha,eq > DatabasesTable;
DatabasesTable m_aDatabases; // Language and module dependent databases
- typedef boost::unordered_map< rtl::OUString,rtl::OUString,ha,eq > LangSetTable;
+ typedef boost::unordered_map< OUString,OUString,ha,eq > LangSetTable;
LangSetTable m_aLangSet; // Mapping to of lang-country to lang
- typedef boost::unordered_map< rtl::OUString,StaticModuleInformation*,ha,eq > ModInfoTable;
+ typedef boost::unordered_map< OUString,StaticModuleInformation*,ha,eq > ModInfoTable;
ModInfoTable m_aModInfo; // Module information
- typedef boost::unordered_map< rtl::OUString,KeywordInfo*,ha,eq > KeywordInfoTable;
+ typedef boost::unordered_map< OUString,KeywordInfo*,ha,eq > KeywordInfoTable;
KeywordInfoTable m_aKeywordInfo; // Module information
typedef
boost::unordered_map<
- rtl::OUString,
+ OUString,
::com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >,
ha,
eq > ZipFileTable;
@@ -340,7 +340,7 @@ namespace chelp {
typedef
boost::unordered_map<
- rtl::OUString,
+ OUString,
::com::sun::star::uno::Reference< com::sun::star::i18n::XCollator >,
ha,
eq > CollatorTable;
@@ -349,7 +349,7 @@ namespace chelp {
struct ostring_eq
{
- bool operator()( const rtl::OString& rKey1, const rtl::OString& rKey2 ) const
+ bool operator()( const OString& rKey1, const OString& rKey2 ) const
{
return rKey1.compareTo( rKey2 ) == 0;
}
@@ -357,7 +357,7 @@ namespace chelp {
struct ostring_ha
{
- size_t operator()( const rtl::OString& rName ) const
+ size_t operator()( const OString& rName ) const
{
return rName.hashCode();
}
@@ -365,7 +365,7 @@ namespace chelp {
typedef
boost::unordered_set<
- rtl::OString,
+ OString,
ostring_ha,
ostring_eq > EmptyActiveTextSet;
EmptyActiveTextSet m_aEmptyActiveTextSet;
@@ -373,7 +373,7 @@ namespace chelp {
// methods
- void setInstallPath( const rtl::OUString& aInstallDirectory );
+ void setInstallPath( const OUString& aInstallDirectory );
}; // end class Databases
@@ -392,7 +392,7 @@ namespace chelp {
// Hashtable to cache extension help status
typedef boost::unordered_map
<
- ::rtl::OUString,
+ OUString,
bool,
Databases::ha,
Databases::eq
@@ -406,9 +406,9 @@ namespace chelp {
public:
ExtensionIteratorBase( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext,
- Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage );
- ExtensionIteratorBase( Databases& rDatabases, const rtl::OUString& aInitialModule,
- const rtl::OUString& aLanguage );
+ Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage );
+ ExtensionIteratorBase( Databases& rDatabases, const OUString& aInitialModule,
+ const OUString& aLanguage );
void init( void );
private:
@@ -423,9 +423,9 @@ namespace chelp {
( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle );
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextBundledHelpPackage
( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle );
- rtl::OUString implGetFileFromPackage( const rtl::OUString& rFileExtension,
+ OUString implGetFileFromPackage( const OUString& rFileExtension,
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage );
- void implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv,
+ void implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv,
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage );
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
@@ -433,10 +433,10 @@ namespace chelp {
Databases& m_rDatabases;
IteratorState m_eState;
- rtl::OUString m_aExtensionPath;
+ OUString m_aExtensionPath;
- rtl::OUString m_aInitialModule;
- rtl::OUString m_aLanguage;
+ OUString m_aInitialModule;
+ OUString m_aLanguage;
com::sun::star::uno::Sequence< com::sun::star::uno::Reference
< com::sun::star::deployment::XPackage > > m_aUserPackagesSeq;
@@ -462,23 +462,23 @@ namespace chelp {
{
public:
DataBaseIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext,
- Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage, bool bHelpText )
+ Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage, bool bHelpText )
: ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage )
, m_bHelpText( bHelpText )
{}
- DataBaseIterator( Databases& rDatabases, const rtl::OUString& aInitialModule,
- const rtl::OUString& aLanguage, bool bHelpText )
+ DataBaseIterator( Databases& rDatabases, const OUString& aInitialModule,
+ const OUString& aLanguage, bool bHelpText )
: ExtensionIteratorBase( rDatabases, aInitialModule, aLanguage )
, m_bHelpText( bHelpText )
{}
- helpdatafileproxy::Hdf* nextHdf( rtl::OUString* o_pExtensionPath = NULL, rtl::OUString* o_pExtensionRegistryPath = NULL );
+ helpdatafileproxy::Hdf* nextHdf( OUString* o_pExtensionPath = NULL, OUString* o_pExtensionRegistryPath = NULL );
private:
helpdatafileproxy::Hdf* implGetHdfFromPackage(
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage,
- rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath );
+ OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath );
bool m_bHelpText;
@@ -489,14 +489,14 @@ namespace chelp {
{
public:
KeyDataBaseFileIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext,
- Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage )
+ Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage )
: ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage )
{}
//Returns a file URL
- rtl::OUString nextDbFile( bool& o_rbExtension );
+ OUString nextDbFile( bool& o_rbExtension );
private:
- rtl::OUString implGetDbFileFromPackage(
+ OUString implGetDbFileFromPackage(
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage );
}; // end class KeyDataBaseFileIterator
@@ -506,18 +506,18 @@ namespace chelp {
{
public:
JarFileIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext,
- Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage )
+ Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage )
: ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage )
{}
com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >
nextJarFile( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle,
- rtl::OUString* o_pExtensionPath = NULL, rtl::OUString* o_pExtensionRegistryPath = NULL );
+ OUString* o_pExtensionPath = NULL, OUString* o_pExtensionRegistryPath = NULL );
private:
com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >
implGetJarFromPackage(com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage,
- rtl::OUString* o_pExtensionPath = NULL, rtl::OUString* o_pExtensionRegistryPath = NULL );
+ OUString* o_pExtensionPath = NULL, OUString* o_pExtensionRegistryPath = NULL );
}; // end class JarFileIterator
@@ -525,15 +525,15 @@ namespace chelp {
class IndexFolderIterator : public ExtensionIteratorBase
{
public:
- IndexFolderIterator( Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage )
+ IndexFolderIterator( Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage )
: ExtensionIteratorBase( rDatabases, aInitialModule, aLanguage )
{}
- rtl::OUString nextIndexFolder( bool& o_rbExtension, bool& o_rbTemporary );
- void deleteTempIndexFolder( const rtl::OUString& aIndexFolder );
+ OUString nextIndexFolder( bool& o_rbExtension, bool& o_rbTemporary );
+ void deleteTempIndexFolder( const OUString& aIndexFolder );
private:
- rtl::OUString implGetIndexFolderFromPackage( bool& o_rbTemporary,
+ OUString implGetIndexFolderFromPackage( bool& o_rbTemporary,
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage );
}; // end class KeyDataBaseFileIterator
diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx
index 6fe749017b94..d97077e89ca7 100644
--- a/xmlhelp/source/cxxhelp/provider/db.cxx
+++ b/xmlhelp/source/cxxhelp/provider/db.cxx
@@ -93,7 +93,7 @@ void Hdf::createHashMap( bool bOptimizeForPerformance )
if( !implReadLenAndData( pData, iPos, aDBKey ) )
break;
- rtl::OString aOKeyStr = aDBKey.getData();
+ OString aOKeyStr = aDBKey.getData();
// Read val len
const char* pStartPtr = pData + iPos;
@@ -107,7 +107,7 @@ void Hdf::createHashMap( bool bOptimizeForPerformance )
if( bOptimizeForPerformance )
{
const char* pValSrc = pData + iPos;
- rtl::OString aValStr( pValSrc, nValLen );
+ OString aValStr( pValSrc, nValLen );
(*m_pStringToDataMap)[aOKeyStr] = aValStr;
}
else
@@ -137,7 +137,7 @@ void Hdf::releaseHashMap( void )
}
-bool Hdf::getValueForKey( const rtl::OString& rKey, HDFData& rValue )
+bool Hdf::getValueForKey( const OString& rKey, HDFData& rValue )
{
bool bSuccess = false;
if( !m_xSFA.is() )
@@ -188,7 +188,7 @@ bool Hdf::getValueForKey( const rtl::OString& rKey, HDFData& rValue )
StringToDataMap::const_iterator it = m_pStringToDataMap->find( rKey );
if( it != m_pStringToDataMap->end() )
{
- const rtl::OString& rValueStr = it->second;
+ const OString& rValueStr = it->second;
int nValueLen = rValueStr.getLength();
const char* pData = rValueStr.getStr();
rValue.copyToBuffer( pData, nValueLen );
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index 429fd24bdbe2..d00fbaba4a50 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -67,22 +67,22 @@ namespace helpdatafileproxy {
struct eq
{
- bool operator()( const rtl::OString& rKey1, const rtl::OString& rKey2 ) const
+ bool operator()( const OString& rKey1, const OString& rKey2 ) const
{ return rKey1.compareTo( rKey2 ) == 0; }
};
struct ha
{
- size_t operator()( const rtl::OString& rName ) const
+ size_t operator()( const OString& rName ) const
{ return rName.hashCode(); }
};
- typedef boost::unordered_map< rtl::OString,std::pair<int,int>,ha,eq > StringToValPosMap;
- typedef boost::unordered_map< rtl::OString,rtl::OString,ha,eq > StringToDataMap;
+ typedef boost::unordered_map< OString,std::pair<int,int>,ha,eq > StringToValPosMap;
+ typedef boost::unordered_map< OString,OString,ha,eq > StringToDataMap;
class Hdf : hdf_internal::Noncopyable
{
- rtl::OUString m_aFileURL;
+ OUString m_aFileURL;
StringToDataMap* m_pStringToDataMap;
StringToValPosMap* m_pStringToValPosMap;
com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 >
@@ -100,7 +100,7 @@ namespace helpdatafileproxy {
//HDFHelp must get a fileURL which can then directly be used by simple file access.
//SimpleFileAccess requires file URLs as arguments. Passing file path may work but fails
//for example when using long file paths on Windows, which start with "\\?\"
- Hdf( const rtl::OUString& rFileURL,
+ Hdf( const OUString& rFileURL,
com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > xSFA )
: m_aFileURL( rFileURL )
, m_pStringToDataMap( NULL )
@@ -118,7 +118,7 @@ namespace helpdatafileproxy {
void createHashMap( bool bOptimizeForPerformance = false );
void releaseHashMap( void );
- bool getValueForKey( const rtl::OString& rKey, HDFData& rValue );
+ bool getValueForKey( const OString& rKey, HDFData& rValue );
bool startIteration( void );
bool getNextKeyAndValue( HDFData& rKey, HDFData& rValue );
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index 6ef2b30ee645..33d8556ebdc6 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
@@ -27,7 +27,7 @@ using namespace com::sun::star::ucb;
-XInputStream_impl::XInputStream_impl( const rtl::OUString& aUncPath )
+XInputStream_impl::XInputStream_impl( const OUString& aUncPath )
: m_bIsOpen( false ),
m_aFile( aUncPath )
{
@@ -128,7 +128,7 @@ XInputStream_impl::skipBytes(
{
if (m_aFile.setPos(osl_Pos_Current, sal_uInt64(nBytesToSkip)) != osl::FileBase::E_None)
{
- throw io::IOException(::rtl::OUString(
+ throw io::IOException(OUString(
"XInputStream_impl::skipBytes failed seek"), uno::Reference< uno::XInterface >());
}
}
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index ad3994393642..e2ee1dbe6b39 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -104,23 +104,23 @@ XTYPEPROVIDER_IMPL_5( ContentProvider,
//
//=========================================================================
-rtl::OUString SAL_CALL ContentProvider::getImplementationName()
+OUString SAL_CALL ContentProvider::getImplementationName()
throw( uno::RuntimeException )
{
return getImplementationName_Static();
}
-rtl::OUString ContentProvider::getImplementationName_Static()
+OUString ContentProvider::getImplementationName_Static()
{
- return rtl::OUString("CHelpContentProvider" );
+ return OUString("CHelpContentProvider" );
}
sal_Bool SAL_CALL
-ContentProvider::supportsService(const rtl::OUString& ServiceName )
+ContentProvider::supportsService(const OUString& ServiceName )
throw( uno::RuntimeException )
{
- uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames();
- const rtl::OUString* pArray = aSNL.getArray();
+ uno::Sequence< OUString > aSNL = getSupportedServiceNames();
+ const OUString* pArray = aSNL.getArray();
for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
{
if( pArray[ i ] == ServiceName )
@@ -130,7 +130,7 @@ ContentProvider::supportsService(const rtl::OUString& ServiceName )
return sal_False;
}
-uno::Sequence< rtl::OUString > SAL_CALL
+uno::Sequence< OUString > SAL_CALL
ContentProvider::getSupportedServiceNames()
throw( uno::RuntimeException )
{
@@ -147,15 +147,15 @@ ContentProvider_CreateInstance(
return uno::Reference< uno::XInterface >::query( pX );
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
ContentProvider::getSupportedServiceNames_Static()
{
- uno::Sequence< rtl::OUString > aSNS( 2 );
+ uno::Sequence< OUString > aSNS( 2 );
aSNS.getArray()[ 0 ] =
- rtl::OUString(
+ OUString(
MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 );
aSNS.getArray()[ 1 ] =
- rtl::OUString(
+ OUString(
MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 );
return aSNS;
@@ -233,12 +233,12 @@ ContentProvider::elementReplaced(const container::ContainerEvent& Event)
if(!m_pDatabases)
return;
- rtl::OUString accessor;
+ OUString accessor;
Event.Accessor >>= accessor;
if(accessor.compareToAscii("HelpStyleSheet"))
return;
- rtl::OUString replacedElement,element;
+ OUString replacedElement,element;
Event.ReplacedElement >>= replacedElement;
Event.Element >>= element;
@@ -259,14 +259,14 @@ void ContentProvider::init()
getHierAccess( sProvider,
"org.openoffice.Office.Common" ) );
- rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
+ OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( instPath.isEmpty() )
// try to determine path from default
- instPath = rtl::OUString( "$(instpath)/help" );
+ instPath = OUString( "$(instpath)/help" );
// replace anything like $(instpath);
subst( instPath );
- rtl::OUString stylesheet( getKey( xHierAccess,"Help/HelpStyleSheet" ) );
+ OUString stylesheet( getKey( xHierAccess,"Help/HelpStyleSheet" ) );
try
{
// now adding as configuration change listener for the stylesheet
@@ -275,7 +275,7 @@ void ContentProvider::init()
if( xAccess.is() )
{
uno::Any aAny =
- xAccess->getByName( rtl::OUString( "Help" ) );
+ xAccess->getByName( OUString( "Help" ) );
aAny >>= m_xContainer;
if( m_xContainer.is() )
m_xContainer->addContainerListener( this );
@@ -287,9 +287,9 @@ void ContentProvider::init()
xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" );
- rtl::OUString setupversion(
+ OUString setupversion(
getKey( xHierAccess,"Product/ooSetupVersion" ) );
- rtl::OUString setupextension;
+ OUString setupextension;
try
{
@@ -298,17 +298,17 @@ void ContentProvider::init()
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
- aParam.Name = ::rtl::OUString("nodepath");
- aParam.Value <<= ::rtl::OUString("/org.openoffice.Setup/Product");
+ aParam.Name = OUString("nodepath");
+ aParam.Value <<= OUString("/org.openoffice.Setup/Product");
lParams[0] = uno::makeAny(aParam);
// open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"),
+ OUString("com.sun.star.configuration.ConfigurationAccess"),
lParams) );
uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
- uno::Any aRet = xDirectAccess->getByName(::rtl::OUString("ooSetupExtension"));
+ uno::Any aRet = xDirectAccess->getByName(OUString("ooSetupExtension"));
aRet >>= setupextension;
}
@@ -316,19 +316,19 @@ void ContentProvider::init()
{
}
- rtl::OUString productversion(
+ OUString productversion(
setupversion +
- rtl::OUString( " " ) +
+ OUString( " " ) +
setupextension );
- uno::Sequence< rtl::OUString > aImagesZipPaths( 2 );
+ uno::Sequence< OUString > aImagesZipPaths( 2 );
xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" );
- rtl::OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) );
+ OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) );
subst( aPath );
aImagesZipPaths[ 0 ] = aPath;
- aPath = rtl::OUString("$BRAND_BASE_DIR/share/config");
+ aPath = OUString("$BRAND_BASE_DIR/share/config");
rtl::Bootstrap::expandMacros(aPath);
aImagesZipPaths[ 1 ] = aPath;
@@ -371,11 +371,11 @@ ContentProvider::getHierAccess(
if( sProvider.is() )
{
uno::Sequence< uno::Any > seq( 1 );
- rtl::OUString sReaderService(
- rtl::OUString(
+ OUString sReaderService(
+ OUString(
"com.sun.star.configuration.ConfigurationAccess" ) );
- seq[ 0 ] <<= rtl::OUString::createFromAscii( file );
+ seq[ 0 ] <<= OUString::createFromAscii( file );
try
{
@@ -394,12 +394,12 @@ ContentProvider::getHierAccess(
-rtl::OUString
+OUString
ContentProvider::getKey(
const uno::Reference< container::XHierarchicalNameAccess >& xHierAccess,
const char* key ) const
{
- rtl::OUString instPath;
+ OUString instPath;
if( xHierAccess.is() )
{
uno::Any aAny;
@@ -407,7 +407,7 @@ ContentProvider::getKey(
{
aAny =
xHierAccess->getByHierarchicalName(
- rtl::OUString::createFromAscii( key ) );
+ OUString::createFromAscii( key ) );
}
catch( const container::NoSuchElementException& )
{
@@ -430,7 +430,7 @@ ContentProvider::getBooleanKey(
{
aAny =
xHierAccess->getByHierarchicalName(
- rtl::OUString::createFromAscii( key ) );
+ OUString::createFromAscii( key ) );
}
catch( const container::NoSuchElementException& )
{
@@ -440,7 +440,7 @@ ContentProvider::getBooleanKey(
return ret;
}
-void ContentProvider::subst( rtl::OUString& instpath ) const
+void ContentProvider::subst( OUString& instpath ) const
{
uno::Reference< frame::XConfigManager > xCfgMgr;
if( m_xContext.is() )
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 7f81469d4d03..75ae7b4a8370 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -382,7 +382,7 @@ ResultSetBase::close(
}
-rtl::OUString SAL_CALL
+OUString SAL_CALL
ResultSetBase::queryContentIdentifierString(
void )
throw( uno::RuntimeException )
@@ -390,7 +390,7 @@ ResultSetBase::queryContentIdentifierString(
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aPath[m_nRow];
else
- return rtl::OUString();
+ return OUString();
}
@@ -401,7 +401,7 @@ ResultSetBase::queryContentIdentifier(
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
{
- rtl::OUString url = queryContentIdentifierString();
+ OUString url = queryContentIdentifierString();
if( ! m_aIdents[m_nRow].is() && !url.isEmpty() )
m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >(
new ::ucbhelper::ContentIdentifier( url ) );
@@ -463,7 +463,7 @@ public:
return m_aSeq;
}
- beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName )
+ beans::Property SAL_CALL getPropertyByName( const OUString& aName )
throw( beans::UnknownPropertyException,
uno::RuntimeException)
{
@@ -473,7 +473,7 @@ public:
throw beans::UnknownPropertyException();
}
- sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name )
+ sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
throw( uno::RuntimeException )
{
for( int i = 0; i < m_aSeq.getLength(); ++i )
@@ -495,12 +495,12 @@ ResultSetBase::getPropertySetInfo()
throw( uno::RuntimeException)
{
uno::Sequence< beans::Property > seq(2);
- seq[0].Name = rtl::OUString( "RowCount" );
+ seq[0].Name = OUString( "RowCount" );
seq[0].Handle = -1;
seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
seq[0].Attributes = beans::PropertyAttribute::READONLY;
- seq[1].Name = rtl::OUString( "IsRowCountFinal" );
+ seq[1].Name = OUString( "IsRowCountFinal" );
seq[1].Handle = -1;
seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) );
seq[1].Attributes = beans::PropertyAttribute::READONLY;
@@ -512,7 +512,7 @@ ResultSetBase::getPropertySetInfo()
void SAL_CALL ResultSetBase::setPropertyValue(
- const rtl::OUString& aPropertyName, const uno::Any& aValue )
+ const OUString& aPropertyName, const uno::Any& aValue )
throw( beans::UnknownPropertyException,
beans::PropertyVetoException,
lang::IllegalArgumentException,
@@ -521,8 +521,8 @@ void SAL_CALL ResultSetBase::setPropertyValue(
{
(void)aValue;
- if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) ||
- aPropertyName == rtl::OUString( "RowCount" ) )
+ if( aPropertyName == OUString( "IsRowCountFinal" ) ||
+ aPropertyName == OUString( "RowCount" ) )
return;
throw beans::UnknownPropertyException();
@@ -530,18 +530,18 @@ void SAL_CALL ResultSetBase::setPropertyValue(
uno::Any SAL_CALL ResultSetBase::getPropertyValue(
- const rtl::OUString& PropertyName )
+ const OUString& PropertyName )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException)
{
- if( PropertyName == rtl::OUString( "IsRowCountFinal" ) )
+ if( PropertyName == OUString( "IsRowCountFinal" ) )
{
uno::Any aAny;
aAny <<= m_bRowCountFinal;
return aAny;
}
- else if ( PropertyName == rtl::OUString( "RowCount" ) )
+ else if ( PropertyName == OUString( "RowCount" ) )
{
uno::Any aAny;
sal_Int32 count = m_aItems.size();
@@ -554,13 +554,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
void SAL_CALL ResultSetBase::addPropertyChangeListener(
- const rtl::OUString& aPropertyName,
+ const OUString& aPropertyName,
const uno::Reference< beans::XPropertyChangeListener >& xListener )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException)
{
- if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) )
+ if( aPropertyName == OUString( "IsRowCountFinal" ) )
{
osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pIsFinalListeners )
@@ -569,7 +569,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
m_pIsFinalListeners->addInterface( xListener );
}
- else if ( aPropertyName == rtl::OUString( "RowCount" ) )
+ else if ( aPropertyName == OUString( "RowCount" ) )
{
osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pRowCountListeners )
@@ -583,19 +583,19 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
void SAL_CALL ResultSetBase::removePropertyChangeListener(
- const rtl::OUString& aPropertyName,
+ const OUString& aPropertyName,
const uno::Reference< beans::XPropertyChangeListener >& aListener )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException)
{
- if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) &&
+ if( aPropertyName == OUString( "IsRowCountFinal" ) &&
m_pIsFinalListeners )
{
osl::MutexGuard aGuard( m_aMutex );
m_pIsFinalListeners->removeInterface( aListener );
}
- else if ( aPropertyName == rtl::OUString( "RowCount" ) &&
+ else if ( aPropertyName == OUString( "RowCount" ) &&
m_pRowCountListeners )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -607,7 +607,7 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
void SAL_CALL ResultSetBase::addVetoableChangeListener(
- const rtl::OUString& PropertyName,
+ const OUString& PropertyName,
const uno::Reference< beans::XVetoableChangeListener >& aListener )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -619,7 +619,7 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener(
void SAL_CALL ResultSetBase::removeVetoableChangeListener(
- const rtl::OUString& PropertyName,
+ const OUString& PropertyName,
const uno::Reference< beans::XVetoableChangeListener >& aListener )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 4d87543f1124..d030e7735f2c 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -65,11 +65,11 @@ using namespace com::sun::star::lang;
struct HitItem
{
- rtl::OUString m_aURL;
+ OUString m_aURL;
float m_fScore;
HitItem( void ) {}
- HitItem( const rtl::OUString& aURL, float fScore )
+ HitItem( const OUString& aURL, float fScore )
: m_aURL( aURL )
, m_fScore( fScore )
{}
@@ -91,23 +91,23 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
{
Reference< XExtendedTransliteration > xTrans = Transliteration::create( rxContext );
Locale aLocale( aURLParameter.get_language(),
- rtl::OUString(),
- rtl::OUString() );
+ OUString(),
+ OUString() );
xTrans->loadModule(TransliterationModules_UPPERCASE_LOWERCASE,
aLocale );
- vector< vector< rtl::OUString > > queryList;
+ vector< vector< OUString > > queryList;
{
sal_Int32 idx;
- rtl::OUString query = m_aURLParameter.get_query();
+ OUString query = m_aURLParameter.get_query();
while( !query.isEmpty() )
{
idx = query.indexOf( sal_Unicode( ' ' ) );
if( idx == -1 )
idx = query.getLength();
- vector< rtl::OUString > currentQuery;
- rtl::OUString tmp(query.copy( 0,idx ));
+ vector< OUString > currentQuery;
+ OUString tmp(query.copy( 0,idx ));
rtl:: OUString toliterate = tmp;
Sequence<sal_Int32> aSeq;
toliterate = xTrans->transliterate(
@@ -118,19 +118,19 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
int nCpy = 1 + idx;
if( nCpy >= query.getLength() )
- query = rtl::OUString();
+ query = OUString();
else
query = query.copy( 1 + idx );
}
}
- vector< rtl::OUString > aCompleteResultVector;
- rtl::OUString scope = m_aURLParameter.get_scope();
+ vector< OUString > aCompleteResultVector;
+ OUString scope = m_aURLParameter.get_scope();
bool bCaptionsOnly = ( scope.compareToAscii( "Heading" ) == 0 );
sal_Int32 hitCount = m_aURLParameter.get_hitCount();
IndexFolderIterator aIndexFolderIt( *pDatabases, m_aURLParameter.get_module(), m_aURLParameter.get_language() );
- rtl::OUString idxDir;
+ OUString idxDir;
bool bExtension = false;
int iDir = 0;
vector< vector<HitItem>* > aIndexFolderResultVectorVector;
@@ -143,7 +143,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
try
{
vector< vector<HitItem>* > aQueryListResultVectorVector;
- set< rtl::OUString > aSet,aCurrent,aResultSet;
+ set< OUString > aSet,aCurrent,aResultSet;
int nQueryListSize = queryList.size();
if( nQueryListSize > 1 )
@@ -163,12 +163,12 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
}
pQueryResultVector->reserve( hitCount );
- rtl::OUString aLang = m_aURLParameter.get_language();
- const std::vector< rtl::OUString >& aListItem = queryList[i];
- ::rtl::OUString aNewQueryStr = aListItem[0];
+ OUString aLang = m_aURLParameter.get_language();
+ const std::vector< OUString >& aListItem = queryList[i];
+ OUString aNewQueryStr = aListItem[0];
vector<float> aScoreVector;
- vector<rtl::OUString> aPathVector;
+ vector<OUString> aPathVector;
try
{
@@ -313,14 +313,14 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
delete pIndexFolderVector;
}
- sal_Int32 replIdx = rtl::OUString( "#HLP#" ).getLength();
- rtl::OUString replWith = rtl::OUString( "vnd.sun.star.help://" );
+ sal_Int32 replIdx = OUString( "#HLP#" ).getLength();
+ OUString replWith = OUString( "vnd.sun.star.help://" );
int nResultCount = aCompleteResultVector.size();
for( int r = 0 ; r < nResultCount ; ++r )
{
- rtl::OUString aURL = aCompleteResultVector[r];
- rtl::OUString aResultStr = replWith + aURL.copy(replIdx);
+ OUString aURL = aCompleteResultVector[r];
+ OUString aResultStr = replWith + aURL.copy(replIdx);
m_aPath.push_back( aResultStr );
}
@@ -328,16 +328,16 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
m_aIdents.resize( m_aPath.size() );
Command aCommand;
- aCommand.Name = rtl::OUString( "getPropertyValues" );
+ aCommand.Name = OUString( "getPropertyValues" );
aCommand.Argument <<= m_sProperty;
for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow )
{
m_aPath[m_nRow] =
m_aPath[m_nRow] +
- rtl::OUString( "?Language=" ) +
+ OUString( "?Language=" ) +
m_aURLParameter.get_language() +
- rtl::OUString( "&System=" ) +
+ OUString( "&System=" ) +
m_aURLParameter.get_system();
uno::Reference< XContent > content = queryContent();
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index 5de197881271..aace7a6236a4 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -46,17 +46,17 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext
m_aIdents.resize( m_aPath.size() );
Command aCommand;
- aCommand.Name = rtl::OUString( "getPropertyValues" );
+ aCommand.Name = OUString( "getPropertyValues" );
aCommand.Argument <<= m_sProperty;
for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
{
m_aPath[i] =
- rtl::OUString( "vnd.sun.star.help://" ) +
+ OUString( "vnd.sun.star.help://" ) +
m_aPath[i] +
- rtl::OUString( "?Language=" ) +
+ OUString( "?Language=" ) +
m_aURLParameter.get_language() +
- rtl::OUString( "&System=" ) +
+ OUString( "&System=" ) +
m_aURLParameter.get_system();
m_nRow = sal_Int32( i );
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 2f968f64a36f..254be3166ff3 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -78,7 +78,7 @@ using namespace com::sun::star::container;
using namespace chelp;
-URLParameter::URLParameter( const rtl::OUString& aURL,
+URLParameter::URLParameter( const OUString& aURL,
Databases* pDatabases )
throw( com::sun::star::ucb::IllegalIdentifierException )
: m_pDatabases( pDatabases ),
@@ -104,9 +104,9 @@ bool URLParameter::isErrorDocument()
}
-rtl::OString URLParameter::getByName( const char* par )
+OString URLParameter::getByName( const char* par )
{
- rtl::OUString val;
+ OUString val;
if( strcmp( par,"Program" ) == 0 )
val = get_program();
@@ -125,11 +125,11 @@ rtl::OString URLParameter::getByName( const char* par )
else if( strcmp( par,"HelpPrefix" ) == 0 )
val = get_prefix();
- return rtl::OString( val.getStr(),val.getLength(),RTL_TEXTENCODING_UTF8 );
+ return OString( val.getStr(),val.getLength(),RTL_TEXTENCODING_UTF8 );
}
-rtl::OUString URLParameter::get_id()
+OUString URLParameter::get_id()
{
if( m_aId.compareToAscii("start") == 0 )
{ // module is set
@@ -145,7 +145,7 @@ rtl::OUString URLParameter::get_id()
return m_aId;
}
-rtl::OUString URLParameter::get_tag()
+OUString URLParameter::get_tag()
{
if( isFile() )
return get_the_tag();
@@ -154,7 +154,7 @@ rtl::OUString URLParameter::get_tag()
}
-rtl::OUString URLParameter::get_title()
+OUString URLParameter::get_title()
{
if( isFile() )
return get_the_title();
@@ -167,13 +167,13 @@ rtl::OUString URLParameter::get_title()
m_aTitle = inf->get_title();
}
else // This must be the root
- m_aTitle = rtl::OUString("root");
+ m_aTitle = OUString("root");
return m_aTitle;
}
-rtl::OUString URLParameter::get_language()
+OUString URLParameter::get_language()
{
if( m_aLanguage.isEmpty() )
return m_aDefaultLanguage;
@@ -182,7 +182,7 @@ rtl::OUString URLParameter::get_language()
}
-rtl::OUString URLParameter::get_program()
+OUString URLParameter::get_program()
{
if( m_aProgram.isEmpty() )
{
@@ -207,7 +207,7 @@ void URLParameter::init( bool bDefaultLanguageIsInitialized )
}
-rtl::OUString URLParameter::get_the_tag()
+OUString URLParameter::get_the_tag()
{
if(m_bUseDB) {
if( ! m_bHelpDataFileRead )
@@ -218,12 +218,12 @@ rtl::OUString URLParameter::get_the_tag()
return m_aTag;
}
else
- return rtl::OUString();
+ return OUString();
}
-rtl::OUString URLParameter::get_the_path()
+OUString URLParameter::get_the_path()
{
if(m_bUseDB) {
if( ! m_bHelpDataFileRead )
@@ -238,7 +238,7 @@ rtl::OUString URLParameter::get_the_path()
-rtl::OUString URLParameter::get_the_title()
+OUString URLParameter::get_the_title()
{
if(m_bUseDB) {
if( ! m_bHelpDataFileRead )
@@ -248,11 +248,11 @@ rtl::OUString URLParameter::get_the_title()
return m_aTitle;
}
else
- return rtl::OUString();
+ return OUString();
}
-rtl::OUString URLParameter::get_the_jar()
+OUString URLParameter::get_the_jar()
{
if(m_bUseDB) {
if( ! m_bHelpDataFileRead )
@@ -262,7 +262,7 @@ rtl::OUString URLParameter::get_the_jar()
return m_aJar;
}
else
- return get_module() + rtl::OUString(".jar");
+ return get_module() + OUString(".jar");
}
@@ -271,8 +271,8 @@ void URLParameter::readHelpDataFile()
if( get_id().compareToAscii("") == 0 )
return;
- rtl::OUString aModule = get_module();
- rtl::OUString aLanguage = get_language();
+ OUString aModule = get_module();
+ OUString aLanguage = get_language();
DataBaseIterator aDbIt( *m_pDatabases, aModule, aLanguage, false );
bool bSuccess = false;
@@ -280,15 +280,15 @@ void URLParameter::readHelpDataFile()
const sal_Char* pData = NULL;
helpdatafileproxy::HDFData aHDFData;
- rtl::OUString aExtensionPath;
- rtl::OUString aExtensionRegistryPath;
+ OUString aExtensionPath;
+ OUString aExtensionRegistryPath;
while( true )
{
helpdatafileproxy::Hdf* pHdf = aDbIt.nextHdf( &aExtensionPath, &aExtensionRegistryPath );
if( !pHdf )
break;
- rtl::OString keyStr( m_aId.getStr(),m_aId.getLength(),RTL_TEXTENCODING_UTF8 );
+ OString keyStr( m_aId.getStr(),m_aId.getLength(),RTL_TEXTENCODING_UTF8 );
bSuccess = pHdf->getValueForKey( keyStr, aHDFData );
if( bSuccess )
{
@@ -306,7 +306,7 @@ void URLParameter::readHelpDataFile()
m_aJar = converter.getDatabase();
if( !aExtensionPath.isEmpty() )
{
- rtl::OUStringBuffer aExtendedJarStrBuf;
+ OUStringBuffer aExtendedJarStrBuf;
aExtendedJarStrBuf.append( '?' );
aExtendedJarStrBuf.append( aExtensionPath );
aExtendedJarStrBuf.append( '?' );
@@ -405,10 +405,10 @@ void URLParameter::open( const Command& aCommand,
{
Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA =
- m_pDatabases->jarFile( rtl::OUString( "picture.jar" ),
+ m_pDatabases->jarFile( OUString( "picture.jar" ),
get_language() );
- rtl::OUString path = get_path();
+ OUString path = get_path();
if( xNA.is() )
{
try
@@ -473,10 +473,10 @@ void URLParameter::open( const Command& aCommand,
{
Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA =
- m_pDatabases->jarFile( rtl::OUString( "picture.jar" ),
+ m_pDatabases->jarFile( OUString( "picture.jar" ),
get_language() );
- rtl::OUString path = get_path();
+ OUString path = get_path();
if( xNA.is() )
{
try
@@ -522,12 +522,12 @@ bool URLParameter::scheme()
if( m_aExpr.startsWith("vnd.sun.star.help:///") )
{
sal_Int32 nLen = m_aExpr.getLength();
- rtl::OUString aLastStr =
+ OUString aLastStr =
m_aExpr.copy(sal::static_int_cast<sal_uInt32>(nLen) - 6);
if( aLastStr.compareToAscii( "DbPAR=" ) == 0 )
{
- rtl::OUString aNewExpr = m_aExpr.copy( 0, 20 );
- rtl::OUString aSharedStr("shared");
+ OUString aNewExpr = m_aExpr.copy( 0, 20 );
+ OUString aSharedStr("shared");
aNewExpr += aSharedStr;
aNewExpr += m_aExpr.copy( 20 );
aNewExpr += aSharedStr;
@@ -593,7 +593,7 @@ bool URLParameter::name( bool modulePresent )
bool URLParameter::query()
{
- rtl::OUString query_;
+ OUString query_;
if( m_aExpr.isEmpty() )
return true;
@@ -605,7 +605,7 @@ bool URLParameter::query()
bool ret = true;
sal_Int32 delimIdx,equalIdx;
- rtl::OUString parameter,value;
+ OUString parameter,value;
while( !query_.isEmpty() )
{
@@ -615,7 +615,7 @@ bool URLParameter::query()
if( delimIdx == -1 )
{
value = query_.copy( equalIdx + 1 ).trim();
- query_ = rtl::OUString();
+ query_ = OUString();
}
else
{
@@ -640,7 +640,7 @@ bool URLParameter::query()
if( m_aQuery.isEmpty() )
m_aQuery = value;
else
- m_aQuery += ( rtl::OUString( " " ) + value );
+ m_aQuery += ( OUString( " " ) + value );
}
else if( parameter.compareToAscii( "Scope" ) == 0 )
m_aScope = value;
@@ -707,14 +707,14 @@ helpMatch(const char * URI) {
static void *
fileOpen(const char *URI) {
- osl::File *pRet = new osl::File(rtl::OUString(URI, strlen(URI), RTL_TEXTENCODING_UTF8));
+ osl::File *pRet = new osl::File(OUString(URI, strlen(URI), RTL_TEXTENCODING_UTF8));
pRet->open(osl_File_OpenFlag_Read);
return pRet;
}
static void *
zipOpen(SAL_UNUSED_PARAMETER const char *) {
- rtl::OUString language,jar,path;
+ OUString language,jar,path;
if( !ugblData->m_pInitial->get_eid().isEmpty() )
return (void*)(new Reference< XHierarchicalNameAccess >);
@@ -753,9 +753,9 @@ zipOpen(SAL_UNUSED_PARAMETER const char *) {
static void *
helpOpen(const char * URI) {
- rtl::OUString language,jar,path;
+ OUString language,jar,path;
- URLParameter urlpar( rtl::OUString::createFromAscii( URI ),
+ URLParameter urlpar( OUString::createFromAscii( URI ),
ugblData->m_pDatabases );
jar = urlpar.get_jar();
@@ -868,43 +868,43 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
{
UserData userData( this,urlParam,pDatabases );
- // Uses the implementation detail, that rtl::OString::getStr returns a zero terminated character-array
+ // Uses the implementation detail, that OString::getStr returns a zero terminated character-array
const char* parameter[47];
- rtl::OString parString[46];
+ OString parString[46];
int last = 0;
parString[last++] = "Program";
- rtl::OString aPureProgramm( urlParam->getByName( "Program" ) );
- parString[last++] = rtl::OString('\'') + aPureProgramm + rtl::OString('\'');
+ OString aPureProgramm( urlParam->getByName( "Program" ) );
+ parString[last++] = OString('\'') + aPureProgramm + OString('\'');
parString[last++] = "Database";
- parString[last++] = rtl::OString('\'') + urlParam->getByName( "DatabasePar" ) + rtl::OString('\'');
+ parString[last++] = OString('\'') + urlParam->getByName( "DatabasePar" ) + OString('\'');
parString[last++] = "Id";
- parString[last++] = rtl::OString('\'') + urlParam->getByName( "Id" ) + rtl::OString('\'');
+ parString[last++] = OString('\'') + urlParam->getByName( "Id" ) + OString('\'');
parString[last++] = "Path";
- rtl::OString aPath( urlParam->getByName( "Path" ) );
- parString[last++] = rtl::OString('\'') + aPath + rtl::OString('\'');
+ OString aPath( urlParam->getByName( "Path" ) );
+ parString[last++] = OString('\'') + aPath + OString('\'');
- rtl::OString aPureLanguage = urlParam->getByName( "Language" );
+ OString aPureLanguage = urlParam->getByName( "Language" );
parString[last++] = "Language";
- parString[last++] = rtl::OString('\'') + aPureLanguage + rtl::OString('\'');
+ parString[last++] = OString('\'') + aPureLanguage + OString('\'');
parString[last++] = "System";
- parString[last++] = rtl::OString('\'') + urlParam->getByName( "System" ) + rtl::OString('\'');
+ parString[last++] = OString('\'') + urlParam->getByName( "System" ) + OString('\'');
parString[last++] = "productname";
- parString[last++] = rtl::OString('\'') + rtl::OString(
+ parString[last++] = OString('\'') + OString(
pDatabases->getProductName().getStr(),
pDatabases->getProductName().getLength(),
- RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
+ RTL_TEXTENCODING_UTF8 ) + OString('\'');
parString[last++] = "productversion";
- parString[last++] = rtl::OString('\'') +
- rtl::OString( pDatabases->getProductVersion().getStr(),
+ parString[last++] = OString('\'') +
+ OString( pDatabases->getProductVersion().getStr(),
pDatabases->getProductVersion().getLength(),
- RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
+ RTL_TEXTENCODING_UTF8 ) + OString('\'');
parString[last++] = "imgrepos";
- parString[last++] = rtl::OString('\'') + pDatabases->getImagesZipFileURL() + rtl::OString('\'');
+ parString[last++] = OString('\'') + pDatabases->getImagesZipFileURL() + OString('\'');
parString[last++] = "hp";
- parString[last++] = rtl::OString('\'') + urlParam->getByName( "HelpPrefix" ) + rtl::OString('\'');
+ parString[last++] = OString('\'') + urlParam->getByName( "HelpPrefix" ) + OString('\'');
if( !parString[last-1].isEmpty() )
{
@@ -926,19 +926,19 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
parString[last++] = "'css'";
parString[last++] = "vendorname";
- parString[last++] = rtl::OString("''");
+ parString[last++] = OString("''");
parString[last++] = "vendorversion";
- parString[last++] = rtl::OString("''");
+ parString[last++] = OString("''");
parString[last++] = "vendorshort";
- parString[last++] = rtl::OString("''");
+ parString[last++] = OString("''");
}
// Do we need to add extension path?
- ::rtl::OUString aExtensionPath;
- rtl::OUString aJar = urlParam->get_jar();
+ OUString aExtensionPath;
+ OUString aJar = urlParam->get_jar();
bool bAddExtensionPath = false;
- rtl::OUString aExtensionRegistryPath;
+ OUString aExtensionRegistryPath;
sal_Int32 nQuestionMark1 = aJar.indexOf( sal_Unicode('?') );
sal_Int32 nQuestionMark2 = aJar.lastIndexOf( sal_Unicode('?') );
if( nQuestionMark1 != -1 && nQuestionMark2 != -1 && nQuestionMark1 != nQuestionMark2 )
@@ -961,29 +961,29 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
Reference< XComponentContext > xContext(
comphelper::getProcessComponentContext() );
- rtl::OUString aOUExpandedExtensionPath = Databases::expandURL( aExtensionRegistryPath, xContext );
- rtl::OString aExpandedExtensionPath = rtl::OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() );
+ OUString aOUExpandedExtensionPath = Databases::expandURL( aExtensionRegistryPath, xContext );
+ OString aExpandedExtensionPath = OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() );
parString[last++] = "ExtensionPath";
- parString[last++] = rtl::OString('\'') + aExpandedExtensionPath + rtl::OString('\'');
+ parString[last++] = OString('\'') + aExpandedExtensionPath + OString('\'');
// ExtensionId
- rtl::OString aPureExtensionId;
+ OString aPureExtensionId;
sal_Int32 iSlash = aPath.indexOf( '/' );
if( iSlash != -1 )
aPureExtensionId = aPath.copy( 0, iSlash );
parString[last++] = "ExtensionId";
- parString[last++] = rtl::OString('\'') + aPureExtensionId + rtl::OString('\'');
+ parString[last++] = OString('\'') + aPureExtensionId + OString('\'');
}
for( int i = 0; i < last; ++i )
parameter[i] = parString[i].getStr();
parameter[last] = 0;
- rtl::OUString xslURL = pDatabases->getInstallPathAsURL();
+ OUString xslURL = pDatabases->getInstallPathAsURL();
- rtl::OString xslURLascii(
+ OString xslURLascii(
xslURL.getStr(),
xslURL.getLength(),
RTL_TEXTENCODING_UTF8);
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 2e7ba31e1463..fa57a89c0365 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -44,27 +44,27 @@ namespace chelp {
}
- rtl::OUString getHash()
+ OUString getHash()
{
if( m_ptr )
{
sal_Int32 sizeOfFile = ( sal_Int32 ) m_ptr[0];
- rtl::OUString Hash( m_ptr+1,sizeOfFile,RTL_TEXTENCODING_UTF8 );
+ OUString Hash( m_ptr+1,sizeOfFile,RTL_TEXTENCODING_UTF8 );
sal_Int32 idx;
if( ( idx = Hash.indexOf( sal_Unicode( '#' ) ) ) != -1 )
return Hash.copy( 1+idx );
}
- return rtl::OUString();
+ return OUString();
}
- rtl::OUString getFile()
+ OUString getFile()
{
if( ! m_ptr )
- return rtl::OUString();
+ return OUString();
sal_Int32 sizeOfFile = ( sal_Int32 ) m_ptr[0];
- rtl::OUString File( m_ptr+1,sizeOfFile,RTL_TEXTENCODING_UTF8 );
+ OUString File( m_ptr+1,sizeOfFile,RTL_TEXTENCODING_UTF8 );
sal_Int32 idx;
if( ( idx = File.indexOf( sal_Unicode( '#' ) ) ) != -1 )
return File.copy( 0,idx );
@@ -73,24 +73,24 @@ namespace chelp {
}
- rtl::OUString getDatabase()
+ OUString getDatabase()
{
if( ! m_ptr )
- return rtl::OUString();
+ return OUString();
sal_Int32 sizeOfDatabase = ( int ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ];
- return rtl::OUString( m_ptr + 2 + ( sal_Int32 ) m_ptr[0],sizeOfDatabase,RTL_TEXTENCODING_UTF8 );
+ return OUString( m_ptr + 2 + ( sal_Int32 ) m_ptr[0],sizeOfDatabase,RTL_TEXTENCODING_UTF8 );
}
- rtl::OUString getTitle()
+ OUString getTitle()
{
if( ! m_ptr )
- return rtl::OUString();
+ return OUString();
sal_Int32 sizeOfTitle =
( sal_Int32 ) m_ptr[ 2 + m_ptr[0] + ( sal_Int32 ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ] ];
- return rtl::OUString( m_ptr + 3 + m_ptr[0] + ( sal_Int32 ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ],
+ return OUString( m_ptr + 3 + m_ptr[0] + ( sal_Int32 ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ],
sizeOfTitle,
RTL_TEXTENCODING_UTF8 );
}
@@ -109,7 +109,7 @@ namespace chelp {
{
public:
- URLParameter( const rtl::OUString& aURL,
+ URLParameter( const OUString& aURL,
Databases* pDatabases )
throw( com::sun::star::ucb::IllegalIdentifierException );
@@ -122,27 +122,27 @@ namespace chelp {
bool isRoot() const { return m_aModule.isEmpty(); }
bool isErrorDocument();
- rtl::OUString get_url() const { return m_aURL; }
+ OUString get_url() const { return m_aURL; }
- rtl::OUString get_id();
+ OUString get_id();
- rtl::OUString get_tag();
+ OUString get_tag();
// Not called for an directory
- rtl::OUString get_path() { return get_the_path(); }
+ OUString get_path() { return get_the_path(); }
- rtl::OUString get_eid() const { return m_aEid; }
+ OUString get_eid() const { return m_aEid; }
- rtl::OUString get_title();
+ OUString get_title();
- rtl::OUString get_jar() { return get_the_jar(); }
+ OUString get_jar() { return get_the_jar(); }
- rtl::OUString get_ExtensionRegistryPath() const { return m_aExtensionRegistryPath; }
+ OUString get_ExtensionRegistryPath() const { return m_aExtensionRegistryPath; }
- rtl::OUString get_module() const { return m_aModule; }
+ OUString get_module() const { return m_aModule; }
- rtl::OUString get_dbpar() const
+ OUString get_dbpar() const
{
if( !m_aDbPar.isEmpty() )
return m_aDbPar;
@@ -150,23 +150,23 @@ namespace chelp {
return m_aModule;
}
- rtl::OUString get_prefix() const { return m_aPrefix; }
+ OUString get_prefix() const { return m_aPrefix; }
- rtl::OUString get_language();
+ OUString get_language();
- rtl::OUString get_device() const { return m_aDevice; }
+ OUString get_device() const { return m_aDevice; }
- rtl::OUString get_program();
+ OUString get_program();
- rtl::OUString get_query() const { return m_aQuery; }
+ OUString get_query() const { return m_aQuery; }
- rtl::OUString get_scope() const { return m_aScope; }
+ OUString get_scope() const { return m_aScope; }
- rtl::OUString get_system() const { return m_aSystem; }
+ OUString get_system() const { return m_aSystem; }
sal_Int32 get_hitCount() const { return m_nHitCount; }
- rtl::OString getByName( const char* par );
+ OString getByName( const char* par );
void open( const com::sun::star::ucb::Command& aCommand,
sal_Int32 CommandId,
@@ -186,31 +186,31 @@ namespace chelp {
bool m_bStart;
bool m_bUseDB;
- rtl::OUString m_aURL;
+ OUString m_aURL;
- rtl::OUString m_aTag;
- rtl::OUString m_aId;
- rtl::OUString m_aPath;
- rtl::OUString m_aModule;
- rtl::OUString m_aTitle;
- rtl::OUString m_aJar;
- rtl::OUString m_aExtensionRegistryPath;
- rtl::OUString m_aEid;
- rtl::OUString m_aDbPar;
+ OUString m_aTag;
+ OUString m_aId;
+ OUString m_aPath;
+ OUString m_aModule;
+ OUString m_aTitle;
+ OUString m_aJar;
+ OUString m_aExtensionRegistryPath;
+ OUString m_aEid;
+ OUString m_aDbPar;
- rtl::OUString m_aDefaultLanguage;
- rtl::OUString m_aLanguage;
+ OUString m_aDefaultLanguage;
+ OUString m_aLanguage;
- rtl::OUString m_aPrefix;
- rtl::OUString m_aDevice;
- rtl::OUString m_aProgram;
- rtl::OUString m_aSystem;
- rtl::OUString m_aActive;
+ OUString m_aPrefix;
+ OUString m_aDevice;
+ OUString m_aProgram;
+ OUString m_aSystem;
+ OUString m_aActive;
- rtl::OUString m_aQuery;
- rtl::OUString m_aScope;
+ OUString m_aQuery;
+ OUString m_aScope;
- rtl::OUString m_aExpr;
+ OUString m_aExpr;
sal_Int32 m_nHitCount; // The default maximum hitcount
@@ -219,13 +219,13 @@ namespace chelp {
void init( bool bDefaultLanguageIsInitialized );
- rtl::OUString get_the_tag();
+ OUString get_the_tag();
- rtl::OUString get_the_path();
+ OUString get_the_path();
- rtl::OUString get_the_title();
+ OUString get_the_title();
- rtl::OUString get_the_jar();
+ OUString get_the_jar();
void readHelpDataFile();
diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
index aa927650ef27..e2ee86611c09 100644
--- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx
+++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
@@ -43,7 +43,7 @@ extern RandomAccessStream* theFile();
void print_rtl_OUString( const OUString bla )
{
- rtl::OString bluber = rtl::OString( bla.getStr(),bla.getLength(),RTL_TEXTENCODING_UTF8 );
+ OString bluber = OString( bla.getStr(),bla.getLength(),RTL_TEXTENCODING_UTF8 );
char* bluberChr = new char[ 1+bluber.getLength() ];
const sal_Char* jux = bluber.getStr();
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index ee443f786b7a..d6dddaf05564 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -96,7 +96,7 @@ XTYPEPROVIDER_IMPL_3( TVFactory,
// XServiceInfo methods.
-rtl::OUString SAL_CALL
+OUString SAL_CALL
TVFactory::getImplementationName()
throw( RuntimeException )
{
@@ -106,7 +106,7 @@ TVFactory::getImplementationName()
sal_Bool SAL_CALL
TVFactory::supportsService(
- const rtl::OUString& ServiceName )
+ const OUString& ServiceName )
throw( RuntimeException )
{
return
@@ -115,7 +115,7 @@ TVFactory::supportsService(
}
-Sequence< rtl::OUString > SAL_CALL
+Sequence< OUString > SAL_CALL
TVFactory::getSupportedServiceNames( void )
throw( RuntimeException )
{
@@ -128,15 +128,15 @@ TVFactory::getSupportedServiceNames( void )
Reference< XInterface > SAL_CALL
TVFactory::createInstance(
- const rtl::OUString& aServiceSpecifier )
+ const OUString& aServiceSpecifier )
throw( Exception,
RuntimeException )
{
Any aAny;
- aAny <<= rtl::OUString();
+ aAny <<= OUString();
Sequence< Any > seq( 1 );
seq[0] <<= PropertyValue(
- rtl::OUString( "nodepath" ),
+ OUString( "nodepath" ),
-1,
aAny,
PropertyState_DIRECT_VALUE );
@@ -148,7 +148,7 @@ TVFactory::createInstance(
Reference< XInterface > SAL_CALL
TVFactory::createInstanceWithArguments(
- const rtl::OUString& ServiceSpecifier,
+ const OUString& ServiceSpecifier,
const Sequence< Any >& Arguments )
throw( Exception,
RuntimeException )
@@ -163,7 +163,7 @@ TVFactory::createInstanceWithArguments(
Reference< XInterface > ret = m_xHDS;
- rtl::OUString hierview;
+ OUString hierview;
for( int i = 0; i < Arguments.getLength(); ++i )
{
PropertyValue pV;
@@ -192,12 +192,12 @@ TVFactory::createInstanceWithArguments(
}
-Sequence< rtl::OUString > SAL_CALL
+Sequence< OUString > SAL_CALL
TVFactory::getAvailableServiceNames( )
throw( RuntimeException )
{
- Sequence< rtl::OUString > seq( 1 );
- seq[0] = rtl::OUString( "com.sun.star.ucb.HierarchyDataReadAccess" );
+ Sequence< OUString > seq( 1 );
+ seq[0] = OUString( "com.sun.star.ucb.HierarchyDataReadAccess" );
return seq;
}
@@ -206,19 +206,19 @@ TVFactory::getAvailableServiceNames( )
// static
-rtl::OUString SAL_CALL
+OUString SAL_CALL
TVFactory::getImplementationName_static()
{
- return rtl::OUString( "com.sun.star.help.TreeViewImpl" );
+ return OUString( "com.sun.star.help.TreeViewImpl" );
}
-Sequence< rtl::OUString > SAL_CALL
+Sequence< OUString > SAL_CALL
TVFactory::getSupportedServiceNames_static()
{
- Sequence< rtl::OUString > seq( 2 );
- seq[0] = rtl::OUString( "com.sun.star.help.TreeView" );
- seq[1] = rtl::OUString( "com.sun.star.ucb.HiearchyDataSource" );
+ Sequence< OUString > seq( 2 );
+ seq[0] = OUString( "com.sun.star.help.TreeView" );
+ seq[1] = OUString( "com.sun.star.ucb.HiearchyDataSource" );
return seq;
}
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 9d926b107f8f..83ebfd7ca012 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -97,40 +97,40 @@ namespace treeview {
void setApplication( const char* appl )
{
- application = rtl::OUString( (sal_Char*)(appl),
+ application = OUString( (sal_Char*)(appl),
strlen( appl ),
RTL_TEXTENCODING_UTF8 );
}
void setTitle( const char* itle )
{
- title += rtl::OUString( (sal_Char*)(itle),
+ title += OUString( (sal_Char*)(itle),
strlen( itle ),
RTL_TEXTENCODING_UTF8 );
}
void setTitle( const XML_Char* itle,int len )
{
- title += rtl::OUString( (sal_Char*)(itle),
+ title += OUString( (sal_Char*)(itle),
len,
RTL_TEXTENCODING_UTF8 );
}
void setId( const char* d )
{
- id = rtl::OUString( (sal_Char*)(d),
+ id = OUString( (sal_Char*)(d),
strlen( d ),
RTL_TEXTENCODING_UTF8 );
}
void setAnchor( const char* nchor )
{
- anchor = rtl::OUString( (sal_Char*)(nchor),
+ anchor = OUString( (sal_Char*)(nchor),
strlen( nchor ),
RTL_TEXTENCODING_UTF8 );
}
- rtl::OUString getTargetURL()
+ OUString getTargetURL()
{
if( targetURL.isEmpty() )
{
@@ -142,7 +142,7 @@ namespace treeview {
break;
}
- rtl::OUStringBuffer strBuff( 22 + len + id.getLength() );
+ OUStringBuffer strBuff( 22 + len + id.getLength() );
strBuff.appendAscii(
"vnd.sun.star.help://"
).append(id);
@@ -156,11 +156,11 @@ namespace treeview {
private:
Kind kind;
- rtl::OUString application;
- rtl::OUString title;
- rtl::OUString id;
- rtl::OUString anchor;
- rtl::OUString targetURL;
+ OUString application;
+ OUString title;
+ OUString id;
+ OUString anchor;
+ OUString targetURL;
TVDom *parent;
std::vector< TVDom* > children;
@@ -191,11 +191,11 @@ ConfigData::ConfigData()
{
}
-void SAL_CALL ConfigData::replaceName( rtl::OUString& oustring ) const
+void SAL_CALL ConfigData::replaceName( OUString& oustring ) const
{
sal_Int32 idx = -1,k = 0,off;
bool cap = false;
- rtl::OUStringBuffer aStrBuf( 0 );
+ OUStringBuffer aStrBuf( 0 );
while( ( idx = oustring.indexOf( sal_Unicode('%'),++idx ) ) != -1 )
{
@@ -306,7 +306,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )
{
TargetURL = ( tvDom->getTargetURL() + configData.appendix );
if( !tvDom->anchor.isEmpty() )
- TargetURL += ( rtl::OUString( "#" ) +
+ TargetURL += ( OUString( "#" ) +
tvDom->anchor );
}
else
@@ -327,7 +327,7 @@ TVRead::~TVRead()
// XNameAccess
Any SAL_CALL
-TVRead::getByName( const rtl::OUString& aName )
+TVRead::getByName( const OUString& aName )
throw( NoSuchElementException,
WrappedTargetException,
RuntimeException )
@@ -355,15 +355,15 @@ TVRead::getByName( const rtl::OUString& aName )
-Sequence< rtl::OUString > SAL_CALL
+Sequence< OUString > SAL_CALL
TVRead::getElementNames( )
throw( RuntimeException )
{
- Sequence< rtl::OUString > seq( 3 );
+ Sequence< OUString > seq( 3 );
- seq[0] = rtl::OUString( "Title" );
- seq[1] = rtl::OUString( "TargetURL" );
- seq[2] = rtl::OUString( "Children" );
+ seq[0] = OUString( "Title" );
+ seq[1] = OUString( "TargetURL" );
+ seq[2] = OUString( "Children" );
return seq;
}
@@ -371,7 +371,7 @@ TVRead::getElementNames( )
sal_Bool SAL_CALL
-TVRead::hasByName( const rtl::OUString& aName )
+TVRead::hasByName( const OUString& aName )
throw( RuntimeException )
{
if( aName.compareToAscii( "Title" ) == 0 ||
@@ -386,12 +386,12 @@ TVRead::hasByName( const rtl::OUString& aName )
// XHierarchicalNameAccess
Any SAL_CALL
-TVRead::getByHierarchicalName( const rtl::OUString& aName )
+TVRead::getByHierarchicalName( const OUString& aName )
throw( NoSuchElementException,
RuntimeException )
{
sal_Int32 idx;
- rtl::OUString name( aName );
+ OUString name( aName );
if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 &&
name.copy( 0,idx ).compareToAscii( "Children" ) == 0 )
@@ -404,11 +404,11 @@ TVRead::getByHierarchicalName( const rtl::OUString& aName )
sal_Bool SAL_CALL
-TVRead::hasByHierarchicalName( const rtl::OUString& aName )
+TVRead::hasByHierarchicalName( const OUString& aName )
throw( RuntimeException )
{
sal_Int32 idx;
- rtl::OUString name( aName );
+ OUString name( aName );
if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 &&
name.copy( 0,idx ).compareToAscii( "Children" ) == 0 )
@@ -613,12 +613,12 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
}
Any SAL_CALL
-TVChildTarget::getByName( const rtl::OUString& aName )
+TVChildTarget::getByName( const OUString& aName )
throw( NoSuchElementException,
WrappedTargetException,
RuntimeException )
{
- rtl::OUString num( aName.getStr()+2,aName.getLength()-4 );
+ OUString num( aName.getStr()+2,aName.getLength()-4 );
sal_Int32 idx = num.toInt32() - 1;
if( idx < 0 || Elements.size() <= sal_uInt32( idx ) )
throw NoSuchElementException();
@@ -632,13 +632,13 @@ TVChildTarget::getByName( const rtl::OUString& aName )
-Sequence< rtl::OUString > SAL_CALL
+Sequence< OUString > SAL_CALL
TVChildTarget::getElementNames( )
throw( RuntimeException )
{
- Sequence< rtl::OUString > seq( Elements.size() );
+ Sequence< OUString > seq( Elements.size() );
for( unsigned i = 0; i < Elements.size(); ++i )
- seq[i] = rtl::OUString::valueOf( sal_Int32( 1+i ) );
+ seq[i] = OUString::valueOf( sal_Int32( 1+i ) );
return seq;
}
@@ -646,10 +646,10 @@ TVChildTarget::getElementNames( )
sal_Bool SAL_CALL
-TVChildTarget::hasByName( const rtl::OUString& aName )
+TVChildTarget::hasByName( const OUString& aName )
throw( RuntimeException )
{
- rtl::OUString num( aName.getStr()+2,aName.getLength()-4 );
+ OUString num( aName.getStr()+2,aName.getLength()-4 );
sal_Int32 idx = num.toInt32() - 1;
if( idx < 0 || Elements.size() <= sal_uInt32( idx ) )
return false;
@@ -662,16 +662,16 @@ TVChildTarget::hasByName( const rtl::OUString& aName )
// XHierarchicalNameAccess
Any SAL_CALL
-TVChildTarget::getByHierarchicalName( const rtl::OUString& aName )
+TVChildTarget::getByHierarchicalName( const OUString& aName )
throw( NoSuchElementException,
RuntimeException )
{
sal_Int32 idx;
- rtl::OUString name( aName );
+ OUString name( aName );
if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 )
{
- rtl::OUString num( name.getStr()+2,idx-4 );
+ OUString num( name.getStr()+2,idx-4 );
sal_Int32 pref = num.toInt32() - 1;
if( pref < 0 || Elements.size() <= sal_uInt32( pref ) )
@@ -686,15 +686,15 @@ TVChildTarget::getByHierarchicalName( const rtl::OUString& aName )
sal_Bool SAL_CALL
-TVChildTarget::hasByHierarchicalName( const rtl::OUString& aName )
+TVChildTarget::hasByHierarchicalName( const OUString& aName )
throw( RuntimeException )
{
sal_Int32 idx;
- rtl::OUString name( aName );
+ OUString name( aName );
if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 )
{
- rtl::OUString num( name.getStr()+2,idx-4 );
+ OUString num( name.getStr()+2,idx-4 );
sal_Int32 pref = num.toInt32() - 1;
if( pref < 0 || Elements.size() <= sal_uInt32( pref ) )
return false;
@@ -721,12 +721,12 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
Reference< XHierarchicalNameAccess > xHierAccess( getHierAccess( sProvider,
"org.openoffice.Office.Common" ) );
- rtl::OUString system( getKey( xHierAccess,"Help/System" ) );
+ OUString system( getKey( xHierAccess,"Help/System" ) );
sal_Bool showBasic( getBooleanKey(xHierAccess,"Help/ShowBasic") );
- rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
+ OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( instPath.isEmpty() )
// try to determine path from default
- instPath = rtl::OUString( "$(instpath)/help" );
+ instPath = OUString( "$(instpath)/help" );
// replace anything like $(instpath);
subst( xSMgr,instPath );
@@ -738,8 +738,8 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
xHierAccess = getHierAccess( sProvider,
"org.openoffice.Setup" );
- rtl::OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) );
- rtl::OUString setupextension;
+ OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) );
+ OUString setupextension;
try
{
@@ -747,17 +747,17 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
- aParam.Name = ::rtl::OUString("nodepath");
- aParam.Value <<= ::rtl::OUString("/org.openoffice.Setup/Product");
+ aParam.Name = OUString("nodepath");
+ aParam.Value <<= OUString("/org.openoffice.Setup/Product");
lParams[0] = uno::makeAny(aParam);
// open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"),
+ OUString("com.sun.star.configuration.ConfigurationAccess"),
lParams) );
uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
- uno::Any aRet = xDirectAccess->getByName(::rtl::OUString("ooSetupExtension"));
+ uno::Any aRet = xDirectAccess->getByName(OUString("ooSetupExtension"));
aRet >>= setupextension;
}
@@ -765,19 +765,19 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
{
}
- rtl::OUString productVersion( setupversion +
- rtl::OUString( " " ) +
+ OUString productVersion( setupversion +
+ OUString( " " ) +
setupextension );
- rtl::OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) );
+ OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) );
// Determine fileurl from url and locale
- rtl::OUString url;
+ OUString url;
osl::FileBase::RC errFile = osl::FileBase::getFileURLFromSystemPath( instPath,url );
if( errFile != osl::FileBase::E_None ) return configData;
if( url.lastIndexOf( sal_Unicode( '/' ) ) != url.getLength() - 1 )
- url += rtl::OUString( "/" );
- rtl::OUString ret;
+ url += OUString( "/" );
+ OUString ret;
sal_Int32 idx;
osl::DirectoryItem aDirItem;
if( osl::FileBase::E_None == osl::DirectoryItem::get( url + locale,aDirItem ) )
@@ -789,8 +789,8 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
ret = locale.copy( 0,idx );
else
{
- locale = rtl::OUString( "en-US" );
- ret = rtl::OUString("en");
+ locale = OUString( "en-US" );
+ ret = OUString("en");
}
url = url + ret;
@@ -798,7 +798,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
// Start with extensions to set them at the end of the list
TreeFileIterator aTreeIt( locale );
- rtl::OUString aTreeFile;
+ OUString aTreeFile;
sal_Int32 nFileSize;
while( !(aTreeFile = aTreeIt.nextTreeFile( nFileSize ) ).isEmpty() )
{
@@ -811,7 +811,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
if( osl::Directory::E_None == aDirectory.open() )
{
int idx_ = 0;
- rtl::OUString aFileUrl, aFileName;
+ OUString aFileUrl, aFileName;
while( aDirectory.getNextItem( aDirItem ) == osl::FileBase::E_None &&
aDirItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None &&
aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) &&
@@ -834,7 +834,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
OSL_ENSURE( aFileStatus.isValid( osl_FileStatus_Mask_FileSize ),
"invalid file size" );
- rtl::OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase();
+ OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase();
if(! showBasic && baseName.compareToAscii("sbasic") == 0 )
continue;
osl::File aFile( aFileUrl );
@@ -863,11 +863,11 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
configData.system = system;
configData.locale = locale;
configData.appendix =
- rtl::OUString( "?Language=" ) +
+ OUString( "?Language=" ) +
configData.locale +
- rtl::OUString( "&System=" ) +
+ OUString( "&System=" ) +
configData.system +
- rtl::OUString( "&UseDB=no" ) ;
+ OUString( "&UseDB=no" ) ;
return configData;
}
@@ -910,10 +910,10 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider
if( sProvider.is() )
{
Sequence< Any > seq(1);
- rtl::OUString sReaderService =
- rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" );
+ OUString sReaderService =
+ OUString( "com.sun.star.configuration.ConfigurationAccess" );
- seq[0] <<= rtl::OUString::createFromAscii( file );
+ seq[0] <<= OUString::createFromAscii( file );
try
{
@@ -932,18 +932,18 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider
-rtl::OUString
+OUString
TVChildTarget::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess,
const char* key ) const
{
- rtl::OUString instPath;
+ OUString instPath;
if( xHierAccess.is() )
{
Any aAny;
try
{
aAny =
- xHierAccess->getByHierarchicalName( rtl::OUString::createFromAscii( key ) );
+ xHierAccess->getByHierarchicalName( OUString::createFromAscii( key ) );
}
catch( const com::sun::star::container::NoSuchElementException& )
{
@@ -967,7 +967,7 @@ TVChildTarget::getBooleanKey(const Reference<
{
aAny =
xHierAccess->getByHierarchicalName(
- rtl::OUString::createFromAscii(key));
+ OUString::createFromAscii(key));
}
catch( const com::sun::star::container::NoSuchElementException& )
{
@@ -979,7 +979,7 @@ TVChildTarget::getBooleanKey(const Reference<
void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr,
- rtl::OUString& instpath ) const
+ OUString& instpath ) const
{
Reference< XConfigManager > xCfgMgr;
if( m_xSMgr.is() )
@@ -988,7 +988,7 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr,
{
xCfgMgr =
Reference< XConfigManager >(
- m_xSMgr->createInstance( rtl::OUString( "com.sun.star.config.SpecialConfigManager" ) ),
+ m_xSMgr->createInstance( OUString( "com.sun.star.config.SpecialConfigManager" ) ),
UNO_QUERY );
}
catch( const com::sun::star::uno::Exception& )
@@ -1007,11 +1007,11 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr,
//===================================================================
// class ExtensionIteratorBase
-static rtl::OUString aSlash("/");
-static rtl::OUString aHelpFilesBaseName("help");
-static rtl::OUString aHelpMediaType("application/vnd.sun.star.help");
+static OUString aSlash("/");
+static OUString aHelpFilesBaseName("help");
+static OUString aHelpMediaType("application/vnd.sun.star.help");
-ExtensionIteratorBase::ExtensionIteratorBase( const rtl::OUString& aLanguage )
+ExtensionIteratorBase::ExtensionIteratorBase( const OUString& aLanguage )
: m_eState( USER_EXTENSIONS )
, m_aLanguage( aLanguage )
{
@@ -1024,7 +1024,7 @@ void ExtensionIteratorBase::init()
if( !m_xContext.is() )
{
throw RuntimeException(
- ::rtl::OUString( "ExtensionIteratorBase::init(), no XComponentContext" ),
+ OUString( "ExtensionIteratorBase::init(), no XComponentContext" ),
Reference< XInterface >() );
}
@@ -1070,7 +1070,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
{
const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ];
const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType();
- rtl::OUString aMediaType = xPackageTypeInfo->getMediaType();
+ OUString aMediaType = xPackageTypeInfo->getMediaType();
if( aMediaType.equals( aHelpMediaType ) )
{
xHelpPackage = xSubPkg;
@@ -1082,7 +1082,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
else
{
const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType();
- rtl::OUString aMediaType = xPackageTypeInfo->getMediaType();
+ OUString aMediaType = xPackageTypeInfo->getMediaType();
if( aMediaType.equals( aHelpMediaType ) )
xHelpPackage = xPackage;
}
@@ -1098,7 +1098,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
if( !m_bUserPackagesLoaded )
{
Reference< XPackageManager > xUserManager =
- thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString("user") );
+ thePackageManagerFactory::get( m_xContext )->getPackageManager( OUString("user") );
m_aUserPackagesSeq = xUserManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
@@ -1128,7 +1128,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
if( !m_bSharedPackagesLoaded )
{
Reference< XPackageManager > xSharedManager =
- thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString("shared") );
+ thePackageManagerFactory::get( m_xContext )->getPackageManager( OUString("shared") );
m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
@@ -1158,7 +1158,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
if( !m_bBundledPackagesLoaded )
{
Reference< XPackageManager > xBundledManager =
- thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString("bundled") );
+ thePackageManagerFactory::get( m_xContext )->getPackageManager( OUString("bundled") );
m_aBundledPackagesSeq = xBundledManager->getDeployedPackages
( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
@@ -1185,24 +1185,24 @@ inline bool isLetter( sal_Unicode c )
return comphelper::string::isalphaAscii(c);
}
-void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv,
+void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv,
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage )
{
rv.clear();
- rtl::OUString aExtensionPath = xPackage->getURL();
- Sequence< rtl::OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true );
+ OUString aExtensionPath = xPackage->getURL();
+ Sequence< OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true );
- const rtl::OUString* pSeq = aEntrySeq.getConstArray();
+ const OUString* pSeq = aEntrySeq.getConstArray();
sal_Int32 nCount = aEntrySeq.getLength();
for( sal_Int32 i = 0 ; i < nCount ; ++i )
{
- rtl::OUString aEntry = pSeq[i];
+ OUString aEntry = pSeq[i];
if( m_xSFA->isFolder( aEntry ) )
{
sal_Int32 nLastSlash = aEntry.lastIndexOf( '/' );
if( nLastSlash != -1 )
{
- rtl::OUString aPureEntry = aEntry.copy( nLastSlash + 1 );
+ OUString aPureEntry = aEntry.copy( nLastSlash + 1 );
// Check language sceme
int nLen = aPureEntry.getLength();
@@ -1221,9 +1221,9 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::r
//===================================================================
// class TreeFileIterator
-rtl::OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize )
+OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize )
{
- rtl::OUString aRetFile;
+ OUString aRetFile;
while( aRetFile.isEmpty() && m_eState != END_REACHED )
{
@@ -1270,7 +1270,7 @@ rtl::OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize )
return aRetFile;
}
-rtl::OUString TreeFileIterator::expandURL( const rtl::OUString& aURL )
+OUString TreeFileIterator::expandURL( const OUString& aURL )
{
static Reference< util::XMacroExpander > xMacroExpander;
static Reference< uri::XUriReferenceFactory > xFac;
@@ -1284,7 +1284,7 @@ rtl::OUString TreeFileIterator::expandURL( const rtl::OUString& aURL )
xMacroExpander = util::theMacroExpander::get(m_xContext);
}
- rtl::OUString aRetURL = aURL;
+ OUString aRetURL = aURL;
Reference< uri::XUriReference > uriRef;
for (;;)
{
@@ -1301,14 +1301,14 @@ rtl::OUString TreeFileIterator::expandURL( const rtl::OUString& aURL )
return aRetURL;
}
-rtl::OUString TreeFileIterator::implGetTreeFileFromPackage
+OUString TreeFileIterator::implGetTreeFileFromPackage
( sal_Int32& rnFileSize, Reference< deployment::XPackage > xPackage )
{
- rtl::OUString aRetFile;
- rtl::OUString aLanguage = m_aLanguage;
+ OUString aRetFile;
+ OUString aLanguage = m_aLanguage;
for( sal_Int32 iPass = 0 ; iPass < 2 ; ++iPass )
{
- rtl::OUStringBuffer aStrBuf;
+ OUStringBuffer aStrBuf;
aStrBuf.append( xPackage->getURL() );
aStrBuf.append( aSlash );
aStrBuf.append( aLanguage );
@@ -1322,9 +1322,9 @@ rtl::OUString TreeFileIterator::implGetTreeFileFromPackage
if( m_xSFA->exists( aRetFile ) )
break;
- ::std::vector< ::rtl::OUString > av;
+ ::std::vector< OUString > av;
implGetLanguageVectorFromPackage( av, xPackage );
- ::std::vector< ::rtl::OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage );
+ ::std::vector< OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage );
if( pFound != av.end() )
aLanguage = *pFound;
}
@@ -1334,7 +1334,7 @@ rtl::OUString TreeFileIterator::implGetTreeFileFromPackage
if( m_xSFA->exists( aRetFile ) )
rnFileSize = m_xSFA->getSize( aRetFile );
else
- aRetFile = rtl::OUString();
+ aRetFile = OUString();
return aRetFile;
}
diff --git a/xmlhelp/source/treeview/tvread.hxx b/xmlhelp/source/treeview/tvread.hxx
index bc8f52091ae6..1a9649b8edb0 100644
--- a/xmlhelp/source/treeview/tvread.hxx
+++ b/xmlhelp/source/treeview/tvread.hxx
@@ -47,15 +47,15 @@ namespace treeview {
VENDORSHORT };
ConfigData();
int m_vAdd[5];
- rtl::OUString m_vReplacement[5];
- rtl::OUString prodName,prodVersion,vendName,vendVersion,vendShort;
+ OUString m_vReplacement[5];
+ OUString prodName,prodVersion,vendName,vendVersion,vendShort;
std::vector< sal_uInt64 > vFileLen;
- std::vector< rtl::OUString > vFileURL;
- rtl::OUString locale,system;
- rtl::OUString appendix;
+ std::vector< OUString > vFileURL;
+ OUString locale,system;
+ OUString appendix;
- void SAL_CALL replaceName( rtl::OUString& oustring ) const;
+ void SAL_CALL replaceName( OUString& oustring ) const;
};
@@ -162,29 +162,29 @@ namespace treeview {
// XNameAccess
virtual com::sun::star::uno::Any SAL_CALL
- getByName( const rtl::OUString& aName )
+ getByName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException) = 0;
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames( )
throw( com::sun::star::uno::RuntimeException ) = 0;
virtual sal_Bool SAL_CALL
- hasByName( const rtl::OUString& aName )
+ hasByName( const OUString& aName )
throw( com::sun::star::uno::RuntimeException ) = 0;
// XHierarchicalNameAccess
virtual com::sun::star::uno::Any SAL_CALL
- getByHierarchicalName( const rtl::OUString& aName )
+ getByHierarchicalName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
com::sun::star::uno::RuntimeException ) = 0;
virtual sal_Bool SAL_CALL
- hasByHierarchicalName( const rtl::OUString& aName )
+ hasByHierarchicalName( const OUString& aName )
throw( com::sun::star::uno::RuntimeException ) = 0;
}; // end class TVBase
@@ -206,36 +206,36 @@ namespace treeview {
// XNameAccess
virtual com::sun::star::uno::Any SAL_CALL
- getByName( const rtl::OUString& aName )
+ getByName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames( )
throw( com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL
- hasByName( const rtl::OUString& aName )
+ hasByName( const OUString& aName )
throw( com::sun::star::uno::RuntimeException );
// XHierarchicalNameAccess
virtual com::sun::star::uno::Any SAL_CALL
- getByHierarchicalName( const rtl::OUString& aName )
+ getByHierarchicalName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL
- hasByHierarchicalName( const rtl::OUString& aName )
+ hasByHierarchicalName( const OUString& aName )
throw( com::sun::star::uno::RuntimeException );
private:
- rtl::OUString Title;
- rtl::OUString TargetURL;
+ OUString Title;
+ OUString TargetURL;
rtl::Reference< TVChildTarget > Children;
}; // end class TVRead
@@ -257,29 +257,29 @@ namespace treeview {
~TVChildTarget();
virtual com::sun::star::uno::Any SAL_CALL
- getByName( const rtl::OUString& aName )
+ getByName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames( )
throw( com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL
- hasByName( const rtl::OUString& aName )
+ hasByName( const OUString& aName )
throw( com::sun::star::uno::RuntimeException );
// XHierarchicalNameAccess
virtual com::sun::star::uno::Any SAL_CALL
- getByHierarchicalName( const rtl::OUString& aName )
+ getByHierarchicalName( const OUString& aName )
throw( com::sun::star::container::NoSuchElementException,
com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL
- hasByHierarchicalName( const rtl::OUString& aName )
+ hasByHierarchicalName( const OUString& aName )
throw( com::sun::star::uno::RuntimeException );
@@ -297,7 +297,7 @@ namespace treeview {
getHierAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxProvider,
const char* file ) const;
- ::rtl::OUString
+ OUString
getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
const char* key ) const;
@@ -308,7 +308,7 @@ namespace treeview {
void subst(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSgr,
- rtl::OUString& instpath ) const;
+ OUString& instpath ) const;
bool SearchAndInsert(TVDom* p, TVDom* tvDom);
@@ -328,7 +328,7 @@ namespace treeview {
class ExtensionIteratorBase
{
public:
- ExtensionIteratorBase( const rtl::OUString& aLanguage );
+ ExtensionIteratorBase( const OUString& aLanguage );
void init( void );
private:
@@ -344,7 +344,7 @@ namespace treeview {
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextBundledHelpPackage
( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle );
- void implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv,
+ void implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv,
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage );
osl::Mutex m_aMutex;
@@ -352,7 +352,7 @@ namespace treeview {
com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA;
IteratorState m_eState;
- rtl::OUString m_aLanguage;
+ OUString m_aLanguage;
com::sun::star::uno::Sequence< com::sun::star::uno::Reference
< com::sun::star::deployment::XPackage > > m_aUserPackagesSeq;
@@ -377,15 +377,15 @@ namespace treeview {
class TreeFileIterator : public ExtensionIteratorBase
{
public:
- TreeFileIterator( const rtl::OUString& aLanguage )
+ TreeFileIterator( const OUString& aLanguage )
: ExtensionIteratorBase( aLanguage )
{}
- rtl::OUString nextTreeFile( sal_Int32& rnFileSize );
+ OUString nextTreeFile( sal_Int32& rnFileSize );
private:
- rtl::OUString expandURL( const rtl::OUString& aURL );
- rtl::OUString implGetTreeFileFromPackage( sal_Int32& rnFileSize,
+ OUString expandURL( const OUString& aURL );
+ OUString implGetTreeFileFromPackage( sal_Int32& rnFileSize,
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage );
}; // end class TreeFileIterator
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 02:53:06 +0000