diff options
-rw-r--r-- | instsetoo_native/util/openoffice.lst | 104 | ||||
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 3 | ||||
-rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 3 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 | ||||
-rwxr-xr-x | scp2/source/ooo/module_lang_template.scp | 2 |
5 files changed, 60 insertions, 54 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 8613c8f81724..0af024c0520e 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -4,24 +4,24 @@ Globals { variables { - OOOBASEVERSION 3.1 - OOOPACKAGEVERSION 3.1.0 + OOOBASEVERSION 3.0 + OOOPACKAGEVERSION 3.0.0 UREPACKAGEVERSION 1.4.0 URELAYERVERSION 1 BASISROOTNAME OpenOffice.org UNIXBASISROOTNAME openoffice.org - SERVICETAG_PRODUCTNAME OpenOffice.org 3.1 - SERVICETAG_PRODUCTVERSION 3.1 - SERVICETAG_PARENTNAME OpenOffice.org 3.1 + SERVICETAG_PRODUCTNAME OpenOffice.org 3.0 + SERVICETAG_PRODUCTVERSION 3.0 + SERVICETAG_PARENTNAME OpenOffice.org 3.0 SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid}) - SERVICETAG_URN urn:uuid:67d59a0f-7902-11dd-938b-080020a9ed93 + SERVICETAG_URN urn:uuid:00c01e7f-36f9-11dd-9b49-080020a9ed93 HIDELICENSEDIALOG 1 PACKAGEPREFIX BASISPACKAGEPREFIX ooobasis UREPACKAGEPREFIX openoffice.org SOLSUREPACKAGEPREFIX openofficeorg USE_FILEVERSION 1 - LIBRARYVERSION 9.1.0 + LIBRARYVERSION 9.0.0 REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb REGISTRATIONURL http://survey.services.openoffice.org/user/index.php PROGRESSBARCOLOR 4,68,155 @@ -46,7 +46,7 @@ OpenOffice variables { PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.1 + PRODUCTVERSION 3.0 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -54,10 +54,9 @@ OpenOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.1.0 - BASEPRODUCTVERSION 3.1 - PCPFILENAME openoffice.pcp - UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update + ABOUTBOXPRODUCTVERSION 3.0.0 + BASEPRODUCTVERSION 3.0 + UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -66,7 +65,7 @@ OpenOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.1.0 + PACKAGEVERSION 3.0.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -82,7 +81,7 @@ OpenOffice STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.1.0 + LIBRARYVERSION 9.0.0 PATCHCODEFILE ooo_patchcodes.txt DOWNLOADBANNER ooobanner.bmp DOWNLOADBITMAP ooobitmap.bmp @@ -110,7 +109,7 @@ OpenOffice_wJRE variables { PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.1 + PRODUCTVERSION 3.0 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -118,9 +117,9 @@ OpenOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.1.0 - BASEPRODUCTVERSION 3.1 - UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update + ABOUTBOXPRODUCTVERSION 3.0.0 + BASEPRODUCTVERSION 3.0 + UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -129,7 +128,7 @@ OpenOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.1.0 + PACKAGEVERSION 3.0.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -145,7 +144,7 @@ OpenOffice_wJRE STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.1.0 + LIBRARYVERSION 9.0.0 PATCHCODEFILE ooo_patchcodes.txt JAVAPRODUCT 1 DOWNLOADBANNER ooobanner.bmp @@ -154,7 +153,7 @@ OpenOffice_wJRE RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794 STARTCENTER_INFO_URL http://www.openoffice.org - STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383 + STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -173,7 +172,7 @@ OpenOffice_Dev variables { PRODUCTNAME OOo-dev - PRODUCTVERSION 3.1 + PRODUCTVERSION 3.0 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -183,22 +182,21 @@ OpenOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.1.0 - BASEPRODUCTVERSION 3.1 + ABOUTBOXPRODUCTVERSION 3.0.0 + BASEPRODUCTVERSION 3.0 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX ooobasis-dev UREPACKAGEPREFIX ooodev SOLSUREPACKAGEPREFIX ooodev REGISTRYLAYERNAME LayerDev - SERVICETAG_URN urn:uuid:07a3230b-7902-11dd-938b-080020a9ed93 - UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.1.0 + PACKAGEVERSION 3.0.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -215,7 +213,7 @@ OpenOffice_Dev CHANGETARGETDIR 1 USE_FILEVERSION 1 JAVAPRODUCT 1 - LIBRARYVERSION 9.1.0 + LIBRARYVERSION 9.0.0 PATCHCODEFILE ooodev_patchcodes.txt CODEFILENAME codes_ooodev.txt DOWNLOADBANNER ooobanner.bmp @@ -225,7 +223,7 @@ OpenOffice_Dev RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794 STARTCENTER_INFO_URL http://www.openoffice.org - STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383 + STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -257,7 +255,6 @@ URE SETSTATICPATH 1 NOVERSIONINDIRNAME 1 PROGRAMFILESROOT 1 - PCPFILENAME ure.pcp GLOBALFILEGID gid_File_Dl_Cppu DOWNLOADBANNER urebanner.bmp DOWNLOADBITMAP urebitmap.bmp @@ -267,7 +264,7 @@ URE RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794 STARTCENTER_INFO_URL http://www.openoffice.org - STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383 + STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36 ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk PACKAGEMAP package_names_ext.txt } @@ -286,18 +283,18 @@ OpenOffice_SDK variables { PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.1 + PRODUCTVERSION 3.0 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 - PACKAGEVERSION 3.1.0 + PACKAGEVERSION 3.0.0 PACKAGEREVISION {milestone} PACK_INSTALLED 1 DMG_VOLUMEEXTENSION SDK - DATABASENAME openofficeorg31sdk + DATABASENAME openofficeorg30sdk NO_README_IN_ROOTDIR 1 LICENSENAME LGPL IGNOREDIRECTORYLAYER 1 @@ -311,7 +308,7 @@ OpenOffice_SDK RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794 STARTCENTER_INFO_URL http://www.openoffice.org - STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383 + STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36 } active 1 compression 5 @@ -327,7 +324,7 @@ BrOffice variables { PRODUCTNAME BrOffice.org - PRODUCTVERSION 3.1 + PRODUCTVERSION 3.0 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -335,12 +332,12 @@ BrOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.1.0 + ABOUTBOXPRODUCTVERSION 3.0.0 PROGRESSBARCOLOR PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR - UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -349,7 +346,7 @@ BrOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.1.0 + PACKAGEVERSION 3.0.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -365,7 +362,7 @@ BrOffice STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.1.0 + LIBRARYVERSION 9.0.0 CODEFILENAME codes_broo.txt PATCHCODEFILE ooo_patchcodes.txt DOWNLOADBANNER brobanner.bmp @@ -374,7 +371,7 @@ BrOffice RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794 STARTCENTER_INFO_URL http://www.openoffice.org - STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383 + STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -394,7 +391,7 @@ BrOffice_wJRE variables { PRODUCTNAME BrOffice.org - PRODUCTVERSION 3.1 + PRODUCTVERSION 3.0 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -402,12 +399,12 @@ BrOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.1.0 + ABOUTBOXPRODUCTVERSION 3.0.0 PROGRESSBARCOLOR PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR - UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -416,7 +413,7 @@ BrOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.1.0 + PACKAGEVERSION 3.0.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -432,7 +429,7 @@ BrOffice_wJRE STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.1.0 + LIBRARYVERSION 9.0.0 CODEFILENAME codes_broo.txt PATCHCODEFILE ooo_patchcodes.txt JAVAPRODUCT 1 @@ -442,7 +439,7 @@ BrOffice_wJRE RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794 STARTCENTER_INFO_URL http://www.openoffice.org - STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383 + STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -461,7 +458,7 @@ BrOffice_Dev variables { PRODUCTNAME BrOo-dev - PRODUCTVERSION 3.1 + PRODUCTVERSION 3.0 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -471,7 +468,7 @@ BrOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.1.0 + ABOUTBOXPRODUCTVERSION 3.0.0 DEVELOPMENTPRODUCT 1 PROGRESSBARCOLOR PROGRESSSIZE @@ -481,15 +478,14 @@ BrOffice_Dev UREPACKAGEPREFIX ooodev SOLSUREPACKAGEPREFIX ooodev REGISTRYLAYERNAME LayerDevBroffice - SERVICETAG_URN urn:uuid:07a3230b-7902-11dd-938b-080020a9ed93 - UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.1.0 + PACKAGEVERSION 3.0.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -506,7 +502,7 @@ BrOffice_Dev CHANGETARGETDIR 1 USE_FILEVERSION 1 JAVAPRODUCT 1 - LIBRARYVERSION 9.1.0 + LIBRARYVERSION 9.0.0 PATCHCODEFILE ooo_patchcodes.txt CODEFILENAME codes_broodev.txt DOWNLOADBANNER brobanner.bmp @@ -516,7 +512,7 @@ BrOffice_Dev RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794 STARTCENTER_INFO_URL http://www.openoffice.org - STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383 + STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 2dc1bf75e8bd..03b1a50bef0b 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1792,3 +1792,6 @@ End STD_UNO_LIB_FILE(gid_File_Lib_Unordf, unordf) +STD_UNO_LIB_FILE( gid_File_Lib_For, for) +STD_LIB_FILE( gid_File_Lib_Forui, forui) + diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index fde3e550b5c1..14b02d2dfa83 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -135,3 +135,6 @@ STD_RES_FILE( gid_File_Res_Upd, upd ) STD_RES_FILE( gid_File_Res_T602Filter, t602filter ) +STD_RES_FILE( gid_File_Res_Forui, forui ) +STD_RES_FILE( gid_File_Res_For, for ) + diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index a5c3bb34a198..1ea3bed5e7ac 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -178,6 +178,8 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Dbfile, gid_File_Lib_Drawinglayer, gid_File_Lib_Flat, + gid_File_Lib_For, + gid_File_Lib_Forui, gid_File_Lib_Frm, gid_File_Lib_Fwe, gid_File_Lib_Fwi, diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 326519c0b30d..b62635f11650 100755 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -72,6 +72,8 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Epg, gid_File_Res_Epp, gid_File_Res_Eur, + gid_File_Res_For, + gid_File_Res_Forui, gid_File_Res_Fps_Office, gid_File_Res_Frm, gid_File_Res_Fwe, |