INTEGRATION: CWS native80 (1.2.38); FILE MERGED

2007/02/21 10:29:53 dv 1.2.38.1: #i45477# HasSubKey doesn't look for sub-subkeys

1 files changed, 6 insertions, 7 deletions

diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
index 95482020d2f7..1e3847ac223f 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
@@ -307,14 +307,13 @@ void Registrar::UnregisterAsHtmlEditorForInternetExplorer() const
     {
         std::wstring OOFriendlyAppName = m_ContextInformation.GetOpenOfficeFriendlyAppName();
 
-        std::wstring RegKeyName = APPLICATIONS + std::wstring(L"\\") + OOFriendlyAppName;
-        if (m_RootKey->HasSubKey(RegKeyName))
-            m_RootKey->DeleteSubKeyTree(RegKeyName);
+        RegistryKey aRegKey = m_RootKey->OpenSubKey( APPLICATIONS );
+        if ( aRegKey->HasSubKey( OOFriendlyAppName ) )
+            aRegKey->DeleteSubKeyTree( OOFriendlyAppName );
 
-        RegKeyName = HTM_OPENWITHLIST + std::wstring(L"\\") + OOFriendlyAppName;
-
-        if (m_RootKey->HasSubKey(RegKeyName))
-            m_RootKey->DeleteSubKeyTree(RegKeyName);
+        aRegKey = m_RootKey->OpenSubKey( HTM_OPENWITHLIST );
+        if ( aRegKey->HasSubKey( OOFriendlyAppName ) )
+            aRegKey->DeleteSubKeyTree( OOFriendlyAppName );
     }
     catch(RegistryKeyNotFoundException&)
     {}