diff options
author | Thomas Lange [tl] <tl@openoffice.org> | 2010-06-09 14:50:43 +0200 |
---|---|---|
committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-06-09 14:50:43 +0200 |
commit | 7fbc42f1c51b0cdf064a737623980d8c23c2781a (patch) | |
tree | 1be87637f3b5d944451f35e8eee87b0d7a2439e2 /scp2/source | |
parent | 0ae0a09128d5b33a142d64435fde87cc5d29a309 (diff) | |
parent | 09b8d8f9054c8b7413b218972ba0b07fa70c55ab (diff) |
cws tl74: merge with DEV300_m81
Diffstat (limited to 'scp2/source')
25 files changed, 211 insertions, 205 deletions
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 7b392f173378..aaba3cd6c2ab 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -49,11 +49,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc) STD_UNO_LIB_FILE( gid_File_Lib_Date, date) -STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc) +STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc) -STD_LIB_FILE( gid_File_Lib_Scui, scui) +STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui) -STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) +STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt) STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd) diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index 84ab326814ee..0c26c3a7a78b 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -89,4 +89,13 @@ Module gid_Module_Langpack_Calc_Template gid_File_Res_Solver); End +Module gid_Module_Prg_Calc_MSO_Reg + ParentID = gid_Module_Prg_Calc; + Name = "gid_Module_Prg_Calc_MSO_Reg"; + Description = "gid_Module_Prg_Calc_MSO_Reg"; + Styles = (HIDDEN_ROOT); + Minimal = YES; + Default = YES; +End + #include "alllangmodules_calc.inc" diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index e2504579e0a0..efc71ac73f63 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -1110,11 +1110,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc ) // registering the mso file types -CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_Bin, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_Bin, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt, gid_Module_Prg_Calc_Bin, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_Bin, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_Bin, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_MSO_Reg, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt, gid_Module_Prg_Calc_MSO_Reg, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc ) diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf index 2f6e1e8eda9a..da0739ee1756 100644 --- a/scp2/source/calc/registryitem_calc.ulf +++ b/scp2/source/calc/registryitem_calc.ulf @@ -29,10 +29,10 @@ en-US = "&New" [STR_REG_VAL_SO60_SPREADSHEET] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Spreadsheet" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet" [STR_REG_VAL_SO60_CALC_TEMPLATE] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Spreadsheet Template" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet Template" [STR_REG_VAL_OO_CALC] en-US = "OpenDocument Spreadsheet" diff --git a/scp2/source/crashrep/file_crashrep.scp b/scp2/source/crashrep/file_crashrep.scp index f92f93f0b1d8..53ec1ac245eb 100644 --- a/scp2/source/crashrep/file_crashrep.scp +++ b/scp2/source/crashrep/file_crashrep.scp @@ -31,11 +31,7 @@ File gid_Brand_File_Bin_Crashreport BIN_FILE_BODY; - #ifdef UNX - Name = "crash_report.bin"; - #else - Name = "crashrep.exe"; - #endif + Name = EXENAME(crashrep); Dir = gid_Brand_Dir_Program; #ifdef WNT FileDescription = "%PRODUCTNAME Crashreporter"; @@ -66,15 +62,3 @@ File gid_Brand_File_Lib_Dbghelp End #endif - -#ifdef UNX - -File gid_Brand_File_Bin_Crashreport_Script - BIN_FILE_BODY; - Name = "crash_report"; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); -End - -#endif - diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf index 46224625dfb8..7e6bce29fa21 100644 --- a/scp2/source/draw/registryitem_draw.ulf +++ b/scp2/source/draw/registryitem_draw.ulf @@ -29,10 +29,10 @@ en-US = "&New" [STR_REG_VAL_SO60_DRAWING] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Drawing" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing" [STR_REG_VAL_SO60_DRAW_TEMPLATE] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Drawing Template" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing Template" [STR_REG_VAL_OO_DRAW] en-US = "OpenDocument Drawing" diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index 7f8bcb7c44f7..1682b88d051f 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -77,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/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index 689dcd7e1526..cce7f1d85ad3 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -975,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, 33, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_Bin, pps, PPS, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot, gid_Module_Prg_Impress_Bin, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, 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" diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf index cee55d76d3c8..c7cfb663f369 100644 --- a/scp2/source/math/registryitem_math.ulf +++ b/scp2/source/math/registryitem_math.ulf @@ -29,7 +29,7 @@ en-US = "&New" [STR_REG_VAL_SO60_FORMULA] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Formula" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula" [STR_REG_VAL_OO_FORMULA] en-US = "OpenDocument Formula" diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 9be400ed2d39..b2023aabecd7 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -84,6 +84,7 @@ Module gid_Module_Root_Brand gid_Brand_File_Lib_Npsoplugin, gid_Brand_File_Lib_Subscrib_C05, gid_Brand_File_Share_Registry_Brand_Xcd, + gid_Brand_File_Share_Registry_O5oo_Xcd gid_Brand_File_Script_Unopkg, gid_Brand_File_Share_Xdg_Base, gid_Brand_File_Share_Xdg_Calc, @@ -118,19 +119,22 @@ Module gid_Module_Langpack_Brand_Template gid_Brand_Dir_Share_Readme); Files = (gid_Brand_File_Res_Iso, gid_Brand_File_Res_Ooo, - gid_Brand_File_Entitlement, gid_Brand_File_Help_C05_Sdatabase_Zip, gid_Brand_File_Help_C05_Scalc_Zip, gid_Brand_File_Help_C05_Sdraw_Zip, gid_Brand_File_Help_C05_Swriter_Zip, gid_Brand_File_License_License, + gid_Brand_File_License_License_Small, gid_Brand_File_License_License_Html, + gid_Brand_File_License_License_Html_Small, gid_Brand_File_Readme_Readme, gid_Brand_File_Readme_Readme_Html, gid_Brand_File_Share_Registry_Cjk_Xcd, gid_Brand_File_Share_Registry_Korea_Xcd, gid_Brand_File_Txt_License, + gid_Brand_File_Txt_License_Small, gid_Brand_File_Txt_License_Html, + gid_Brand_File_Txt_License_Html_Small, gid_Brand_File_Txt_Readme, gid_Brand_File_Txt_Readme_Html); End diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index f26339fe8b1d..8ad8526d9ef6 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -27,6 +27,8 @@ #include "macros.inc" +// OpenSymbol + STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol) // DejaVu fonts @@ -34,17 +36,8 @@ STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol) // DejaVuSans Proportional #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique) #endif @@ -56,51 +49,24 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, Dej // DejaVuSans Condensed #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique) #endif // DejaVuSans Mono #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique) #endif // DejaVuSerif Proportional #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSerif, DejaVuSerif.ttf, DejaVu Serif) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic) #endif @@ -115,27 +81,20 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondense // Liberation fonts -// Liberation Mono +// Liberation Sans Narrow #ifndef WITHOUT_FONTS -#ifndef WNT -STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular) -#endif +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LiberationSansNarrow-Regular.ttf, Liberation Sans Narrow Regular) +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LiberationSansNarrow-Bold.ttf, Liberation Sans Narrow Bold) +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LiberationSansNarrow-Italic.ttf, Liberation Sans Narrow Italic) +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldItalic.ttf, Liberation Sans Narrow Bold Italic) #endif +// Liberation Mono #ifndef WITHOUT_FONTS #ifndef WNT +STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular) STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic) #endif #endif @@ -144,23 +103,8 @@ STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic #ifndef WITHOUT_FONTS #ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) #endif #endif @@ -169,23 +113,8 @@ STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic #ifndef WITHOUT_FONTS #ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) #endif #endif @@ -206,3 +135,16 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic) #endif +// fontconfig updates to allow proper use of local fonts + +#ifdef UNX +#ifndef WITHOUT_FONTS +File gid_File_FcLocal_Conf + Dir = gid_Dir_Fonts_Truetype; + USER_FILE_BODY; +# Styles = (); + Name = "fc_local.conf"; +End +#endif +#endif + diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 4a39b5da4978..5ce656d436eb 100755..100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1,5 +1,5 @@ -************************************************************************* -* +/************************************************************************* + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2000, 2010 Oracle and/or its affiliates. @@ -23,7 +23,7 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * -************************************************************************/ + ************************************************************************/ #include "macros.inc" #ifdef WNT @@ -84,7 +84,7 @@ File gid_File_Lib_Cached1 #endif End -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Configmgr, configmgr) +SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno) #ifdef WITH_LDAP File gid_File_Lib_Ldapbe2 @@ -100,10 +100,10 @@ File gid_File_Lib_Ldapbe2 End #endif -STD_UNO_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller) -STD_UNO_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel) -STD_UNO_LIB_FILE(gid_File_Lib_Charttools, charttools) -STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview) +STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartcontroller, chartcontroller) +STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartmodel, chartmodel) +STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Charttools, charttools) +STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartview, chartview) #if defined WNT && defined _MSC @@ -228,7 +228,7 @@ End File gid_File_Lib_QStart_Gtk Name = LIBNAME(qstart_gtk); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = SCP2_OOO_BIN_DIR; End #endif @@ -363,7 +363,7 @@ File gid_File_Lib_Vbaswobj TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX)); #else @@ -375,7 +375,7 @@ File gid_File_Lib_Vbamsforms TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX)); #else @@ -505,7 +505,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc) File gid_File_Lib_Filterconfig1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,UNO_COMPONENT,PATCH); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; Name = SPECIAL_NAME(filterconfig1); @@ -653,7 +653,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi) File gid_File_Lib_Fwk Name = LIBNAME(fwk); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,UNO_COMPONENT,PATCH); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -677,7 +677,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker) File gid_File_Lib_I18npool TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,PATCH,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; #ifdef UNX @@ -1126,13 +1126,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr File gid_File_Lib_Desktop_Detector Name = LIBNAME(desktop_detector); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = SCP2_OOO_BIN_DIR; End File gid_File_Lib_Vclplug_Gen Name = LIBNAME(vclplug_gen); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1142,7 +1142,7 @@ End File gid_File_Lib_Vclplug_Gtk Name = LIBNAME(vclplug_gtk); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1151,7 +1151,7 @@ End File gid_File_Lib_Vclplug_Kde Name = LIBNAME(vclplug_kde); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1161,7 +1161,7 @@ End File gid_File_Lib_Vclplug_Kde4 Name = LIBNAME(vclplug_kde4); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = gid_Dir_Program; End #endif @@ -1172,7 +1172,7 @@ End File gid_File_Lib_AppleRemote Name = LIBNAME(AppleRemote); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1181,13 +1181,13 @@ End File gid_File_Lib_Basebmp Name = LIBNAME(basebmp); TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = SCP2_OOO_BIN_DIR; End #endif #if defined UNX && ! defined QUARTZ -STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp ) +STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp ) STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp ) #endif @@ -1195,7 +1195,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp ) File gid_File_Lib_Recentfile TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(librecentfile,UNXSUFFIX)); End @@ -1238,7 +1238,7 @@ End File gid_File_Lib_Res Name = LIBNAME(res); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,UNO_COMPONENT,PATCH); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1325,7 +1325,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler ) File gid_File_Lib_Sfx Name = LIBNAME(sfx); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,PATCH,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1381,19 +1381,19 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) STD_LIB_FILE( gid_File_Lib_Sts , sts) STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl ) -STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt ) +STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt ) -STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) +STD_UNO_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx) STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) STD_LIB_FILE( gid_File_Lib_Editeng, editeng) STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter) -STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw) -STD_LIB_FILE( gid_File_Lib_Swui, swui) +STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw) +STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui) -STD_LIB_FILE( gid_File_Lib_Msword, msword ) +STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword ) #if ! defined UNX File gid_File_Lib_Sysdtrans @@ -1485,6 +1485,8 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1) SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno) +SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno) + SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) File gid_File_Lib_Lnth @@ -1512,7 +1514,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx ) File gid_File_Lib_Vcl Name = LIBNAME(vcl); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,UNO_COMPONENT,PATCH); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1537,7 +1539,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof) File gid_File_Lib_Xo Name = LIBNAME(xo); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,PATCH,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1698,7 +1700,7 @@ File gid_File_Lib_Openssl TXT_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - #ifdef WNT + #ifdef WNT Name = "ssleay32.dll"; #endif End @@ -1709,7 +1711,7 @@ File gid_File_Lib_Crypto TXT_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - + #ifdef WNT Name = "libeay32.dll"; #endif diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a2591d9f5a65..11173e1f37fc 100755 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1738,15 +1738,6 @@ File gid_File_App_InfoPlist End #endif -#if defined MACOSX && !defined QUARTZ -File gid_File_App_Bundle - ARCHIVE_TXT_FILE_BODY; - Dir = gid_Dir_Bundle_Contents; - Name = "osxbundle.zip"; - Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); -End -#endif - #ifdef MACOSX File gid_File_Icns_Bundle ARCHIVE_TXT_FILE_BODY; @@ -1783,15 +1774,6 @@ File gid_File_Spotlight_Bundle End #endif -#if defined MACOSX && !defined QUARTZ -File gid_File_Bin_Fondu - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Name = "fondu"; - Styles = (PACKED); -End -#endif - File gid_File_Config_Javasettingsunopkginstall USER_FILE_BODY; Dir = gid_Dir_Config; @@ -1917,7 +1899,7 @@ End File gid_File_Extension_Dictionary_Da Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-da.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -1926,7 +1908,7 @@ End File gid_File_Extension_Dictionary_De_AT Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-de-AT.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -1935,7 +1917,7 @@ End File gid_File_Extension_Dictionary_De_CH Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-de-CH.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -1944,7 +1926,7 @@ End File gid_File_Extension_Dictionary_De_DE Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-de-DE.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -1953,7 +1935,7 @@ End File gid_File_Extension_Dictionary_En Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-en.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -1971,7 +1953,7 @@ End File gid_File_Extension_Dictionary_Et Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-et.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -1980,7 +1962,7 @@ End File gid_File_Extension_Dictionary_Fr Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-fr.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -2007,7 +1989,7 @@ End File gid_File_Extension_Dictionary_Hu Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-hu.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -2016,7 +1998,16 @@ End File gid_File_Extension_Dictionary_It Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-it.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Ku_Tr + Dir = gid_Brand_Dir_Share_Extension_Install; + Name = "dict-ku-TR.oxt"; + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -2052,7 +2043,7 @@ End File gid_File_Extension_Dictionary_No Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-no.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -2061,7 +2052,7 @@ End File gid_File_Extension_Dictionary_Pl Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-pl.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -2070,7 +2061,7 @@ End File gid_File_Extension_Dictionary_Pt Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-pt.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -2079,7 +2070,7 @@ End File gid_File_Extension_Dictionary_Ro Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-ro.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -2097,7 +2088,7 @@ End File gid_File_Extension_Dictionary_Sk Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-sk.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -2106,7 +2097,7 @@ End File gid_File_Extension_Dictionary_Sl Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-sl.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif @@ -2124,7 +2115,7 @@ End File gid_File_Extension_Dictionary_Sv Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-sv.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp index 8b045bb440c2..26bdc09eddd3 100644 --- a/scp2/source/ooo/installation_ooo.scp +++ b/scp2/source/ooo/installation_ooo.scp @@ -34,6 +34,7 @@ Installation gid_Installation_Ooo OOoBaseVersion = "${OOOBASEVERSION}"; UserDirProductVersion = "${USERDIRPRODUCTVERSION}"; JavaVersion = "${JAVAVERSION}"; + SxwFormatName = "OpenOffice.org"; SxwFormatVersion = "1.1"; VendorName = "OpenOffice.org"; #ifdef WNT diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 814c090bd58d..a4ab3bfab762 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -751,6 +751,10 @@ Module gid_Module_Root_Fonts_OOo_Hidden gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, gid_File_Fnt_DejaVuSerifCondensed_Italic, gid_File_Fnt_DejaVuSerifCondensed, + gid_File_Fnt_LibSansNarrow_Regular, + gid_File_Fnt_LibSansNarrow_Bold, + gid_File_Fnt_LibSansNarrow_BoldItalic, + gid_File_Fnt_LibSansNarrow_Italic, gid_File_Fnt_LiberationMono_Bold, gid_File_Fnt_LiberationMono_BoldItalic, gid_File_Fnt_LiberationMono_Italic, @@ -969,6 +973,17 @@ Module gid_Module_Root_Extension_Dictionary_It Styles = (HIDDEN_ROOT); End +Module gid_Module_Root_Extension_Dictionary_Ku_Tr + Name = "gid_Module_Root_Extension_Dictionary_Ku_Tr"; + Description = "gid_Module_Root_Extension_Dictionary_Ku_Tr"; + Files = (gid_File_Extension_Dictionary_Ku_Tr); + InstallOrder = "2000"; + Spellcheckerlanguage = "ku-TR"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root; + Styles = (HIDDEN_ROOT); +End + Module gid_Module_Root_Extension_Dictionary_Lt Name = "gid_Module_Root_Extension_Dictionary_Lt"; Description = "gid_Module_Root_Extension_Dictionary_Lt"; diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 5d8673ef9855..47a053f225cd 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -34,11 +34,18 @@ RegistryItem gid_Regitem_Bau Value = "soffice.StarConfigFile.6"; End -RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e +RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "AppID\{82154420-0FBF-11d4-8313-005004526AB4}"; ModuleID = gid_Module_Root; - Value = "%PRODUCTNAME Service Manager"; + Value = "%PRODUCTNAME Service Manager (Ver 1.0)"; +End + +RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_soffice + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + Subkey = "AppID\soffice.exe"; + ModuleID = gid_Module_Root; + Value = "%PRODUCTNAME Service Manager (Ver 1.0)"; End RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_ diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf index cbb57ef56d98..d37db89c113a 100644 --- a/scp2/source/ooo/registryitem_ooo.ulf +++ b/scp2/source/ooo/registryitem_ooo.ulf @@ -32,7 +32,7 @@ en-US = "&New" en-US = "&Install" [STR_REG_VAL_SO60_CONFIGFILE] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Configuration File" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File" [STR_REG_VAL_SO50_TEMPLATE_OOO] en-US = "StarOffice 5.0 Template" diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index e5314c7c386e..d6f294f1da08 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -358,7 +358,11 @@ End #ifdef MACOSX ScpAction scp_Copy_Dmg_Background_Image + #if defined(BUILD_SPECIAL) Copy = "osxdndinstall.png"; + #else + Copy = "osxdndinstall_nologo.png"; + #endif Name = "background.png"; UnixRights = 444; Styles = (); diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index ca7a7222b074..2bf8db09254c 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -634,6 +634,15 @@ File gid_File_Dl_Jpipe End #endif +#if defined SOLAR_JAVA && defined WNT +File gid_File_Dl_Jpipx + TXT_FILE_BODY; + Dir = SCP2_URE_DL_DIR; + Name = SCP2_URE_DL_NORMAL("jpipx"); + Styles = (PACKED); +End +#endif + #if defined SOLAR_JAVA File gid_File_Dl_Juh TXT_FILE_BODY; @@ -1153,6 +1162,7 @@ Module gid_Module_Root_Ure_Hidden gid_File_Dl_AffineUnoUno, gid_File_Dl_LogUnoUno, gid_File_Dl_Jpipe, + gid_File_Dl_Jpipx, gid_File_Dl_Juh, gid_File_Dl_Juhx, gid_File_Dl_Acceptor, diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index b69082b05cd5..9228b5cd711c 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -51,7 +51,7 @@ WindowsCustomAction gid_Customaction_Regallmsdocdll Source = "reg4allmsdoc.dll"; Target = "FindRegisteredExtensions"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostFinalize"); + Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize"); End WindowsCustomAction gid_Customaction_Regactivexdll1 @@ -516,3 +516,21 @@ WindowsCustomAction gid_Customaction_ShowSurvey Inbinarytable = 1; Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end"); End + +WindowsCustomAction gid_Customaction_LookForRegisteredExtensions + Name = "LookForRegisteredExtensions"; + Typ = "65"; + Source = "reg4allmsdoc.dll"; + Target = "LookForRegisteredExtensions"; + Inbinarytable = 1; + Assignment1 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "LookForRegisteredExtensions", "1", "2"); +End + +WindowsCustomAction gid_Customaction_RegisterSomeExtensions + Name = "RegisterSomeExtensions"; + Typ = "65"; + Source = "reg4allmsdoc.dll"; + Target = "RegisterSomeExtensions"; + Inbinarytable = 1; + Assignment1 = ("ControlEvent", "FileTypeDialog", "Next", "DoAction", "RegisterSomeExtensions", "1", "1"); +End diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 16928c8b25b9..0d959dd3f86b 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -92,5 +92,15 @@ Module gid_Module_Langpack_Writer_Template gid_File_Res_T602Filter); End +Module gid_Module_Prg_Wrt_MSO_Reg + ParentID = gid_Module_Prg_Wrt; + Name = "gid_Module_Prg_Wrt_MSO_Reg"; + Description = "gid_Module_Prg_Wrt_MSO_Reg"; + Styles = (HIDDEN_ROOT); + Minimal = YES; + Default = YES; +End + + #include "alllangmodules_writer.inc" diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index a1233bb1792f..8c3f0a5b82ad 100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -1488,11 +1488,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg ) // registering the mso file types // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid, key, cond, disp_name, icon_id, app, default, dox_type) -CONDITIONAL_REGISTER_DOC_EXTENSION( Doc, gid_Module_Prg_Wrt_Bin, doc, DOC, MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_Bin, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_Bin, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot, gid_Module_Prg_Wrt_Bin, dot, DOT, MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_Bin, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_Bin, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf, gid_Module_Prg_Wrt_Bin, rtf, RTF, MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Doc, gid_Module_Prg_Wrt_MSO_Reg, doc, DOC, MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot, gid_Module_Prg_Wrt_MSO_Reg, dot, DOT, MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf, gid_Module_Prg_Wrt_MSO_Reg, rtf, RTF, MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer ) diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf index ce8108ae572d..f353df21d9cc 100644 --- a/scp2/source/writer/registryitem_writer.ulf +++ b/scp2/source/writer/registryitem_writer.ulf @@ -29,13 +29,13 @@ en-US = "&New" [STR_REG_VAL_SO60_TEXT] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Text Document" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document" [STR_REG_VAL_SO60_MASTERDOC] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Master Document" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Master Document" [STR_REG_VAL_SO60_WRITER_TEMPLATE] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Text Document Template" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document Template" [STR_REG_VAL_OO_WRITER] en-US = "OpenDocument Text" diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp index 848b1c707ff7..e044a3dee90d 100644 --- a/scp2/source/xsltfilter/file_xsltfilter.scp +++ b/scp2/source/xsltfilter/file_xsltfilter.scp @@ -57,7 +57,7 @@ End File gid_File_Xsl_Export_Xhtml_Body TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,PATCH); Dir = gid_Dir_Share_Xslt_Export_Xhtml; Name = "/xslt/export/xhtml/body.xsl"; End |