fdo#60139: Rename bundled extensions's Lightproof service implementation names sdremote-1.0.2sdremote-1.0.1

... 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:
pt_BR/Lightproof.py

Change-Id: I6754cd6d4aa0aad6147bc9e404a29ef1075a2548
Reviewed-on: https://gerrit.libreoffice.org/2032
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

20 files changed, 29 insertions, 29 deletions

diff --git a/en/Lightproof.py b/en/Lightproof.py
index cdc93c6..dae4b20 100644
--- a/en/Lightproof.py
+++ b/en/Lightproof.py
@@ -23,7 +23,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer
     def __init__( self, ctx, *args ):
         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:
@@ -147,9 +147,9 @@ 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_en.LightproofOptionsEventHandler, \
-    "org.openoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
+    "org.libreoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
     ("com.sun.star.awt.XContainerWindowEventHandler",),)
diff --git a/en/Linguistic.xcu b/en/Linguistic.xcu
index 78fdd21..99011a7 100644
--- a/en/Linguistic.xcu
+++ b/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/en/description.xml b/en/description.xml
index f3523c3..11de53b 100644
--- a/en/description.xml
+++ b/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/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu b/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index 6a36775..563fa67 100644
--- a/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/en/dialog/registry/data/org/openoffice/Office/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/en/pythonpath/lightproof_handler_en.py b/en/pythonpath/lightproof_handler_en.py
index f69ccf1..190abd0 100644
--- a/en/pythonpath/lightproof_handler_en.py
+++ b/en/pythonpath/lightproof_handler_en.py
@@ -36,7 +36,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, )
 
diff --git a/hu_HU/Lightproof.py b/hu_HU/Lightproof.py
index 8bb0e41..45368ee 100644
--- a/hu_HU/Lightproof.py
+++ b/hu_HU/Lightproof.py
@@ -23,7 +23,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer
     def __init__( self, ctx, *args ):
         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:
@@ -147,9 +147,9 @@ 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_hu_HU.LightproofOptionsEventHandler, \
-    "org.openoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
+    "org.libreoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
     ("com.sun.star.awt.XContainerWindowEventHandler",),)
diff --git a/hu_HU/Linguistic.xcu b/hu_HU/Linguistic.xcu
index cb327ec..f3cf137 100644
--- a/hu_HU/Linguistic.xcu
+++ b/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/hu_HU/description.xml b/hu_HU/description.xml
index eb57339..6d4963d 100644
--- a/hu_HU/description.xml
+++ b/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/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu b/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index 56c7467..4379028 100644
--- a/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/hu_HU/dialog/registry/data/org/openoffice/Office/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/hu_HU/pythonpath/lightproof_handler_hu_HU.py b/hu_HU/pythonpath/lightproof_handler_hu_HU.py
index a313d5f..cc25e40 100644
--- a/hu_HU/pythonpath/lightproof_handler_hu_HU.py
+++ b/hu_HU/pythonpath/lightproof_handler_hu_HU.py
@@ -36,7 +36,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, )
 
diff --git a/pt_BR/Lightproof.py b/pt_BR/Lightproof.py
index 090bed1..d986102 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)\\.")
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, )
 
diff --git a/ru_RU/Lightproof.py b/ru_RU/Lightproof.py
index 95c56dd..cb0521e 100644
--- a/ru_RU/Lightproof.py
+++ b/ru_RU/Lightproof.py
@@ -23,7 +23,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer
     def __init__( self, ctx, *args ):
         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:
@@ -147,9 +147,9 @@ 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_ru_RU.LightproofOptionsEventHandler, \
-    "org.openoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
+    "org.libreoffice.comp.pyuno.LightproofOptionsEventHandler." + pkg,
     ("com.sun.star.awt.XContainerWindowEventHandler",),)
diff --git a/ru_RU/Linguistic.xcu b/ru_RU/Linguistic.xcu
index 28cc2d5..2f31f28 100644
--- a/ru_RU/Linguistic.xcu
+++ b/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/ru_RU/description.xml b/ru_RU/description.xml
index fbd7343..1ddd0c7 100644
--- a/ru_RU/description.xml
+++ b/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="2012.12.03" />
+    <version value="2012.12.03.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/ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu b/ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
index 073aeed..f1f5a9d 100644
--- a/ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/ru_RU/dialog/registry/data/org/openoffice/Office/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/ru_RU/pythonpath/lightproof_handler_ru_RU.py b/ru_RU/pythonpath/lightproof_handler_ru_RU.py
index 178a85b..7f31765 100644
--- a/ru_RU/pythonpath/lightproof_handler_ru_RU.py
+++ b/ru_RU/pythonpath/lightproof_handler_ru_RU.py
@@ -36,7 +36,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, )