Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2033
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/33/2033/1
fdo#60139: Rename bundled extensions's Lightproof service implementation names
... from org.openoffice.comp.pyuno.Lightproof... to
org.libreoffice.comp.pyuno.Lightproof... (and increment the corresponding
extensions' version numbers) to avoid clashes with any freestanding Lightproof
extension.
(cherry picked from commit 350dc590b04041f15d6c570075ade425e4db93ad)
Conflicts:
en/Lightproof.py
en/Linguistic.xcu
en/description.xml
en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
en/pythonpath/lightproof_handler_en.py
hu_HU/Lightproof.py
hu_HU/Linguistic.xcu
hu_HU/description.xml
hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
hu_HU/pythonpath/lightproof_handler_hu_HU.py
pt_BR/Lightproof.py
pt_BR/Linguistic.xcu
pt_BR/description.xml
pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
pt_BR/pythonpath/lightproof_handler_pt_BR.py
ru_RU/Lightproof.py
ru_RU/Linguistic.xcu
ru_RU/description.xml
ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
ru_RU/pythonpath/lightproof_handler_ru_RU.py
Change-Id: I6754cd6d4aa0aad6147bc9e404a29ef1075a2548
---
M dictionaries/en/Lightproof.py
M dictionaries/en/Linguistic.xcu
M dictionaries/en/description.xml
M dictionaries/en/dialog/OptionsDialog.xcu
M dictionaries/en/pythonpath/lightproof_handler_en.py
M dictionaries/hu_HU/Lightproof.py
M dictionaries/hu_HU/Linguistic.xcu
M dictionaries/hu_HU/description.xml
M dictionaries/hu_HU/dialog/OptionsDialog.xcu
M dictionaries/hu_HU/pythonpath/lightproof_handler_hu_HU.py
M dictionaries/ru_RU/Lightproof.py
M dictionaries/ru_RU/Linguistic.xcu
M dictionaries/ru_RU/description.xml
M dictionaries/ru_RU/dialog/OptionsDialog.xcu
M dictionaries/ru_RU/pythonpath/lightproof_handler_ru_RU.py
15 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/dictionaries/en/Lightproof.py b/dictionaries/en/Lightproof.py
index 38a7360..825adcf 100644
--- a/dictionaries/en/Lightproof.py
+++ b/dictionaries/en/Lightproof.py
@@ -232,7 +232,7 @@
global SMGR
self.ctx = ctx
self.ServiceName = "com.sun.star.linguistic2.Proofreader"
- self.ImplementationName = "org.openoffice.comp.pyuno.Lightproof." + pkg
+ self.ImplementationName = "org.libreoffice.comp.pyuno.Lightproof." + pkg
self.SupportedServiceNames = (self.ServiceName, )
self.locales = []
for i in locales:
@@ -314,11 +314,11 @@
g_ImplementationHelper = unohelper.ImplementationHelper()
g_ImplementationHelper.addImplementation( Lightproof, \
- "org.openoffice.comp.pyuno.Lightproof." + pkg,
+ "org.libreoffice.comp.pyuno.Lightproof." + pkg,
("com.sun.star.linguistic2.Proofreader",),)
g_ImplementationHelper.addImplementation( lightproof_handler_en.LightproofOptionsEventHandler, \
- "org.openoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
+ "org.libreoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
("com.sun.star.awt.XContainerWindowEventHandler",),)
# pattern matching for common English abbreviations
abbrev =
re.compile("(?i)\\b([a-z]|acct|approx|appt|apr|apt|assoc|asst|aug|ave|avg|co(nt|rp)?|ct|dec|defn|dept|dr|eg|equip|esp|est|etc|excl|ext|feb|fri|ft|govt?|hrs?|ib(id)?|ie|in(c|t)?|jan|jr|jul|lit|ln|mar|max|mi(n|sc)?|mon|Mrs?|mun|natl?|neg?|no(rm|s|v)?|nw|obj|oct|org|orig|pl|pos|prev|proj|psi|qty|rd|rec|rel|reqd?|resp|rev|sat|sci|se(p|pt)?|spec(if)?|sq|sr|st|subj|sun|sw|temp|thurs|tot|tues|univ|var|vs)\\.")
diff --git a/dictionaries/en/Linguistic.xcu b/dictionaries/en/Linguistic.xcu
index 78fdd21..99011a7 100644
--- a/dictionaries/en/Linguistic.xcu
+++ b/dictionaries/en/Linguistic.xcu
@@ -5,7 +5,7 @@
<node oor:name="ServiceManager">
<node oor:name="GrammarCheckers">
- <node oor:name="org.openoffice.comp.pyuno.Lightproof.en"
+ <node oor:name="org.libreoffice.comp.pyuno.Lightproof.en"
oor:op="fuse">
<prop oor:name="Locales" oor:type="oor:string-list">
<value>en-GB en-US en-PH en-ZA en-NA en-ZW en-AU en-CA
en-IE en-IN en-BZ en-BS en-GH en-JM en-NZ en-TT</value>
diff --git a/dictionaries/en/description.xml b/dictionaries/en/description.xml
index f3523c3..11de53b 100644
--- a/dictionaries/en/description.xml
+++ b/dictionaries/en/description.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006";
xmlns:d="http://openoffice.org/extensions/description/2006";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <version value="2011.12.05" />
+ <version value="2011.12.05.1" />
<identifier value="org.openoffice.en.hunspell.dictionaries" />
<display-name>
<name lang="en-US">English spelling dictionaries, hyphenation rules, thesaurus, and
grammar checker</name>
diff --git a/dictionaries/en/dialog/OptionsDialog.xcu b/dictionaries/en/dialog/OptionsDialog.xcu
index 6a36775..563fa67 100644
--- a/dictionaries/en/dialog/OptionsDialog.xcu
+++ b/dictionaries/en/dialog/OptionsDialog.xcu
@@ -25,7 +25,7 @@
</prop>
<prop oor:name="EventHandlerService">
-
<value>org.openoffice.comp.pyuno.LightproofOptionsEventHandler.en</value>
+
<value>org.libreoffice.comp.pyuno.LightproofOptionsEventHandler.en</value>
</prop>
</node>
diff --git a/dictionaries/en/pythonpath/lightproof_handler_en.py
b/dictionaries/en/pythonpath/lightproof_handler_en.py
index e8c458a..f2771a9 100644
--- a/dictionaries/en/pythonpath/lightproof_handler_en.py
+++ b/dictionaries/en/pythonpath/lightproof_handler_en.py
@@ -38,7 +38,7 @@
p.Value = "/org.openoffice.Lightproof_%s/Leaves"%pkg
self.xConfig = ctx.ServiceManager.createInstance(
'com.sun.star.configuration.ConfigurationProvider' )
self.node = self.xConfig.createInstanceWithArguments(
'com.sun.star.configuration.ConfigurationUpdateAccess', (p, ) )
- self.service = "org.openoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg
+ self.service = "org.libreoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg
self.ImplementationName = self.service
self.services = (self.service, )
diff --git a/dictionaries/hu_HU/Lightproof.py b/dictionaries/hu_HU/Lightproof.py
index 9f19420..1c9e2bc 100644
--- a/dictionaries/hu_HU/Lightproof.py
+++ b/dictionaries/hu_HU/Lightproof.py
@@ -1,3 +1,4 @@
+es
# -*- encoding: UTF-8 -*-
# Lightproof grammar checker for LibreOffice and OpenOffice.org
# http://launchpad.net/lightproof
@@ -232,7 +233,7 @@
global SMGR
self.ctx = ctx
self.ServiceName = "com.sun.star.linguistic2.Proofreader"
- self.ImplementationName = "org.openoffice.comp.pyuno.Lightproof." + pkg
+ self.ImplementationName = "org.libreoffice.comp.pyuno.Lightproof." + pkg
self.SupportedServiceNames = (self.ServiceName, )
self.locales = []
for i in locales:
@@ -314,11 +315,11 @@
g_ImplementationHelper = unohelper.ImplementationHelper()
g_ImplementationHelper.addImplementation( Lightproof, \
- "org.openoffice.comp.pyuno.Lightproof." + pkg,
+ "org.libreoffice.comp.pyuno.Lightproof." + pkg,
("com.sun.star.linguistic2.Proofreader",),)
g_ImplementationHelper.addImplementation( lightproof_handler_hu_HU.LightproofOptionsEventHandler, \
- "org.openoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
+ "org.libreoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
("com.sun.star.awt.XContainerWindowEventHandler",),)
abbrev=re.compile(ur"(?i)\\b([a-z\xf6\xfc\xf3\u0151\xfa\xe9\xe1\u0171\xed\xd6\xdc\xd3\u0150\xda\xc9\xc1\u0170\xcd]|\xc1e|\xc1ht|AkH|al|\xe1lt|\xe1pr|aug|Avtv|bek|Bp|br|bt|Btk|cca|ci(i|ii|v|x)?|cl(i|ii|iii|iv|ix|v|vi|vii|viii|x|xi|xii|xiii|xiv|xix|xv|xvi|xvii|xviii|xx|xxi|xxii|xxiii|xxiv|xxix|xxv|xxvi|xxvii|xxviii|xxx|xxxi|xxxii|xxxiii|xxxiv|xxxix|xxxv|xxxvi|xxxvii|xxxviii)?|Co|cv(i|ii|iii)?|cx(c|ci|cii|ciii|civ|cix|cv|cvi|cvii|cviii|i|ii|iii|iv|ix|l|li|lii|liii|liv|lix|lv|lvi|lvii|lviii|v|vi|vii|viii|x|xi|xii|xiii|xiv|xix|xv|xvi|xvii|xviii|xx|xxi|xxii|xxiii|xxiv|xxix|xxv|xxvi|xxvii|xxviii)?|cs|Csjt|Cstv|cs\xfct|dec|dk|dny|dr|du|dz(s)?|egy|\xe9k|\xc9Ksz|em|\xe9ny|\xc9pt|\xe9rk|etc|Etv|e\xfc|ev|\xe9vf|febr|felv|Flt|ford|f\u0151isk|fsz(la|t)?|Ftv|gimn|g\xf6r|gr|Gt|gy|Gyvt|habil|hg|hiv|Hjt|honv|Hpt|hrsz|hsz|Hszt|htb|id|ifj|ig(h)?|ii(i)?|ill|Inc|ind|isk|iv|ix|izr|jan|jegyz|j\xfal|j\xfan|kat|kb|Kbt|ker|kft|kgy|kht|kir|kiv|Kjt|kk(t)?|koll|korm|k\xf6v|kp|Kr|krt|Kt(v)?|ld|li(i|ii|v|x
)?|Ltd|ltp|Ltv|luth|lv(i|ii|iii)?|lx(i|ii|iii|iv|ix|v|vi|vii|viii|x|xi|xii|xiii|xiv|xix|xv|xvi|xvii|xviii|xx|xxi|xxii|xxiii|xxiv|xxix|xxv|xxvi|xxvii|xxviii)?|ly|m\xe1j|m\xe1rc|mat|max|mb|megh|megj|MHSz|min|mk|Mo|Mt|NB|nov|ny(\xe1)?|Nyilv|nyrt|okl|okt|olv|op|orsz|ort|ov(h)?|\xf6ssz|\xd6tv|\xf6zv|Pf|pl(d)?|prof|prot|Ptk|pu|ref|rk(p)?|r\xf3m|r\xf6v|rt|sgt|spec|stb|sz(ept|erk)?|Szjt|szoc|Szt(v)?|sz\xfcl|Tbj|tc|tel|tkp|tszf|tvr|ty|ua|ui|\xfam|\xfan|uo|Ve|Vhr|vi(i|ii)?|v\xf6|vsz|Vt(v)?|xc(i|ii|iii|iv|ix|v|vi|vii|viii)?|xi(i|ii|v|x)?|xl(i|ii|iii|iv|ix|v|vi|vii|viii)?|xv(i|ii|iii)?|xx(i|ii|iii|iv|ix|v|vi|vii|viii|x|xi|xii|xiii|xiv|xix|xv|xvi|xvii|xviii)?|zrt)\\.")
diff --git a/dictionaries/hu_HU/Linguistic.xcu b/dictionaries/hu_HU/Linguistic.xcu
index cb327ec..f3cf137 100644
--- a/dictionaries/hu_HU/Linguistic.xcu
+++ b/dictionaries/hu_HU/Linguistic.xcu
@@ -5,7 +5,7 @@
<node oor:name="ServiceManager">
<node oor:name="GrammarCheckers">
- <node oor:name="org.openoffice.comp.pyuno.Lightproof.hu_HU"
+ <node oor:name="org.libreoffice.comp.pyuno.Lightproof.hu_HU"
oor:op="fuse">
<prop oor:name="Locales" oor:type="oor:string-list">
<value>hu-HU</value>
diff --git a/dictionaries/hu_HU/description.xml b/dictionaries/hu_HU/description.xml
index eb57339..6d4963d 100644
--- a/dictionaries/hu_HU/description.xml
+++ b/dictionaries/hu_HU/description.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006";
xmlns:d="http://openoffice.org/extensions/description/2006";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <version value="2011.12.05" />
+ <version value="2011.12.05.1" />
<identifier value="org.openoffice.hu.hunspell.dictionaries" />
<display-name>
<name lang="en-US">Hungarian spelling dictionary, hyphenation rules, thesaurus, and
grammar checker</name>
diff --git a/dictionaries/hu_HU/dialog/OptionsDialog.xcu
b/dictionaries/hu_HU/dialog/OptionsDialog.xcu
index 56c7467..4379028 100644
--- a/dictionaries/hu_HU/dialog/OptionsDialog.xcu
+++ b/dictionaries/hu_HU/dialog/OptionsDialog.xcu
@@ -25,7 +25,7 @@
</prop>
<prop oor:name="EventHandlerService">
-
<value>org.openoffice.comp.pyuno.LightproofOptionsEventHandler.hu_HU</value>
+
<value>org.libreoffice.comp.pyuno.LightproofOptionsEventHandler.hu_HU</value>
</prop>
</node>
diff --git a/dictionaries/hu_HU/pythonpath/lightproof_handler_hu_HU.py
b/dictionaries/hu_HU/pythonpath/lightproof_handler_hu_HU.py
index 1716afb..1cfb298 100644
--- a/dictionaries/hu_HU/pythonpath/lightproof_handler_hu_HU.py
+++ b/dictionaries/hu_HU/pythonpath/lightproof_handler_hu_HU.py
@@ -38,7 +38,7 @@
p.Value = "/org.openoffice.Lightproof_%s/Leaves"%pkg
self.xConfig = ctx.ServiceManager.createInstance(
'com.sun.star.configuration.ConfigurationProvider' )
self.node = self.xConfig.createInstanceWithArguments(
'com.sun.star.configuration.ConfigurationUpdateAccess', (p, ) )
- self.service = "org.openoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg
+ self.service = "org.libreoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg
self.ImplementationName = self.service
self.services = (self.service, )
diff --git a/dictionaries/ru_RU/Lightproof.py b/dictionaries/ru_RU/Lightproof.py
index f31dca8..44c8dbf 100644
--- a/dictionaries/ru_RU/Lightproof.py
+++ b/dictionaries/ru_RU/Lightproof.py
@@ -232,7 +232,7 @@
global SMGR
self.ctx = ctx
self.ServiceName = "com.sun.star.linguistic2.Proofreader"
- self.ImplementationName = "org.openoffice.comp.pyuno.Lightproof." + pkg
+ self.ImplementationName = "org.libreoffice.comp.pyuno.Lightproof." + pkg
self.SupportedServiceNames = (self.ServiceName, )
self.locales = []
for i in locales:
@@ -314,9 +314,9 @@
g_ImplementationHelper = unohelper.ImplementationHelper()
g_ImplementationHelper.addImplementation( Lightproof, \
- "org.openoffice.comp.pyuno.Lightproof." + pkg,
+ "org.libreoffice.comp.pyuno.Lightproof." + pkg,
("com.sun.star.linguistic2.Proofreader",),)
g_ImplementationHelper.addImplementation( lightproof_handler_ru_RU.LightproofOptionsEventHandler, \
- "org.openoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
+ "org.libreoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
("com.sun.star.awt.XContainerWindowEventHandler",),)
diff --git a/dictionaries/ru_RU/Linguistic.xcu b/dictionaries/ru_RU/Linguistic.xcu
index 28cc2d5..2f31f28 100644
--- a/dictionaries/ru_RU/Linguistic.xcu
+++ b/dictionaries/ru_RU/Linguistic.xcu
@@ -5,7 +5,7 @@
<node oor:name="ServiceManager">
<node oor:name="GrammarCheckers">
- <node oor:name="org.openoffice.comp.pyuno.Lightproof.ru_RU"
+ <node oor:name="org.libreoffice.comp.pyuno.Lightproof.ru_RU"
oor:op="fuse">
<prop oor:name="Locales" oor:type="oor:string-list">
<value>ru-RU</value>
diff --git a/dictionaries/ru_RU/description.xml b/dictionaries/ru_RU/description.xml
index 2224edd..4c25b62 100644
--- a/dictionaries/ru_RU/description.xml
+++ b/dictionaries/ru_RU/description.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006";
xmlns:d="http://openoffice.org/extensions/description/2006";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <version value="2011.01.29" />
+ <version value="2011.01.29.1" />
<identifier value="org.openoffice.ru.hunspell.dictionaries" />
<display-name>
<name lang="en-US">Russian spelling dictionary, hyphenation rules, thesaurus, and grammar
checker</name>
diff --git a/dictionaries/ru_RU/dialog/OptionsDialog.xcu
b/dictionaries/ru_RU/dialog/OptionsDialog.xcu
index 073aeed..f1f5a9d 100644
--- a/dictionaries/ru_RU/dialog/OptionsDialog.xcu
+++ b/dictionaries/ru_RU/dialog/OptionsDialog.xcu
@@ -21,7 +21,7 @@
<value>%origin%/ru_RU.xdl</value>
</prop>
<prop oor:name="EventHandlerService">
-
<value>org.openoffice.comp.pyuno.LightproofOptionsEventHandler.ru_RU</value>
+
<value>org.libreoffice.comp.pyuno.LightproofOptionsEventHandler.ru_RU</value>
</prop>
</node>
diff --git a/dictionaries/ru_RU/pythonpath/lightproof_handler_ru_RU.py
b/dictionaries/ru_RU/pythonpath/lightproof_handler_ru_RU.py
index 463ffa7..5825a56 100644
--- a/dictionaries/ru_RU/pythonpath/lightproof_handler_ru_RU.py
+++ b/dictionaries/ru_RU/pythonpath/lightproof_handler_ru_RU.py
@@ -38,7 +38,7 @@
p.Value = "/org.openoffice.Lightproof_%s/Leaves"%pkg
self.xConfig = ctx.ServiceManager.createInstance(
'com.sun.star.configuration.ConfigurationProvider' )
self.node = self.xConfig.createInstanceWithArguments(
'com.sun.star.configuration.ConfigurationUpdateAccess', (p, ) )
- self.service = "org.openoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg
+ self.service = "org.libreoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg
self.ImplementationName = self.service
self.services = (self.service, )
--
To view, visit https://gerrit.libreoffice.org/2033
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6754cd6d4aa0aad6147bc9e404a29ef1075a2548
Gerrit-PatchSet: 1
Gerrit-Project: dictionaries
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann <sbergman@redhat.com>
Context
- [PATCH libreoffice-3-6] fdo#60139: Rename bundled extensions's Lightproof service im... · Stephan Bergmann (via Code Review)
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.