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.

5 files changed, 9 insertions, 9 deletions

diff --git a/pt_BR/Lightproof.py b/pt_BR/Lightproof.py
index 80d83da..eabf54b 100644
--- a/pt_BR/Lightproof.py
+++ b/pt_BR/Lightproof.py
@@ -231,7 +231,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer
         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:

@@ -313,11 +313,11 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer
 

 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_pt_BR.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)\\.")

@@ -18612,4 +18612,4 @@ def measurement(mnum, min, mout, mstr, decimal, remove):
     m = calc("CONVERT_ADD", (float(eval(mnum.replace(remove, "").replace(decimal, ".").replace(u"\u2212", "-"))), min, mout))

     a = list(set([str(calc("ROUND", (m, 0)))[:-2], str(calc("ROUND", (m, 1))), str(calc("ROUND", (m, 2))), str(m)])) # remove duplicated rounded items

     a.sort(lambda x, y: len(x) - len(y)) # sort by string length

-    return (mstr + "\n").join(a).replace(".", decimal).replace("-", u"\u2212") + mstr
\ No newline at end of file
+    return (mstr + "\n").join(a).replace(".", decimal).replace("-", u"\u2212") + mstr

diff --git a/pt_BR/Linguistic.xcu b/pt_BR/Linguistic.xcu
index 9e91b59..5225b45 100644
--- a/pt_BR/Linguistic.xcu
+++ b/pt_BR/Linguistic.xcu
@@ -5,7 +5,7 @@
         <node oor:name="ServiceManager">
 
                 <node oor:name="GrammarCheckers">
-                        <node oor:name="org.openoffice.comp.pyuno.Lightproof.pt_BR"
+                        <node oor:name="org.libreoffice.comp.pyuno.Lightproof.pt_BR"
                                 oor:op="fuse">
                                 <prop oor:name="Locales" oor:type="oor:string-list">
                                         <value>pt-BR</value>
diff --git a/pt_BR/description.xml b/pt_BR/description.xml
index 5de24b8..bdb44c3 100644
--- a/pt_BR/description.xml
+++ b/pt_BR/description.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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="3.0.0" />
+    <version value="3.0.0.1" />
     <identifier value="brazilian.portuguese.reform1990-dictionary.from.vero.by.raimundomoura" />
     <display-name>
         <name lang="en-US">Spelling, hyphenation and grammar checking tools for Brazilian Portuguese</name>
diff --git a/pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu b/pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index 2228d7c..8e5a056 100644
--- a/pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -18,7 +18,7 @@
             <value>%origin%/pt_BR.xdl</value>
           </prop>
           <prop oor:name="EventHandlerService">
-            <value>org.openoffice.comp.pyuno.LightproofOptionsEventHandler.pt_BR</value>
+            <value>org.libreoffice.comp.pyuno.LightproofOptionsEventHandler.pt_BR</value>
           </prop>
         </node>
       </node>
diff --git a/pt_BR/pythonpath/lightproof_handler_pt_BR.py b/pt_BR/pythonpath/lightproof_handler_pt_BR.py
index 3afc2ce..51bc6e2 100644
--- a/pt_BR/pythonpath/lightproof_handler_pt_BR.py
+++ b/pt_BR/pythonpath/lightproof_handler_pt_BR.py
@@ -38,7 +38,7 @@ class LightproofOptionsEventHandler( unohelper.Base, XServiceInfo, XContainerWin
         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, )