summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-12-13 09:29:22 +0200
committerNoel Grandin <noel@peralex.com>2013-12-17 11:49:03 +0200
commit08fe82e59cbc598d2683d72877653316c1e41962 (patch)
tree5eeace3006ef2bfd58a5d97a000f336b8b06099c /xmlhelp
parentfc985c30048d410ab68a55af64f56df85547a6bf (diff)
Remove unnecessary use of OUString constructor in + expressions
Convert code like aFilename = OUString::number(nFilePostfixCount) + OUString(".bmp"); to aFilename = OUString::number(nFilePostfixCount) + ".bmp"; Change-Id: I03f513ad1c8ec8846b2afbdc67ab12525ed07e50
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx32
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx2
2 files changed, 16 insertions, 18 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index ed30a7dfd4e6..df174a4b6b63 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -132,13 +132,13 @@ Databases::Databases( sal_Bool showBasic,
m_nCustomCSSDocLength( 0 ),
m_pCustomCSSDoc( 0 ),
m_aCSS(styleSheet.toAsciiLowerCase()),
- newProdName(OUString( "$[officename]" ) ),
- newProdVersion(OUString( "$[officeversion]" ) ),
- prodName( OUString( "%PRODUCTNAME" ) ),
- prodVersion( OUString( "%PRODUCTVERSION" ) ),
- vendName( OUString( "%VENDORNAME" ) ),
- vendVersion( OUString( "%VENDORVERSION" ) ),
- vendShort( OUString( "%VENDORSHORT" ) ),
+ newProdName( "$[officename]" ),
+ newProdVersion( "$[officeversion]" ),
+ prodName( "%PRODUCTNAME" ),
+ prodVersion( "%PRODUCTVERSION" ),
+ vendName( "%VENDORNAME" ),
+ vendVersion( "%VENDORVERSION" ),
+ vendShort( "%VENDORSHORT" ),
m_aImagesZipPaths( imagesZipPaths ),
m_aSymbolsStyleName( "" )
{
@@ -434,7 +434,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin
{
osl::MutexGuard aGuard( m_aMutex );
- OUString key = processLang(Language) + OUString( "/" ) + Module;
+ OUString key = processLang(Language) + "/" + Module;
std::pair< ModInfoTable::iterator,bool > aPair =
m_aModInfo.insert( ModInfoTable::value_type( key,(StaticModuleInformation*)0 ) );
@@ -443,9 +443,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin
if( aPair.second && ! it->second )
{
- osl::File cfgFile( getInstallPathAsURL() +
- key +
- OUString( ".cfg" ) );
+ osl::File cfgFile( getInstallPathAsURL() + key + ".cfg" );
if( osl::FileBase::E_None != cfgFile.open( osl_File_OpenFlag_Read ) )
it->second = 0;
@@ -836,7 +834,7 @@ KeywordInfo* Databases::getKeyword( const OUString& Database,
{
osl::MutexGuard aGuard( m_aMutex );
- OUString key = processLang(Language) + OUString( "/" ) + Database;
+ OUString key = processLang(Language) + "/" + Database;
std::pair< KeywordInfoTable::iterator,bool > aPair =
m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,(KeywordInfo*)0 ) );
@@ -1113,14 +1111,14 @@ void Databases::cascadingStylesheet( const OUString& Language,
fileURL =
getInstallPathAsURL() +
processLang( Language ) +
- OUString( "/" ) +
+ "/" +
aCSS +
- OUString( ".css" );
+ ".css";
else if( retry == 1 )
fileURL =
getInstallPathAsURL() +
aCSS +
- OUString( ".css" );
+ ".css";
osl::DirectoryItem aDirItem;
osl::File aFile( fileURL );
@@ -1889,7 +1887,7 @@ OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary
bool bIsWriteAccess = false;
try
{
- OUString aCreateTestFolder = aLangURL + OUString( "CreateTestFolder" );
+ OUString aCreateTestFolder = aLangURL + "CreateTestFolder";
m_xSFA->createFolder( aCreateTestFolder );
if( m_xSFA->isFolder( aCreateTestFolder ) )
bIsWriteAccess = true;
@@ -1942,7 +1940,7 @@ OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary
if( bIsWriteAccess )
aIndexFolder = implGetFileFromPackage( OUString( ".idxl" ), xPackage );
else
- aIndexFolder = aZipDir + OUString( "/help.idxl" );
+ aIndexFolder = aZipDir + "/help.idxl";
}
catch (const Exception &)
{
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 0acae63d9ed9..5a73ba1f6a6d 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -262,7 +262,7 @@ OUString URLParameter::get_the_jar()
return m_aJar;
}
else
- return get_module() + OUString(".jar");
+ return get_module() + ".jar";
}