mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmlhelp: Use appropriate OUString functions on string constants

Browse Source 
Change-Id: I8642ec147cb0dca32dce7ec7f3efec93bcb99cb4
This commit is contained in:
Stephan Bergmann 2014-12-18 13:40:21 +01:00
parent 56a6a6f209
commit fb4fec646d
6 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xmlhelp/source/cxxhelp/provider/databases.cxx
View File

@ -293,7 +293,7 @@ OString Databases::getImagesZipFileURL()
bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip ); bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip );
if ( ! bFound ) if ( ! bFound )
aImageZip = ""; aImageZip.clear();
m_aImagesZipFileURL = OUStringToOString( m_aImagesZipFileURL = OUStringToOString(
rtl::Uri::encode( rtl::Uri::encode(

13
xmlhelp/source/cxxhelp/provider/provider.cxx
View File

@ -159,12 +159,8 @@ uno::Sequence< OUString >
ContentProvider::getSupportedServiceNames_Static() ContentProvider::getSupportedServiceNames_Static()
{ {
uno::Sequence< OUString > aSNS( 2 ); uno::Sequence< OUString > aSNS( 2 );
aSNS.getArray()[ 0 ] = aSNS.getArray()[ 0 ] = MYUCP_CONTENT_PROVIDER_SERVICE_NAME1;
OUString( aSNS.getArray()[ 1 ] = MYUCP_CONTENT_PROVIDER_SERVICE_NAME2;
MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 );
aSNS.getArray()[ 1 ] =
OUString(
MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 );
return aSNS; return aSNS;
} }
@ -327,10 +323,7 @@ void ContentProvider::init()
{ {
} }
OUString productversion( OUString productversion( setupversion + " " + setupextension );
setupversion +
OUString( " " ) +
setupextension );
uno::Sequence< OUString > aImagesZipPaths( 2 ); uno::Sequence< OUString > aImagesZipPaths( 2 );
xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" ); xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" );

8
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
View File

@ -331,10 +331,10 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow ) for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow )
{ {
m_aPath[m_nRow] = m_aPath[m_nRow] =
m_aPath[m_nRow] + m_aPath[m_nRow] +
OUString( "?Language=" ) + "?Language=" +
m_aURLParameter.get_language() + m_aURLParameter.get_language() +
OUString( "&System=" ) + "&System=" +
m_aURLParameter.get_system(); m_aURLParameter.get_system();
uno::Reference< XContent > content = queryContent(); uno::Reference< XContent > content = queryContent();

10
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
View File

@ -52,11 +52,11 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext
for( sal_uInt32 i = 0; i < m_aPath.size(); ++i ) for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
{ {
m_aPath[i] = m_aPath[i] =
OUString( "vnd.sun.star.help://" ) + "vnd.sun.star.help://" +
m_aPath[i] + m_aPath[i] +
OUString( "?Language=" ) + "?Language=" +
m_aURLParameter.get_language() + m_aURLParameter.get_language() +
OUString( "&System=" ) + "&System=" +
m_aURLParameter.get_system(); m_aURLParameter.get_system();
m_nRow = sal_Int32( i ); m_nRow = sal_Int32( i );

4
xmlhelp/source/cxxhelp/provider/urlparameter.cxx
View File

@ -610,7 +610,7 @@ bool URLParameter::query()
if( delimIdx == -1 ) if( delimIdx == -1 )
{ {
value = query_.copy( equalIdx + 1 ).trim(); value = query_.copy( equalIdx + 1 ).trim();
query_ = ""; query_.clear();
} }
else else
{ {
@ -635,7 +635,7 @@ bool URLParameter::query()
if( m_aQuery.isEmpty() ) if( m_aQuery.isEmpty() )
m_aQuery = value; m_aQuery = value;
else else
m_aQuery += ( OUString( " " ) + value ); m_aQuery += " " + value;
} }
else if( parameter == "Scope" ) else if( parameter == "Scope" )
m_aScope = value; m_aScope = value;

19
xmlhelp/source/treeview/tvread.cxx
View File

@ -241,8 +241,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )
{ {
TargetURL = ( tvDom->getTargetURL() + configData.appendix ); TargetURL = ( tvDom->getTargetURL() + configData.appendix );
if( !tvDom->anchor.isEmpty() ) if( !tvDom->anchor.isEmpty() )
TargetURL += ( OUString( "#" ) + TargetURL += "#" + tvDom->anchor;
tvDom->anchor );
} }
else else
Children = new TVChildTarget( configData,tvDom ); Children = new TVChildTarget( configData,tvDom );
@ -665,9 +664,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
{ {
} }
OUString productVersion( setupversion + OUString productVersion( setupversion + " " + setupextension );
OUString( " " ) +
setupextension );
OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) ); OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) );
// Determine fileurl from url and locale // Determine fileurl from url and locale
@ -762,11 +759,11 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
configData.system = system; configData.system = system;
configData.locale = locale; configData.locale = locale;
configData.appendix = configData.appendix =
OUString( "?Language=" ) + "?Language=" +
configData.locale + configData.locale +
OUString( "&System=" ) + "&System=" +
configData.system + configData.system +
OUString( "&UseDB=no" ) ; "&UseDB=no";
return configData; return configData;
} }
@ -931,7 +928,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ]; const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ];
const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType(); const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType();
OUString aMediaType = xPackageTypeInfo->getMediaType(); OUString aMediaType = xPackageTypeInfo->getMediaType();
if( aMediaType.equals( aHelpMediaType ) ) if( aMediaType == aHelpMediaType )
{ {
xHelpPackage = xSubPkg; xHelpPackage = xSubPkg;
o_xParentPackageBundle = xPackage; o_xParentPackageBundle = xPackage;
@ -943,7 +940,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP
{ {
const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType(); const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType();
OUString aMediaType = xPackageTypeInfo->getMediaType(); OUString aMediaType = xPackageTypeInfo->getMediaType();
if( aMediaType.equals( aHelpMediaType ) ) if( aMediaType == aHelpMediaType )
xHelpPackage = xPackage; xHelpPackage = xPackage;
} }
@ -1184,7 +1181,7 @@ OUString TreeFileIterator::implGetTreeFileFromPackage
if( m_xSFA->exists( aRetFile ) ) if( m_xSFA->exists( aRetFile ) )
rnFileSize = m_xSFA->getSize( aRetFile ); rnFileSize = m_xSFA->getSize( aRetFile );
else else
aRetFile = ""; aRetFile.clear();
return aRetFile; return aRetFile;
} }