[Libreoffice-commits] .: scp2/source

[Andras Timar]

 scp2/source/ooo/directory_ooo.scp        |    5 -----
 scp2/source/ooo/file_extra_ooo.scp       |   11 ++---------
 scp2/source/ooo/module_lang_template.scp |    2 --
 3 files changed, 2 insertions(+), 16 deletions(-)

New commits:
commit 7cf1c02cdb676b5eb516f1516fe427daab8f0134
Author: Andras Timar <atimar at novell.com>
Date:   Tue Apr 26 20:38:10 2011 +0200

    modify/delete wordbook files for good
    
    * extras/source/wordbook/lang/*/soffice.dic: deleted
      These files were in old binary format and almost all
      language files were replicas of the en-US file. There
      were two exceptions: German and Slovenian. André Schnabel
      checked the German word list and he said that they can be
      deleted. Martin Srebotnjak checked the Slovenian word list
      and he asked me to keep those words -> sl.dic
    * extras/source/wordbook/oracle.dic: deleted
      It was not used in the build. It contained Oracle brand
      names, etc.
    * extras/source/wordbook/standard.dic: deleted
      It was built and delivered, but not packaged. It was an
      empty dictionary file which would be created anyway when
      the user creates a new empty dictionary.
    * extras/source/wordbook/technical.dic:
      Entries were sorted so it will be easier to add new words.
      Some entries were added from lang/en-US/soffice.dic.
    * extras/source/wordbook/sl.dic: added Slovenian words
    * extras/source/wordbook/en-US.dic: added English words
    * extras/source/wordbook/en-GB.dic: added English words
    * scp2/source/ooo/ :
      These wordbook files should not depend on the UI language.
      They should not be in language packs but they all should
      be installed for every language like spell checker
      dictionaries.
    * officecfg/registry/ :
      Paths adjusted, so application looks for wordbook files
      in the right directory.
      I enabled all dictionaries by default in Linguistic.xcs.

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 3807bde..7860835 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -1196,11 +1196,6 @@ Directory gid_Dir_Wordbook
     DosName = "wordbook";
 End
 
-Directory gid_Dir_Wordbook_Language
-    ParentID = gid_Dir_Wordbook;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
 Directory gid_Dir_Share_Plugin
     ParentID = gid_Dir_Share;
     DosName = "plugin";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 7cf102c..1beec8a 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -416,15 +416,8 @@ File gid_File_Extra_Webcast_Pl
 End
 
 File gid_File_Extra_Wordbook
-    Dir = gid_Dir_Wordbook_Language;
+    Dir = gid_Dir_Wordbook;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_IDENT_ALL_LANG(wordbook.zip);
-End
-
-File gid_File_Extra_Wordbook_Lang
-    Dir = gid_Dir_Wordbook_Language;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(wordbook,zip);
+    Name = "wordbook.zip";
 End
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 6825ed2..f801a62 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -37,8 +37,6 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Extra_Tplwizfax_Lang,
              gid_File_Extra_Tplwizreport_Lang,
              gid_File_Extra_Tplwizstyles_Lang,
-             gid_File_Extra_Wordbook,
-             gid_File_Extra_Wordbook_Lang,
              gid_File_Registry_Filter_Zip,
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,