diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 11:18:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 11:18:06 +0000 |
| commit | 5c5bbeb8e2ff316e355a121559b1805a204d8889 (patch) | |
| tree | 85b5895951346c79c3efe7340d729d06512bcc19 /registry/source | |
| parent | a332b7baa6d9b454e2102e334200c994dd2515e2 (diff) | |
INTEGRATION: CWS unopkg1 (1.2.112); FILE MERGED
2004/04/02 09:59:48 dbo 1.2.112.1: fixing sub key bugs
Diffstat (limited to 'registry/source')
| -rw-r--r-- | registry/source/regkey.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index a8f83e980e2e..16b63481777d 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -2,9 +2,9 @@ * * $RCSfile: regkey.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jsc $ $Date: 2001-01-10 10:15:54 $ + * last change: $Author: hr $ $Date: 2004-04-13 12:18:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -208,12 +208,14 @@ RegError REGISTRY_CALLTYPE openSubKeys(RegKeyHandle hKey, if (pKey->isDeleted()) { - pphSubKeys = NULL; + *pphSubKeys = NULL; + *pnSubKeys = 0; return REG_INVALID_KEY; } } else { - pphSubKeys = NULL; + *pphSubKeys = NULL; + *pnSubKeys = 0; return REG_INVALID_KEY; } @@ -228,7 +230,7 @@ RegError REGISTRY_CALLTYPE closeSubKeys(RegKeyHandle* phSubKeys, { RegError _ret = REG_NO_ERROR; - if (phSubKeys) + if (phSubKeys != 0 && nSubKeys != 0) { ORegistry* pReg = NULL; |