From cb4a584073240e4e39c0510e50e47663e8b3f312 Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Mon, 11 Mar 2002 09:17:12 +0000
Subject: [PATCH] If nSubKeys is not defined, just return. Fix from Tim Tretyak
 <timothy@umc.com.ua>

---
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 .../files/patch-registry+source+regkey.cxx           | 12 ++++++++++++
 .../files/patch-registry::source::regkey.cxx         | 12 ++++++++++++
 40 files changed, 480 insertions(+)
 create mode 100644 editors/openoffice-1.0/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice-1.0/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice-1.1-devel/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice-1.1-devel/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice-1.1/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice-1.1/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice-2.0-devel/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice-2.0-devel/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice-3-devel/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice-3-devel/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice-3/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice-3/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice-devel/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice-devel/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-1.0/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-1.0/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-1.1-devel/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-1.1-devel/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-1.1/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-1.1/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-2-RC/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-2-RC/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-2-devel/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-2-devel/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-2.0-devel/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-2.0-devel/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-2.0/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-2.0/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-2/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-2/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-3-RC/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-3-RC/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-3-devel/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-3-devel/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-3/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-3/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-registry::source::regkey.cxx
 create mode 100644 editors/openoffice/files/patch-registry+source+regkey.cxx
 create mode 100644 editors/openoffice/files/patch-registry::source::regkey.cxx

diff --git a/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx b/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-1.0/files/patch-registry::source::regkey.cxx b/editors/openoffice-1.0/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-1.1-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice-1.1-devel/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-1.1-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice-1.1-devel/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-1.1/files/patch-registry+source+regkey.cxx b/editors/openoffice-1.1/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-1.1/files/patch-registry::source::regkey.cxx b/editors/openoffice-1.1/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-2.0-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice-2.0-devel/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-2.0-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice-2.0-devel/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-3-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice-3-devel/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-3-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice-3-devel/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-3/files/patch-registry+source+regkey.cxx b/editors/openoffice-3/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-3/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-3/files/patch-registry::source::regkey.cxx b/editors/openoffice-3/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-3/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice-devel/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice-devel/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-1.0/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-1.0/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-1.0/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-1.0/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-1.1-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-1.1-devel/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-1.1-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-1.1-devel/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-1.1/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-1.1/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-1.1/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-1.1/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-2-RC/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-2-RC/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-2-RC/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-2-RC/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-2-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-2-devel/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-2-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-2-devel/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-2.0-devel/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-2.0-devel/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-2.0/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-2.0/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-2.0/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-2.0/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-2/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-2/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-2/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-2/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-3-RC/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-3-RC/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-3-RC/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-3-RC/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-3-devel/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-3-devel/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-3-devel/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-3-devel/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-3/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-3/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-3/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-3/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-vcltesttool/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-registry::source::regkey.cxx b/editors/openoffice.org-vcltesttool/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice/files/patch-registry+source+regkey.cxx b/editors/openoffice/files/patch-registry+source+regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice/files/patch-registry+source+regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;
diff --git a/editors/openoffice/files/patch-registry::source::regkey.cxx b/editors/openoffice/files/patch-registry::source::regkey.cxx
new file mode 100644
index 000000000000..fad069f83f14
--- /dev/null
+++ b/editors/openoffice/files/patch-registry::source::regkey.cxx
@@ -0,0 +1,12 @@
+--- ../registry/source/regkey.cxx.orig	Mon Mar 11 01:27:56 2002
++++ ../registry/source/regkey.cxx	Mon Mar 11 01:28:51 2002
+@@ -228,6 +228,9 @@
+ {
+ 	RegError _ret = REG_NO_ERROR;
+ 
++       if (!nSubKeys)
++		return REG_NO_ERROR;
++
+ 	if (phSubKeys)
+ 	{
+ 		ORegistry* pReg = NULL;