From 350dc590b04041f15d6c570075ade425e4db93ad Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 8 Feb 2013 09:12:31 +0100
Subject: 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.
---
 en/Lightproof.py                                                | 6 +++---
 en/Linguistic.xcu                                               | 2 +-
 en/description.xml                                              | 2 +-
 en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu | 2 +-
 en/pythonpath/lightproof_handler_en.py                          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'en')

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, )
 
-- 
cgit