scripting/Extension_ScriptProviderForPython.mk | 2 ++
scripting/source/pyprov/components.rdb | 9 +++++++++
scripting/source/pyprov/manifest.xml | 4 ++--
swext/Extension_wiki-publisher.mk | 1 +
swext/Zip_mediawiki_develop.mk | 1 +
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 10 ----------
swext/mediawiki/src/components.rdb | 11 +++++++++++
swext/mediawiki/src/manifest.xml | 4 ++--
8 files changed, 28 insertions(+), 14 deletions(-)
New commits:
commit a91784222d777b66e3df645a86f40afb224e2537
Author: Michael Meeks <michael.me...@suse.com>
Date: Thu Nov 24 11:30:27 2011 +0000
remove legacy mediawiki active registration hook
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index 0350e07..597bfb7 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -108,16 +108,6 @@ public final class WikiEditorImpl extends WeakBase
return xFactory;
}
- public static boolean __writeRegistryServiceInfo( XRegistryKey
xRegistryKey )
- {
- boolean bResult = Factory.writeRegistryServiceInfo(
m_implementationName,
- m_serviceNames,
- xRegistryKey );
- return ( bResult && Factory.writeRegistryServiceInfo(
WikiOptionsEventHandlerImpl.m_sImplementationName,
-
WikiOptionsEventHandlerImpl.m_pServiceNames,
- xRegistryKey ) );
- }
-
// com.sun.star.lang.XServiceInfo:
public String getImplementationName()
{
commit 148529c36cd6245c066289da8889aef506fd04bd
Author: Michael Meeks <michael.me...@suse.com>
Date: Wed Nov 23 17:14:33 2011 +0000
switch python scripting extension to passive registration
diff --git a/scripting/Extension_ScriptProviderForPython.mk
b/scripting/Extension_ScriptProviderForPython.mk
index 08d3cc7..4c4b043 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 0000000..70ee713
--- /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 7e4e045..b1d7813 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>
commit 1025924f709d927db0785ff8099c68c23fdb9df7
Author: Michael Meeks <michael.me...@suse.com>
Date: Wed Nov 23 16:50:13 2011 +0000
switch mediawiki extension to passive registration
diff --git a/swext/Extension_wiki-publisher.mk
b/swext/Extension_wiki-publisher.mk
index 05d5fd8..61b39cd 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -46,6 +46,7 @@ $(eval $(call
gb_Extension_add_file,wiki-publisher,Types.xcu,$(WIKISRC)/src/regi
$(eval $(call
gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
$(eval $(call
gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
$(eval $(call
gb_Extension_add_file,wiki-publisher,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
+$(eval $(call
gb_Extension_add_file,wiki-publisher,components.rdb,$(WIKISRC)/src/components.rdb))
$(eval $(call
gb_Extension_add_file,wiki-publisher,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl))
$(eval $(call
gb_Extension_add_file,wiki-publisher,WikiEditor/Settings.xdl,$(WIKISRC)/dialogs/Settings.xdl))
$(eval $(call
gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(WIKISRC)/dialogs/Module1.xba))
diff --git a/swext/Zip_mediawiki_develop.mk b/swext/Zip_mediawiki_develop.mk
index f682b07..fd7bdde 100644
--- a/swext/Zip_mediawiki_develop.mk
+++ b/swext/Zip_mediawiki_develop.mk
@@ -42,6 +42,7 @@ $(eval $(call
gb_Zip_add_file,mediawiki_develop,WikiExtension.xcu,$(WIKISRC)/src
$(eval $(call
gb_Zip_add_file,mediawiki_develop,description.xml,$(WIKISRC)/src/description.xml))
$(eval $(call
gb_Zip_add_file,mediawiki_develop,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
$(eval $(call
gb_Zip_add_file,mediawiki_develop,META-INF/manifest.xml,$(WIKISRC)/src/manifest.xml))
+$(eval $(call
gb_Zip_add_file,mediawiki_develop,components.rdb,$(WIKISRC)/src/components.rdb))
$(eval $(call
gb_Zip_add_file,mediawiki_develop,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl))
$(eval $(call
gb_Zip_add_file,mediawiki_develop,WikiEditor/Settings.xdl,$(WIKISRC)/dialogs/Settings.xdl))
$(eval $(call
gb_Zip_add_file,mediawiki_develop,WikiEditor/Module1.xba,$(WIKISRC)/dialogs/Module1.xba))
diff --git a/swext/mediawiki/src/components.rdb
b/swext/mediawiki/src/components.rdb
new file mode 100644
index 0000000..816cfe6
--- /dev/null
+++ b/swext/mediawiki/src/components.rdb
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<components xmlns="http://openoffice.org/2010/uno-components";>
+ <component loader="com.sun.star.loader.Java2" uri="./mediawiki.jar">
+ <implementation name="com.sun.star.wiki.WikiOptionsEventHandlerImpl">
+ <service name="com.sun.star.wiki.WikiOptionsEventHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.wiki.WikiEditorImpl">
+ <service name="com.sun.star.wiki.WikiEditor"/>
+ </implementation>
+ </component>
+</components>
diff --git a/swext/mediawiki/src/manifest.xml b/swext/mediawiki/src/manifest.xml
index 1f9b839..2eec406 100644
--- a/swext/mediawiki/src/manifest.xml
+++ b/swext/mediawiki/src/manifest.xml
@@ -26,8 +26,8 @@
************************************************************************ -->
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest";>
- <manifest:file-entry
manifest:media-type="application/vnd.sun.star.uno-component;type=Java"
- manifest:full-path="mediawiki.jar"/>
+ <manifest:file-entry
manifest:media-type="application/vnd.sun.star.uno-components"
+ manifest:full-path="components.rdb"/>
<manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="Addons.xcu"/>
<manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
