summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-09-12 09:31:41 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-09-12 08:53:09 +0000
commit1013587c03d168b54349b5d47c8359e97acc0ad5 (patch)
tree64c2e75aedfcdba21264983f68f55de94877f48e /registry
parentfeb54746b2e3227466488f0f9be661f7df92358a (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 'registry')
-rw-r--r--registry/tools/regmerge.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index b7e4a5058d3a..9f1270936812 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -133,7 +133,7 @@ int __cdecl main( int argc, char * argv[] )
for (size_t i = 2; i < args.size(); i++)
{
OUString targetRegName( convertToFileUrl(args[i].c_str(), args[i].size()) );
- RegError _ret = reg.mergeKey(rootKey, mergeKeyName, targetRegName, false, options.isVerbose());
+ RegError _ret = reg.mergeKey(rootKey, mergeKeyName, targetRegName, options.isVerbose());
if (_ret != RegError::NO_ERROR)
{
if (_ret == RegError::MERGE_CONFLICT)