diff options
author | Mikhail Voitenko <mav@openoffice.org> | 2002-09-27 13:25:51 +0000 |
---|---|---|
committer | Mikhail Voitenko <mav@openoffice.org> | 2002-09-27 13:25:51 +0000 |
commit | 9b0350f78b9973fb0e13654805d2fc6f026cb4c7 (patch) | |
tree | b17425f87cab5760c4a58010b6fbbf554d57e262 /extensions/source/activex/main/so_activex.cpp | |
parent | 2cd330d5e3623d65a5352d6edcee799b1b8d27ad (diff) |
#102625# while registering for doc control can be unregistered
Diffstat (limited to 'extensions/source/activex/main/so_activex.cpp')
-rw-r--r-- | extensions/source/activex/main/so_activex.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/main/so_activex.cpp index 4e54d9f27178..c82a56bec116 100644 --- a/extensions/source/activex/main/so_activex.cpp +++ b/extensions/source/activex/main/so_activex.cpp @@ -298,7 +298,7 @@ STDAPI DllUnregisterServerNative( BOOL bForAllUsers ) // DllRegisterServerDoc - Adds entries to the system registry #define SUPPORTED_MSEXT_NUM 6 -const char* aMSFileExt[] = { ".doc", ".dot", ".xls", ".xlt", ".ppt", ".pot" }; +const char* aMSFileExt[] = { ".dot", ".doc", ".xlt", ".xls", ".pot", ".ppt" }; const char* aMSMimeType[] = { "application/msword", "application/msword", "application/msexcell", @@ -344,20 +344,21 @@ STDAPI DllRegisterServerDoc( int nMode, BOOL bForAllUsers ) } wsprintf( aSubKey, "%sCLSID\\%s", aPrefix, aClassID ); - if ( aResult && ERROR_SUCCESS == RegOpenKey(bForAllUsers ? HKEY_CLASSES_ROOT : HKEY_CURRENT_USER, aSubKey, &hkey) ) + if ( aResult && ERROR_SUCCESS == RegCreateKey( bForAllUsers ? HKEY_CLASSES_ROOT : HKEY_CURRENT_USER, aSubKey, &hkey ) + && createKey( hkey, "EnableFullPage" ) ) { - for( ind = 0; ind < SUPPORTED_MSEXT_NUM; ind++ ) - { + for( ind = 0; ind < SUPPORTED_MSEXT_NUM; ind++ ) + { if( nForModes[ind] & nMode ) { - wsprintf( aSubKey, "EnableFullPage\\%s", aMSFileExt[ind] ); - if ( ERROR_SUCCESS != RegCreateKey( hkey, aSubKey, &hkey1 ) ) - aResult = FALSE; + wsprintf( aSubKey, "EnableFullPage\\%s", aMSFileExt[ind] ); + if ( ERROR_SUCCESS != RegCreateKey( hkey, aSubKey, &hkey1 ) ) + aResult = FALSE; - if ( hkey1 ) - RegCloseKey(hkey1); + if ( hkey1 ) + RegCloseKey(hkey1); } - } + } } else aResult = FALSE; |