diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-12 09:31:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-09-12 08:53:09 +0000 |
| commit | 1013587c03d168b54349b5d47c8359e97acc0ad5 (patch) | |
| tree | 64c2e75aedfcdba21264983f68f55de94877f48e /include/registry | |
| parent | feb54746b2e3227466488f0f9be661f7df92358a (diff) | |
loplugin:constantparam in package..stoc
Change-Id: I04b6d14d3dd8d55ccc4d4eb9313bc37959690672
Reviewed-on: https://gerrit.libreoffice.org/28824
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/registry')
| -rw-r--r-- | include/registry/registry.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index 614f54f7ffa7..a9be21d41aaa 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -153,7 +153,6 @@ public: If keyName is an empty string the registry information under the key specified by rKey is merged with the information from the specified file. @param regFileName specifies the file containing the registry information. - @param bWarnings if TRUE the function returns an error if a key already exists. @param bReport if TRUE the function reports warnings on stdout if a key already exists. @return RegError::NO_ERROR if succeeds else an error code. If it returns an error the registry will restore the state before merging. @@ -161,8 +160,7 @@ public: inline RegError mergeKey(RegistryKey& rKey, const rtl::OUString& keyName, const rtl::OUString& regFileName, - bool bWarnings = false, - bool bReport = false); + bool bReport); friend class RegistryKey; friend class RegistryKeyArray; @@ -1041,9 +1039,8 @@ inline RegError Registry::destroy(const rtl::OUString& registryName) inline RegError Registry::mergeKey(RegistryKey& rKey, const rtl::OUString& keyName, const rtl::OUString& regFileName, - bool bWarnings, bool bReport) - { return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, bWarnings, bReport); } + { return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, false/*bWarnings*/, bReport); } #endif |