summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorJuergen Schmidt <jsc@openoffice.org>2001-08-29 08:28:06 +0000
committerJuergen Schmidt <jsc@openoffice.org>2001-08-29 08:28:06 +0000
commit2a237c137d4aed940d19f3d1459274be39d0f731 (patch)
treebbe35bf117fdb196800266005988974038e2bfc0 /registry
parent6932a3139ca9eefea4f4eb403b21a7d1c48926c7 (diff)
#91602# correct error code in mergeKey function
Diffstat (limited to 'registry')
-rw-r--r--registry/source/registry.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index 37ae7a7d3..2975b5cb9 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: registry.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jsc $ $Date: 2001-03-14 09:36:00 $
+ * last change: $Author: jsc $ $Date: 2001-08-29 09:28:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -508,8 +508,7 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
destroyRegistry(hReg, tmpName);
*/
- if ( pKey != pNewKey )
- _ret = pKey->closeKey(pNewKey);
+ _ret = pKey->closeKey(pNewKey);
return _ret;
}