Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


On Thu, 2011-04-14 at 10:56 +0300, Lior Kaplan wrote:


Following your hint, here's the patch to fix #i61863. It disables
squence checking for CTL languages and enables it for Thai.

So, here's what I suggest. As rene points out, this doesn't build, so...
lets split those default into the ctl defaults and the extra ctlseqcheck
defaults in officecfg, that gives an additional Common-ctlseqcheck.xcu
file and then in scp2 we package that additional file into the thai
langpack.

A could of asides
a) I haven't double-checked this yet to see if it all works out ok or
pushed it. Be great if someone did a build to make sure it does the
right thing.
b) Checking my own (Red Hat) packages I see I've been hacking in the
equivalent of this for some years (me bad) without complaint

C.

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 65769d2..81c6f4a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1201,6 +1201,13 @@ File gid_File_Share_Registry_Ctl_Xcd
     Name (my) = "ctl.xcd";
 End
 
+File gid_File_Share_Registry_Ctlseqcheck_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED,MAKE_LANG_SPECIFIC);
+    Dir = gid_Dir_Share_Registry;
+    Name (th) = "ctlseqcheck.xcd";
+End
+
 File gid_File_Scripts_Beanshell
     Dir = gid_Dir_Share_Scripts;
     ARCHIVE_TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 6825ed2..12388ed 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -43,6 +43,7 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,
              gid_File_Share_Registry_Ctl_Xcd,
+             gid_File_Share_Registry_Ctlseqcheck_Xcd,
              gid_File_InfoPlist_Lang);
     Dirs = (gid_Dir_Samples_Language);
 End
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index f672cad..d7c97fd 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -168,17 +168,17 @@
     </prop>
   </node>
   <node oor:name="I18N">
-    <node oor:name="CTL" install:module="ctl">
-      <prop oor:name="CTLFont">
+    <node oor:name="CTL">
+      <prop oor:name="CTLFont" install:module="ctl">
         <value >true</value>
       </prop>
-      <prop oor:name="CTLSequenceChecking" >
+      <prop oor:name="CTLSequenceChecking" install:module="ctlseqcheck">
         <value >true</value>
       </prop>
-      <prop oor:name="CTLSequenceCheckingRestricted" >
+      <prop oor:name="CTLSequenceCheckingRestricted" install:module="ctlseqcheck">
         <value >true</value>
       </prop>
-      <prop oor:name="CTLSequenceCheckingTypeAndReplace">
+      <prop oor:name="CTLSequenceCheckingTypeAndReplace" install:module="ctlseqcheck">
         <value >true</value>
       </prop>
     </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk 
b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index 31e228d..596d2d8 100755
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -83,6 +83,7 @@ MODULEFILES= \
     Scripting-python.xcu   \
     Common-cjk.xcu   \
     Common-ctl.xcu   \
+    Common-ctlseqcheck.xcu   \
     Common-korea.xcu   \
     Paths-macosx.xcu    \
     Paths-unxwnt.xcu    \

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.