diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-09-07 15:27:11 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-09-07 22:15:23 +0200 |
commit | db37d8b625807103c95326286ff085f79bf3d971 (patch) | |
tree | 39583bae951c3de9e5e875a4b9c3931ef151dc00 /xmlhelp/source | |
parent | 4461d49c6cfce22c2c96185b0a1d07bfe9709268 (diff) |
loplugin:singlevalfields
Change-Id: Ib3c8dc4e98ca46026ec9a8171bae4066bcec7b22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102176
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlhelp/source')
-rw-r--r-- | xmlhelp/source/cxxhelp/inc/tvread.hxx | 1 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 17 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 11 |
4 files changed, 15 insertions, 16 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx index 0419ce0ab185..6f8ac1d38b7b 100644 --- a/xmlhelp/source/cxxhelp/inc/tvread.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -46,7 +46,6 @@ namespace treeview { ConfigData(); int m_vAdd[5] = {}; OUString m_vReplacement[5]; - OUString prodName,prodVersion,vendName,vendVersion,vendShort; std::vector< sal_uInt64 > vFileLen; std::vector< OUString > vFileURL; diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 7a25dba31640..5c42fa2349e5 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -114,6 +114,14 @@ OUString Databases::expandURL( const OUString& aURL, const Reference< uno::XComp return aRetURL; } +const char vendVersion[] = "%VENDORVERSION"; +const char vendName[] = "%VENDORNAME"; +const char prodVersion[] = "%PRODUCTVERSION"; +const char vendShort[] = "%VENDORSHORT"; +const char prodName[] = "%PRODUCTNAME"; +const char newProdVersion[] = "$[officeversion]"; +const char newProdName[] = "$[officename]"; + Databases::Databases( bool showBasic, const OUString& instPath, const OUString& productName, @@ -122,14 +130,7 @@ Databases::Databases( bool showBasic, Reference< uno::XComponentContext > const & xContext ) : m_xContext( xContext ), m_bShowBasic(showBasic), - m_aCSS(styleSheet.toAsciiLowerCase()), - newProdName( "$[officename]" ), - newProdVersion( "$[officeversion]" ), - prodName( "%PRODUCTNAME" ), - prodVersion( "%PRODUCTVERSION" ), - vendName( "%VENDORNAME" ), - vendVersion( "%VENDORVERSION" ), - vendShort( "%VENDORSHORT" ) + m_aCSS(styleSheet.toAsciiLowerCase()) { m_xSMgr = m_xContext->getServiceManager(); diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 6edf6a0ce78d..f45032da7e12 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -240,8 +240,6 @@ namespace chelp { int m_vAdd[7]; OUString m_vReplacement[7]; - OUString newProdName,newProdVersion, - prodName,prodVersion,vendName,vendVersion,vendShort; OUString m_aInstallDirectory; // Installation directory diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 2b09cc452c31..08bbdf5dd1b4 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -155,12 +155,13 @@ using namespace com::sun::star::util; using namespace com::sun::star::container; using namespace com::sun::star::deployment; +const char prodName[] = "%PRODUCTNAME"; +const char vendName[] = "%VENDORNAME"; +const char vendVersion[] = "%VENDORVERSION"; +const char vendShort[] = "%VENDORSHORT"; +const char prodVersion[] = "%PRODUCTVERSION"; + ConfigData::ConfigData() - : prodName("%PRODUCTNAME"), - prodVersion("%PRODUCTVERSION"), - vendName("%VENDORNAME"), - vendVersion("%VENDORVERSION"), - vendShort("%VENDORSHORT") { } |