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
This commit is contained in:
Rüdiger Timm
2007-04-02 11:33:47 +00:00
parent 7a1e8c86ce
commit e69a6e34a3

View File

@@ -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&)
{}