diff options
Diffstat (limited to 'scp2/source/impress')
| -rw-r--r-- | scp2/source/impress/file_impress.scp | 69 | ||||
| -rw-r--r-- | scp2/source/impress/module_impress.scp | 15 | ||||
| -rw-r--r-- | scp2/source/impress/module_ogltrans.scp | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | scp2/source/impress/registryitem_impress.scp | 35 | ||||
| -rw-r--r-- | scp2/source/impress/registryitem_impress.ulf | 4 |
5 files changed, 34 insertions, 97 deletions
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index e93cc421ba06..00dde2ca9162 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -37,11 +37,11 @@ File gid_File_Lib_Animcore PACKED_UNO_LIB_FILE_BODY; End -File gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu +File gid_File_Share_Registry_Impress_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-impress.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "impress.xcd"; End File gid_File_Help_Simpress_Zip @@ -74,55 +74,6 @@ File gid_File_Share_Config_Sofficecfg_Impress_Menubar_Xml End */ -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-impress.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_impress_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_impress_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Impress_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-impress.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Impress_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-impress.xcu"; -End - -File gid_File_Oo_Office_Ui_Impresswindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Impresswindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu"; -End - // configuration files for custom animation effects File gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml @@ -138,17 +89,3 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml Dir = gid_Dir_Share_Config_Sofficecfg_Simpress; Name = "transitions.xml"; End - -File gid_File_Oo_Office_Ui_Effects_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Effects.xcs"; -End - -File gid_File_Oo_Office_Ui_Effects_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/Effects.xcu"; -End diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index 84fcb713a4e8..1682b88d051f 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -43,11 +43,9 @@ Module gid_Module_Prg_Impress_Bin Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware, - gid_File_Registry_Spool_Oo_Common_Impress_Xcu,gid_File_Registry_Spool_Oo_Setup_Impress_Xcu, - gid_File_Oo_Office_Ui_Impresswindowstate_Xcs,gid_File_Oo_Office_Ui_Impresswindowstate_Xcu, + gid_File_Share_Registry_Impress_Xcd, gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml, - gid_File_Oo_Office_Ui_Effects_Xcs, gid_File_Oo_Office_Ui_Effects_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu, gid_File_Tmp_Userinstall_Impress_Inf); + gid_File_Tmp_Userinstall_Impress_Inf); End // Module gid_Module_Prg_Impress_Help @@ -79,4 +77,13 @@ Module gid_Module_Langpack_Impress_Template Files = (gid_File_Help_Simpress_Zip); End +Module gid_Module_Prg_Impress_MSO_Reg + ParentID = gid_Module_Prg_Impress; + Name = "gid_Module_Prg_Impress_MSO_Reg"; + Description = "gid_Module_Prg_Impress_MSO_Reg"; + Styles = (HIDDEN_ROOT); + Minimal = YES; + Default = YES; +End + #include "alllangmodules_impress.inc" diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index b0f872a644c4..06fbb4bfcc1a 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/scp2/source/impress/module_ogltrans.scp @@ -31,7 +31,7 @@ Module gid_Module_Optional_OGLTrans PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_OGLTRANS); ParentID = gid_Module_Optional; - Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Registry_Spool_Oo_Office_Impress_OGLTrans_Xcu ); + Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd ); Minimal = NO; Default = NO; End @@ -55,9 +55,9 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml Name = "transitions-ogl.xml"; End -File gid_File_Registry_Spool_Oo_Office_Impress_OGLTrans_Xcu +File gid_File_Share_Registry_Ogltrans_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Impress; - Name = "registry/spool/org/openoffice/Office/Impress-ogltrans.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "ogltrans.xcd"; End diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index cf4ba3ccbcb6..cce7f1d85ad3 100755..100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -347,7 +347,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; Subkey = "soffice.StarImpressDocument.6\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\simpress.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Print_Command @@ -424,7 +424,7 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "soffice.StarImpressTemplate.6\shell\open\command"; ModuleID = gid_Module_Prg_Impress_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\simpress.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Print_Command @@ -731,13 +731,6 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New_Command Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; End -// RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command -// ParentID = PREDEFINED_HKEY_CLASSES_ROOT; -// ModuleID = gid_Module_Prg_Impress_Bin; -// Subkey = "opendocument.ImpressDocument.1\shell\open\command"; -// Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -// End - RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; @@ -866,7 +859,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.ImpressTemplate.1\shell\open\command"; ModuleID = gid_Module_Prg_Impress_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\simpress.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command @@ -908,7 +901,7 @@ RegistryItem gid_Regitem_OpenOffice_SXI_OpenWith_Impress ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sxi\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Impress_Bin; - Name = "opendocument.ImpressDocument.1"; + Name = "soffice.StarImpressDocument.6"; Value = " "; End @@ -917,7 +910,7 @@ RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sti\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Impress_Bin; - Name = "opendocument.ImpressDocument.1"; + Name = "soffice.StarImpressDocument.6"; Value = " "; End @@ -926,7 +919,7 @@ RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Impress ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sxd\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Impress_Bin; - Name = "opendocument.ImpressDocument.1"; + Name = "soffice.StarImpressDocument.6"; Value = " "; End @@ -954,7 +947,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Impress_Bin; Name = ".sti"; - Value = "opendocument.ImpressDocument.1"; + Value = "soffice.StarImpressDocument.6"; Styles = (); End @@ -982,10 +975,10 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti ) // registering the mso file types -CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_Bin, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_Bin, pps, PPS, MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pot, gid_Module_Prg_Impress_Bin, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_MSO_Reg, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_MSO_Reg, pps, PPS, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot, gid_Module_Prg_Impress_MSO_Reg, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress ) diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf index 2b49957ea470..0221ab122d52 100644 --- a/scp2/source/impress/registryitem_impress.ulf +++ b/scp2/source/impress/registryitem_impress.ulf @@ -32,10 +32,10 @@ en-US = "&New" en-US = "Show" [STR_REG_VAL_SO60_PRESENT] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Presentation" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation" [STR_REG_VAL_SO60_IMPRESS_TEMPLATE] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Presentation Template" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation Template" [STR_REG_VAL_OO_PRESENT] en-US = "OpenDocument Presentation" |