diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-04-20 11:01:42 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-04-20 11:01:42 +0000 |
commit | 7d4a3b26856e336c9cf7cb02f2a223341362827d (patch) | |
tree | b984ff3140600d380b03a0ea4f605d32466785d6 /scp2/source | |
parent | b68cd7f2c3fe2e2eb6171b5aaf375bd6de6d4745 (diff) |
INTEGRATION: CWS nativefixer6 (1.82.2); FILE MERGED
2005/04/13 10:23:11 is 1.82.2.3: RESYNC: (1.82-1.83); FILE MERGED
2005/04/12 16:30:15 is 1.82.2.2: #i46741# prepare Linux patch
2005/04/07 11:27:00 is 1.82.2.1: #i46741# avoiding language pack conflicts
Diffstat (limited to 'scp2/source')
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 11d1f82fe72f..2820d9f8128d 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1773,7 +1773,7 @@ End File gid_File_Registry_Spool_Oo_Common_Cjk_Xcu TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,MAKE_LANG_SPECIFIC); Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; Name (ja) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; Name (ko) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; @@ -1783,7 +1783,7 @@ End File gid_File_Registry_Spool_Oo_Common_Ctl_Xcu TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,MAKE_LANG_SPECIFIC); Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; Name (th) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; Name (hi-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; @@ -1793,7 +1793,7 @@ End File gid_File_Registry_Spool_Oo_Writer_Cjk_Xcu TXT_FILE_BODY; - Styles = (PACKED); + Styles = (PACKED,MAKE_LANG_SPECIFIC); Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Writer; Name (ja) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; Name (ko) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; @@ -2349,6 +2349,15 @@ File gid_File_JREProperties End #endif +#ifdef WNT +File gid_File_Txt_Patchfiles + TXT_FILE_BODY; + Name = "patchlist.txt"; + Dir = gid_Dir_Program; + Styles = (PACKED,PATCH,PATCH_ONLY); +End +#endif + File gid_Starregistry_Legacy_Binfilters_Rdb TXT_FILE_BODY; Name = "legacy_binfilters.rdb"; |