diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
| commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
| tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /scp2/source/ooo/file_ooo.scp | |
| parent | 8e0d67bed54633d555a4601a5d79e2d5ba7ab2bb (diff) | |
| parent | 3f899eae02eaad0b967de749fe09b869ba93ad6d (diff) | |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'scp2/source/ooo/file_ooo.scp')
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index ea102c302fdb..eaf929478a1f 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -430,9 +430,7 @@ End #ifdef SOLAR_JAVA STD_JAR_FILE( gid_File_Jar_Report, report ) STD_JAR_FILE( gid_File_Jar_Table, table ) -STD_JAR_FILE( gid_File_Jar_Letter, letter ) STD_JAR_FILE( gid_File_Jar_Form, form ) -STD_JAR_FILE( gid_File_Jar_Fax, fax ) STD_JAR_FILE( gid_File_Jar_Agenda, agenda ) STD_JAR_FILE( gid_File_Jar_Query, query ) STD_JAR_FILE( gid_File_Jar_Web, web ) @@ -474,12 +472,6 @@ End #endif -#ifdef SOLAR_JAVA -#ifndef SYSTEM_SAXON -STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 ) -#endif -#endif - #ifndef AIX #ifndef DISABLE_PYUNO @@ -492,7 +484,13 @@ End File gid_File_Wizards_Fax Dir = gid_Dir_Wizards_Fax; ARCHIVE_TXT_FILE_BODY; - Name = "pyfax.zip"; + Name = "fax.zip"; +End + +File gid_File_Wizards_Letter + Dir = gid_Dir_Wizards_Letter; + ARCHIVE_TXT_FILE_BODY; + Name = "letter.zip"; End #endif @@ -740,7 +738,7 @@ End #endif #endif -// new user interface configuration files +// user interface configuration files File gid_File_Share_Config_Sofficecfg_uiconfig_Zip TXT_FILE_BODY; Styles = (ARCHIVE); @@ -749,6 +747,14 @@ File gid_File_Share_Config_Sofficecfg_uiconfig_Zip Patchfiles = (); End +// user interface configuration file translations +File gid_File_Share_Config_Sofficecfg_uiconfig_Zip_Lang + TXT_FILE_BODY; + Styles = (ARCHIVE); + Dir = gid_Dir_Share_Config_Sofficecfg; + EXTRA_ALL_LANG_BUT_EN_US(uiconfig,zip); +End + #ifdef WNT STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods) |