From 148529c36cd6245c066289da8889aef506fd04bd Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Wed, 23 Nov 2011 17:14:33 +0000
Subject: [PATCH] switch python scripting extension to passive registration

---
 scripting/Extension_ScriptProviderForPython.mk | 2 ++
 scripting/source/pyprov/components.rdb         | 9 +++++++++
 scripting/source/pyprov/manifest.xml           | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 scripting/source/pyprov/components.rdb

diff --git a/scripting/Extension_ScriptProviderForPython.mk b/scripting/Extension_ScriptProviderForPython.mk
index 08d3cc724205..4c4b043671ab 100644
--- a/scripting/Extension_ScriptProviderForPython.mk
+++ b/scripting/Extension_ScriptProviderForPython.mk
@@ -30,5 +30,7 @@ $(eval $(call gb_Extension_Extension,script-provider-for-python,scripting/source
 
 $(eval $(call gb_Extension_add_file,script-provider-for-python,pythonscript.py,\
 	$(SRCDIR)/scripting/source/pyprov/pythonscript.py))
+$(eval $(call gb_Extension_add_file,script-provider-for-python,components.rdb,\
+	$(SRCDIR)/scripting/source/pyprov/components.rdb))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/source/pyprov/components.rdb b/scripting/source/pyprov/components.rdb
new file mode 100644
index 000000000000..70ee71313d6b
--- /dev/null
+++ b/scripting/source/pyprov/components.rdb
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<components xmlns="http://openoffice.org/2010/uno-components">
+    <component loader="com.sun.star.loader.Python" uri="./pythonscript.py">
+        <implementation name="org.openoffice.pyuno.LanguageScriptProviderForPython">
+            <service name="com.sun.star.script.provider.ScriptProviderForPython"/>
+            <service name="com.sun.star.script.provider.LanguageScriptProvider"/>
+        </implementation>
+    </component>
+</components>
diff --git a/scripting/source/pyprov/manifest.xml b/scripting/source/pyprov/manifest.xml
index 7e4e0456ea97..b1d78139f2f7 100755
--- a/scripting/source/pyprov/manifest.xml
+++ b/scripting/source/pyprov/manifest.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
   <manifest:file-entry
-    manifest:media-type="application/vnd.sun.star.uno-component;type=python"
-    manifest:full-path="pythonscript.py"/>
+    manifest:media-type="application/vnd.sun.star.uno-components"
+    manifest:full-path="components.rdb"/>
 </manifest:manifest>