diff options
author | Andras Timar <atimar@suse.com> | 2012-03-27 15:36:11 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-03-27 15:40:18 +0200 |
commit | 99d1eff4a843811bf5cb192aa3a2dc29f85d935a (patch) | |
tree | 7571e398b2182d827fcce619abd1af7b1b8ef482 /setup_native | |
parent | don't install 32-bit shell extensions on 64-bit Windows (diff) | |
download | core-99d1eff4a843811bf5cb192aa3a2dc29f85d935a.tar.gz core-99d1eff4a843811bf5cb192aa3a2dc29f85d935a.zip |
replace OpenOffice.org to LibreOffice in registry keys
Diffstat (limited to 'setup_native')
3 files changed, 12 insertions, 12 deletions
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index 7b9cfc992245..4fd1700de589 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -117,7 +117,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey ) { // We will replace registration for word pad bRet = true; } - else if ( strncmp( szBuffer, "OpenOffice.org.", 15 ) == 0 ) + else if ( strncmp( szBuffer, "LibreOffice.", 15 ) == 0 ) { // We will replace registration for our own types, too bRet = true; } @@ -330,7 +330,7 @@ static void saveOldRegistration( LPCSTR lpSubKey ) szBuffer[nSize] = '\0'; // No need to save assocations for our own types - if ( strncmp( szBuffer, "OpenOffice.org.", 15 ) != 0 ) + if ( strncmp( szBuffer, "LibreOffice.", 15 ) != 0 ) { // Save the old association RegSetValueExA( hKey, "OOoBackupAssociation", 0, diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx index 5220b1ed6d0c..967f9c8937da 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx @@ -55,10 +55,10 @@ namespace /* private */ Registrar::Registrar(const RegistrationContextInformation& RegContext) : m_ContextInformation(RegContext), - FORWARD_KEY_PREFIX(L"OpenOffice.org"),//FORWARD_KEY_PREFIX(L"soffice6"), + FORWARD_KEY_PREFIX(L"LibreOffice"), DEFAULT_VALUE_NAME(L""), BACKUP_VALUE_NAME(L"Backup"), - PRIVATE_BACKUP_KEY_NAME(L"OpenOffice.org.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"), + PRIVATE_BACKUP_KEY_NAME(L"LibreOffice.reg4msdocmsi"), REGISTRATION_STATE(L"Reg4MsDocState") { m_RootKey = WindowsRegistry().GetClassesRootKey(); diff --git a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx index 01f0b306b3b4..790a3420a9ca 100644 --- a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx @@ -59,10 +59,10 @@ </MSDN> We add the following entries to the respective registry key - "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="OpenOffice.org Column Handler" - "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="OpenOffice.org Infotip Handler" - "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="OpenOffice.org Property Sheet Handler" - "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="OpenOffice.org Thumbnail Viewer" + "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="LibreOffice Column Handler" + "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="LibreOffice Infotip Handler" + "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="LibreOffice Property Sheet Handler" + "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="LibreOffice Thumbnail Viewer" These shell extensions are implemented in the 'shell' project. We ignore registration failures because of insufficient privileges. The reason is: On systems which restrict the @@ -95,10 +95,10 @@ struct RegistryEntry TCHAR* Value; }; -RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("OpenOffice.org Column Handler") }; -RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("OpenOffice.org Infotip Handler") }; -RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("OpenOffice.org Property Sheet Handler") }; -RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("OpenOffice.org Thumbnail Viewer") }; +RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("LibreOffice Column Handler") }; +RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("LibreOffice Infotip Handler") }; +RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("LibreOffice Property Sheet Handler") }; +RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("LibreOffice Thumbnail Viewer") }; BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue ) { |