[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions.lst officecfg/registry

[Andrea Pescetti]

 extensions.lst                                   |    2 +-
 officecfg/registry/data/org/openoffice/Setup.xcu |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8e46b8bc28fffec586137b4b525d2e23648cceac
Author: Andrea Pescetti <pescetti at apache.org>
Date:   Thu Sep 5 20:35:21 2013 +0000

    #123153# Update bundled French dictionary

diff --git a/extensions.lst b/extensions.lst
index a8d462f..a4aef09 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -55,7 +55,7 @@
 
 # French dictionary.
 [ language=fr || language=nl || language=de || language=de_DE ]
-    47ca39e385b02839c24a5d953495cb98 http://sourceforge.net/projects/aoo-extensions/files/3554/5/ooo-dictionnaire-fr-moderne-v4.2.oxt/download "ooo-dictionnaire-fr-moderne-v4.2.oxt"
+    8f7ca241048c70bd7893995ac4bcca3b http://sourceforge.net/projects/aoo-extensions/files/17340/1/dict411.oxt/download "dict411.oxt"
 
 # Italian dictionary.
 [ language=it || language=de || language=de_DE ]
commit e27707edb086073bb37f06cd37d40b46cfa36f2e
Author: Andrea Pescetti <pescetti at apache.org>
Date:   Thu Sep 5 20:27:24 2013 +0000

    #123153# Blacklist old French dictionaries to allow updating to the new unified one.

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 0bdf600..8e16ecc 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -1067,6 +1067,13 @@
                             <it>com.sun.star.PresentationMinimizer-*</it>
                             <!-- presentation screen is integrated since AOO 4.0 -->
                             <it>com.sun.PresenterScreen-*</it>
+                            <!-- Old French dictionaries are incompatible with the new unified French dictionary since AOO 4.0.1 -->
+                            <it>french.modern-dictionary.from.Dicollecte.by.OlivierR</it>
+                            <it>french.classic-dictionary.from.Dicollecte.by.OlivierR</it>
+                            <it>french.reform1990-dictionary.from.Dicollecte.by.OlivierR</it>
+                            <it>french.classic-and-reform1990-dictionary.from.Dicollecte.by.OlivierR</it>
+                            <it>org.openoffice.comp.pyuno.lightproof.oxt.grammalecte</it>
+                            <it>org.openoffice.comp.pyuno.lightproof.oxt.dicollecte_fr_FR</it>
                         </value>
                     </prop>
                 </node>