diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2002-05-24 12:16:10 +0000 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2002-05-24 12:16:10 +0000 |
| commit | 26a9fcd148c09a4d31e5c2b318f21057bc2d0947 (patch) | |
| tree | 7d51759948b9946b2e3b6e96179aa4887e779485 /registry | |
| parent | b283f3d15587be1cd5571b2372ddbc7888eb6eaa (diff) | |
#96475# check error condition, no performance lack
Diffstat (limited to 'registry')
| -rw-r--r-- | registry/source/registry.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index a891216527e6..15f895749dbf 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registry.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mh $ $Date: 2002-04-23 14:30:19 $ + * last change: $Author: jsc $ $Date: 2002-05-24 13:16:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -493,6 +493,14 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg, pReg->saveKey(pNewKey, tmpName, sal_False, sal_False); */ _ret = pKey->getRegistry()->loadKey(pNewKey, regFileName, bWarnings, bReport); + + if (_ret == REG_MERGE_ERROR || + (_ret == REG_MERGE_CONFLICT && bWarnings)) + { + pKey->closeKey(pNewKey); + return _ret; + } + /* if (_ret) { |