diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-24 15:43:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-24 17:17:46 +0200 |
| commit | 6d6fad522a2cd6a2959ea774969a86288f5a3cb7 (patch) | |
| tree | 392503346dc17a8573f4a33c51155ffdb6f95cfa /xmlhelp/source | |
| parent | aaff73401318a7fd1b3e936555f933538b2407bc (diff) | |
Introduce OStringChar
...similar to OUStringChar, to be used in string concatenation expressions. And
enable the corresponding loplugin:stringadd check, and fix its findings.
Change-Id: I35ebb2253ba82bda6c98ae6ebd2ad4f27cf9abf9
Reviewed-on: https://gerrit.libreoffice.org/81456
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmlhelp/source')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 05b7f1dbb1e9..8e99fe22df03 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -712,35 +712,35 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, parString[last++] = "Program"; OString aPureProgramm( urlParam->getByName( "Program" ) ); - parString[last++] = OString('\'') + aPureProgramm + OString('\''); + parString[last++] = "'" + aPureProgramm + "'"; parString[last++] = "Database"; - parString[last++] = OString('\'') + urlParam->getByName( "DatabasePar" ) + OString('\''); + parString[last++] = "'" + urlParam->getByName( "DatabasePar" ) + "'"; parString[last++] = "Id"; - parString[last++] = OString('\'') + urlParam->getByName( "Id" ) + OString('\''); + parString[last++] = "'" + urlParam->getByName( "Id" ) + "'"; parString[last++] = "Path"; OString aPath( urlParam->getByName( "Path" ) ); - parString[last++] = OString('\'') + aPath + OString('\''); + parString[last++] = "'" + aPath + "'"; OString aPureLanguage = urlParam->getByName( "Language" ); parString[last++] = "Language"; - parString[last++] = OString('\'') + aPureLanguage + OString('\''); + parString[last++] = "'" + aPureLanguage + "'"; parString[last++] = "System"; - parString[last++] = OString('\'') + urlParam->getByName( "System" ) + OString('\''); + parString[last++] = "'" + urlParam->getByName( "System" ) + "'"; parString[last++] = "productname"; - parString[last++] = OString('\'') + OString( + parString[last++] = "'" + OString( pDatabases->getProductName().getStr(), pDatabases->getProductName().getLength(), - RTL_TEXTENCODING_UTF8 ) + OString('\''); + RTL_TEXTENCODING_UTF8 ) + "'"; parString[last++] = "productversion"; - parString[last++] = OString('\'') + + parString[last++] = "'" + OString( pDatabases->getProductVersion().getStr(), pDatabases->getProductVersion().getLength(), - RTL_TEXTENCODING_UTF8 ) + OString('\''); + RTL_TEXTENCODING_UTF8 ) + "'"; parString[last++] = "imgtheme"; - parString[last++] = OString('\'') + pDatabases->getImageTheme() + OString('\''); + parString[last++] = "'" + pDatabases->getImageTheme() + "'"; parString[last++] = "hp"; - parString[last++] = OString('\'') + urlParam->getByName( "HelpPrefix" ) + OString('\''); + parString[last++] = "'" + urlParam->getByName( "HelpPrefix" ) + "'"; if( !parString[last-1].isEmpty() ) { @@ -801,7 +801,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, OString aExpandedExtensionPath = OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() ); parString[last++] = "ExtensionPath"; - parString[last++] = OString('\'') + aExpandedExtensionPath + OString('\''); + parString[last++] = "'" + aExpandedExtensionPath + "'"; // ExtensionId OString aPureExtensionId; @@ -810,7 +810,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, aPureExtensionId = aPath.copy( 0, iSlash ); parString[last++] = "ExtensionId"; - parString[last++] = OString('\'') + aPureExtensionId + OString('\''); + parString[last++] = "'" + aPureExtensionId + "'"; } for( int i = 0; i < last; ++i ) |