mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS native80 (1.2.38); FILE MERGED

Browse Source 
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
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
View File

@@ -307,14 +307,13 @@ void Registrar::UnregisterAsHtmlEditorForInternetExplorer() const
{ {
std::wstring OOFriendlyAppName = m_ContextInformation.GetOpenOfficeFriendlyAppName(); std::wstring OOFriendlyAppName = m_ContextInformation.GetOpenOfficeFriendlyAppName();
std::wstring RegKeyName = APPLICATIONS + std::wstring(L"\\") + OOFriendlyAppName; RegistryKey aRegKey = m_RootKey->OpenSubKey( APPLICATIONS );
if (m_RootKey->HasSubKey(RegKeyName)) if ( aRegKey->HasSubKey( OOFriendlyAppName ) )
m_RootKey->DeleteSubKeyTree(RegKeyName); aRegKey->DeleteSubKeyTree( OOFriendlyAppName );
RegKeyName = HTM_OPENWITHLIST + std::wstring(L"\\") + OOFriendlyAppName; aRegKey = m_RootKey->OpenSubKey( HTM_OPENWITHLIST );
if ( aRegKey->HasSubKey( OOFriendlyAppName ) )
if (m_RootKey->HasSubKey(RegKeyName)) aRegKey->DeleteSubKeyTree( OOFriendlyAppName );
m_RootKey->DeleteSubKeyTree(RegKeyName);
} }
catch(RegistryKeyNotFoundException&) catch(RegistryKeyNotFoundException&)
{} {}