summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorMikhail Voitenko <mav@openoffice.org>2002-08-21 12:08:52 +0000
committerMikhail Voitenko <mav@openoffice.org>2002-08-21 12:08:52 +0000
commitb3fb1f39d56e36908823d736484ceb6546a99687 (patch)
treebec083d924ec7a5fdde8b6e223670666826e7d99 /extensions
parent7eea4803b4c09e33d4b0fe8a0cbb768f0e203d09 (diff)
#101937# register ActiveX control
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/activex/main/so_activex.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/main/so_activex.cpp
index 830c27320bdc..bbcd2f023e01 100644
--- a/extensions/source/activex/main/so_activex.cpp
+++ b/extensions/source/activex/main/so_activex.cpp
@@ -260,11 +260,19 @@ STDAPI DllUnregisterServerNative( BOOL bForAllUsers )
if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_CLASSES_ROOT : HKEY_CURRENT_USER, aSubKey ) )
fErr = TRUE;
- wsprintf( aSubKey, "%sso_activex.SOActiveX", aPrefix, aClassID );
+ wsprintf( aSubKey, "%sso_activex.SOActiveX", aPrefix );
if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_CLASSES_ROOT : HKEY_CURRENT_USER, aSubKey ) )
fErr = TRUE;
- wsprintf( aSubKey, "%sso_activex.SOActiveX.1", aPrefix, aClassID );
+ wsprintf( aSubKey, "%sso_activex.SOActiveX.1", aPrefix );
+ if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_CLASSES_ROOT : HKEY_CURRENT_USER, aSubKey ) )
+ fErr = TRUE;
+
+ wsprintf( aSubKey, "%s\\TypeLib\\%s", aPrefix, aTypeLib );
+ if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_CLASSES_ROOT : HKEY_CURRENT_USER, aSubKey ) )
+ fErr = TRUE;
+
+ wsprintf( aSubKey, "%s\\Interface\\%s", aPrefix, aInterIDWinPeer );
if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_CLASSES_ROOT : HKEY_CURRENT_USER, aSubKey ) )
fErr = TRUE;