From ceb14e0143fb72b34421f6fb81ff1fb1842cb500 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 18 Jan 2012 13:11:11 +0100 Subject: fdo#37740 remove duplicate icons from soffice.bin/soffice.exe --- .../reg4msdoc/registrationcontextinformation.cxx | 17 +++++++++-------- .../reg4msdoc/registrationcontextinformation.hxx | 1 + .../customactions/shellextensions/startmenuicon.cxx | 4 +--- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'setup_native') diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx index e301303fade0..89d82d4e6033 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx @@ -20,6 +20,7 @@ RegistrationContextInformation::RegistrationContextInformation(MSIHANDLE hMsi, c { assert(m_OOExecPath.length()); ExtractOpenOfficeExecNameFromPath(); + m_OOIconPath = m_OOExecPath.replace(m_OOExecPath.find(m_OOExecName), m_OOExecName.size(), std::wstring(TEXT("soffice.bin"))); } std::wstring RegistrationContextInformation::GetWordDocumentDisplayName() const @@ -36,7 +37,7 @@ std::wstring RegistrationContextInformation::GetWordDocumentFileExtension() cons std::wstring RegistrationContextInformation::GetWordDocumentDefaultIconEntry() const { - return m_OOExecPath + std::wstring(TEXT(",1")); + return m_OOIconPath + std::wstring(TEXT(",1")); } std::wstring RegistrationContextInformation::GetWordDocumentDefaultShellCommand() const @@ -70,7 +71,7 @@ std::wstring RegistrationContextInformation::GetWordTemplateFileExtension() cons std::wstring RegistrationContextInformation::GetWordTemplateDefaultIconEntry() const { - return m_OOExecPath + std::wstring(TEXT(",2")); + return m_OOIconPath + std::wstring(TEXT(",2")); } std::wstring RegistrationContextInformation::GetWordTemplateDefaultShellCommand() const @@ -92,7 +93,7 @@ std::wstring RegistrationContextInformation::GetRtfDocumentFileExtension() const std::wstring RegistrationContextInformation::GetRtfDocumentDefaultIconEntry() const { - return m_OOExecPath + std::wstring(TEXT(",1")); + return m_OOIconPath + std::wstring(TEXT(",1")); } std::wstring RegistrationContextInformation::GetRtfDocumentDefaultShellCommand() const @@ -114,7 +115,7 @@ std::wstring RegistrationContextInformation::GetExcelSheetFileExtension() const std::wstring RegistrationContextInformation::GetExcelSheetDefaultIconEntry() const { - return m_OOExecPath + std::wstring(TEXT(",3")); + return m_OOIconPath + std::wstring(TEXT(",3")); } std::wstring RegistrationContextInformation::GetExcelSheetDefaultShellCommand() const @@ -148,7 +149,7 @@ std::wstring RegistrationContextInformation::GetExcelTemplateFileExtension() con std::wstring RegistrationContextInformation::GetExcelTemplateDefaultIconEntry() const { - return m_OOExecPath + std::wstring(TEXT(",4")); + return m_OOIconPath + std::wstring(TEXT(",4")); } std::wstring RegistrationContextInformation::GetExcelTemplateDefaultShellCommand() const @@ -170,7 +171,7 @@ std::wstring RegistrationContextInformation::GetPowerPointDocumentFileExtension( std::wstring RegistrationContextInformation::GetPowerPointDocumentDefaultIconEntry() const { - return m_OOExecPath + std::wstring(TEXT(",7")); + return m_OOIconPath + std::wstring(TEXT(",7")); } std::wstring RegistrationContextInformation::GetPowerPointDocumentDefaultShellCommand() const @@ -204,7 +205,7 @@ std::wstring RegistrationContextInformation::GetPowerPointTemplateFileExtension( std::wstring RegistrationContextInformation::GetPowerPointTemplateDefaultIconEntry() const { - return m_OOExecPath + std::wstring(TEXT(",8")); + return m_OOIconPath + std::wstring(TEXT(",8")); } std::wstring RegistrationContextInformation::GetPowerPointTemplateDefaultShellCommand() const @@ -226,7 +227,7 @@ std::wstring RegistrationContextInformation::GetPowerPointShowFileExtension() co std::wstring RegistrationContextInformation::GetPowerPointShowDefaultIconEntry() const { - return m_OOExecPath + std::wstring(TEXT(",7")); + return m_OOIconPath + std::wstring(TEXT(",7")); } std::wstring RegistrationContextInformation::GetPowerPointShowDefaultShellCommand() const diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx index c27b2a495a45..1ba9a4d99a36 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx @@ -165,6 +165,7 @@ private: MSIHANDLE msihandle_; std::wstring m_OOExecPath; std::wstring m_OOExecName; + std::wstring m_OOIconPath; }; #endif diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx index 6b8a85eb163f..e1679dd9754d 100644 --- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx +++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx @@ -84,18 +84,16 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle ) if (osverinfo.dwMajorVersion < 6 /* && osverinfo.dwMinorVersion */ ) { - // This icon (18) is a Windows folder until XP Version (number is 0 based) WritePrivateProfileString( TEXT(".ShellClassInfo"), TEXT("IconFile"), sIconFile.c_str(), sDesktopFile.c_str() ); - // FYI: in tool 'ResHack' this icon can be found on position '19' (number is 1 based) WritePrivateProfileString( TEXT(".ShellClassInfo"), TEXT("IconIndex"), - TEXT("18"), + TEXT("0"), sDesktopFile.c_str() ); } // else -- cgit