strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS native82 (1.2.74); FILE MERGED

Browse source 
2007/04/26 08:43:05 dv 1.2.74.2: no default to find new added enums at compile time
2007/04/26 06:29:41 dv 1.2.74.1: #i75659#i15220# Register for .rtf files, too, use soffice -<appl> for opening/printing/... documents
This commit is contained in:
Gerd Weiss 2007-05-10 10:04:04 +00:00
parent fcbca55ed6
commit d6e0eca4b6
1 changed files with 42 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
View file

@ -83,6 +83,30 @@ std::wstring RegistrationContextInformation::GetWordTemplateDefaultShellCommand(
return std::wstring(TEXT("new"));
}
std::wstring RegistrationContextInformation::GetRtfDocumentDisplayName() const
{
std::wstring str;
GetMsiProp(msihandle_, TEXT("STR_RTF_DOCUMENT"), str);
if (m_IsWin9x && !IsConvertableToAnsi(str))
str = TEXT("Rich Text Document");
return str;
}
std::wstring RegistrationContextInformation::GetRtfDocumentFileExtension() const
{
return std::wstring(TEXT(".rtf"));
}
std::wstring RegistrationContextInformation::GetRtfDocumentDefaultIconEntry() const
{
return m_OOExecPath + std::wstring(TEXT(",1"));
}
std::wstring RegistrationContextInformation::GetRtfDocumentDefaultShellCommand() const
{
return std::wstring(TEXT("open"));
}
std::wstring RegistrationContextInformation::GetExcelSheetDisplayName() const
{
std::wstring str;
@ -263,32 +287,43 @@ std::wstring RegistrationContextInformation::GetOpenOfficeExecutableName() const
}
/** A command line for the specified shell command */
std::wstring RegistrationContextInformation::GetOpenOfficeCommandline(SHELL_COMMAND ShellCommand) const
std::wstring RegistrationContextInformation::GetOpenOfficeCommandline(SHELL_COMMAND ShellCommand,
OFFICE_APPLICATION OfficeApp) const
{
// quote the path to OpenOffice, this is important
// for Windows 9x
std::wstring cmd_line = std::wstring(TEXT("\"")) + m_OOExecPath + std::wstring(TEXT("\""));
switch( OfficeApp )
{
case Writer:
cmd_line += std::wstring( TEXT( " -writer" ) );
break;
case Calc:
cmd_line += std::wstring( TEXT( " -calc" ) );
break;
case Impress:
cmd_line += std::wstring( TEXT( " -impress" ) );
break;
case Office: // default to std command line
break;
// default: no default to find new added enums at compile time
}
switch(ShellCommand)
{
case New:
cmd_line += std::wstring(TEXT(" -n \"%1\""));
break;
case Open:
cmd_line += std::wstring(TEXT(" -o \"%1\""));
break;
case Print:
cmd_line += std::wstring(TEXT(" -p \"%1\""));
break;
case Printto:
cmd_line += std::wstring(TEXT(" -pt \"%2\" \"%1\""));
break;
default:
assert(false);
// default: no default to find new added enums at compile time
}
return cmd_line;
}