Author: pescetti
Date: Thu Sep 5 20:30:10 2013
New Revision: 1520412
URL: http://svn.apache.org/r1520412
Log:
#123153# Blacklist old French dictionaries to allow updating to the new unified
one in AOO401.
Modified:
openoffice/branches/AOO401/main/officecfg/registry/data/org/openoffice/Setup.xcu
(contents, props changed)
Modified:
openoffice/branches/AOO401/main/officecfg/registry/data/org/openoffice/Setup.xcu
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/officecfg/registry/data/org/openoffice/Setup.xcu?rev=1520412&r1=1520411&r2=1520412&view=diff
==============================================================================
---
openoffice/branches/AOO401/main/officecfg/registry/data/org/openoffice/Setup.xcu
(original)
+++
openoffice/branches/AOO401/main/officecfg/registry/data/org/openoffice/Setup.xcu
Thu Sep 5 20:30:10 2013
@@ -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>
Propchange:
openoffice/branches/AOO401/main/officecfg/registry/data/org/openoffice/Setup.xcu
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 5 20:30:10 2013
@@ -0,0 +1,7 @@
+/incubator/ooo/branches/AOO34/main/officecfg/registry/data/org/openoffice/Setup.xcu:1346776-1346777,1347535,1348052,1348914,1350569,1352456,1358991,1359004,1359010,1359024,1359546-1359547,1359553,1359555-1359556,1360552,1368968,1369110,1371068
+/incubator/ooo/branches/alg/linecap/main/officecfg/registry/data/org/openoffice/Setup.xcu:1226811-1232461
+/incubator/ooo/branches/alg/svgreplacement/main/officecfg/registry/data/org/openoffice/Setup.xcu:1205420-1220782
+/incubator/ooo/branches/writer001/main/officecfg/registry/data/org/openoffice/Setup.xcu:1356067-1386577
+/openoffice/branches/alg/clibboard/main/officecfg/registry/data/org/openoffice/Setup.xcu:1428975-1437368
+/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Setup.xcu:1415095-1466374
+/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Setup.xcu:1506958,1509224,1509576,1510489,1510954,1512298,1512966,1513112,1515312,1515732,1515749,1515762,1516435,1516741,1516789,1516794,1517535,1518091,1518253,1518697,1519366,1520411
