summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2010-07-16 15:45:18 +0200
committerJoachim Lingner <jl@openoffice.org>2010-07-16 15:45:18 +0200
commit2beb067e11848fda068a76be5d943e2689044c55 (patch)
tree1411280c9683a556160ca3d127f91fa4568cb69d /scp2
parent16a34ac52582fc6af33d8530bdea47be32efd006 (diff)
parentc8099f69bbbce2d15dde8a9077a975e72cc3c304 (diff)
jl154 merging with OOO300_m1
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_font_ooo.scp2
-rw-r--r--scp2/source/ooo/module_ooo.scp5
2 files changed, 3 insertions, 4 deletions
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 8ad8526d9ef6..10e2dca219fb 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -142,7 +142,7 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium
File gid_File_FcLocal_Conf
Dir = gid_Dir_Fonts_Truetype;
USER_FILE_BODY;
-# Styles = ();
+// Styles = ();
Name = "fc_local.conf";
End
#endif
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 5b1de3897f77..dcd29c2ed31d 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -51,9 +51,8 @@ Module gid_Module_Optional
End
Module gid_Module_Dictionaries
- ParentID = gid_Module_Root;
- XPDParentID = "root";
- Sortkey = "300";
+ ParentID = gid_Module_Optional;
+ Sortkey = "215";
MOD_NAME_DESC ( MODULE_DICTIONARIES );
End