diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-02-13 16:40:34 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-02-14 09:35:03 +0000 |
| commit | d1f7124c4bec104d0ee12927cba3f67f56b11829 (patch) | |
| tree | a942b5bc4f8aa0aa4573924d77fc589caaf77114 /scp2 | |
| parent | 8cefe14f428ab5521f10962ff68b02151d1207ad (diff) | |
Get Labels.xcu out of configuration data.
Modify the file format, install separately into share/labels,
and parse it using xmlreader when needed.
Saves time on startup and reduces pointless configurarion size.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 7 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 46419a8a800d..0f9f95412603 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -42,6 +42,7 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_Extensions, gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, + gid_Brand_Dir_Share_Labels, gid_Brand_Dir_Share_Registry, gid_Brand_Dir_Share_Xdg); Files = (gid_Brand_File_Bin_Crashreport, @@ -418,6 +419,11 @@ Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages Styles = (CREATE); End +Directory gid_Brand_Dir_Share_Labels + ParentID = gid_Brand_Dir_Share; + DosName = "labels"; +End + Directory gid_Brand_Dir_Share_Registry ParentID = gid_Brand_Dir_Share; DosName = "registry"; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 655832850a97..f1f604886fe5 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -625,6 +625,13 @@ End #endif +File gid_File_Share_Labels_Xml + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Brand_Dir_Share_Labels; + Name = "labels.xml"; +End + File gid_File_Share_Registry_Main_Xcd TXT_FILE_BODY; Styles = (PACKED, SCPZIP_REPLACE); diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index c3e6035e1b51..195a3fde562c 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -536,6 +536,7 @@ Module gid_Module_Root_Files_6 gid_File_Mod_Text, gid_File_Oo_Ldap_Xcd_Sample, gid_File_Oo_Ad_Ldap_Xcd_Sample, + gid_File_Share_Labels_Xml, gid_File_Share_Registry_Main_Xcd, gid_File_Share_Registry_Forcedefault_Xcd, gid_File_Pymailmerge, |