diff options
Diffstat (limited to 'scripting/source')
| -rw-r--r-- | scripting/source/pyprov/META-INF/manifest.xml | 24 | ||||
| -rw-r--r-- | scripting/source/pyprov/description-en-US.txt | 1 | ||||
| -rw-r--r-- | scripting/source/pyprov/description.xml | 44 | ||||
| -rwxr-xr-x | scripting/source/pyprov/pythonscript.py | 2 | ||||
| -rw-r--r-- | scripting/source/pyprov/scriptproviderforpython.rdb (renamed from scripting/source/pyprov/components.rdb) | 14 |
5 files changed, 9 insertions, 76 deletions
diff --git a/scripting/source/pyprov/META-INF/manifest.xml b/scripting/source/pyprov/META-INF/manifest.xml deleted file mode 100644 index 7a8f084277a6..000000000000 --- a/scripting/source/pyprov/META-INF/manifest.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd"> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . ---> -<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest"> - <manifest:file-entry - manifest:media-type="application/vnd.sun.star.uno-components" - manifest:full-path="components.rdb"/> -</manifest:manifest> diff --git a/scripting/source/pyprov/description-en-US.txt b/scripting/source/pyprov/description-en-US.txt deleted file mode 100644 index 7e60ea0aba5f..000000000000 --- a/scripting/source/pyprov/description-en-US.txt +++ /dev/null @@ -1 +0,0 @@ -Add support for Python via the Scripting Framework to enable Python scripts in the user and share directories of a LibreOffice installation, and also in loaded documents. diff --git a/scripting/source/pyprov/description.xml b/scripting/source/pyprov/description.xml deleted file mode 100644 index d3b5cb64f6dd..000000000000 --- a/scripting/source/pyprov/description.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0"?> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . ---> -<description - xmlns="http://openoffice.org/extensions/description/2006" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:dep="http://openoffice.org/extensions/description/2006"> - - <identifier value="com.sun.star.script.provider.ScriptProviderForPython"/> - - <dependencies> - <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/> - </dependencies> - - <version value="3.3.1"/> - - <publisher> - <name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name> - </publisher> - - <display-name> - <name lang="en-US">Script provider for Python</name> - </display-name> - - <extension-description> - <src xlink:href="description-en-US.txt" lang="en-US"/> - </extension-description> - -</description> diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py index 78c622640fef..dcf05d4f9b7c 100755 --- a/scripting/source/pyprov/pythonscript.py +++ b/scripting/source/pyprov/pythonscript.py @@ -137,7 +137,7 @@ CALLABLE_CONTAINER_NAME = "g_exportedScripts" # pythonloader looks for a static g_ImplementationHelper variable g_ImplementationHelper = unohelper.ImplementationHelper() -g_implName = "org.openoffice.pyuno.LanguageScriptProviderFor"+LANGUAGENAME +g_implName = "org.libreoffice.pyuno.LanguageScriptProviderFor"+LANGUAGENAME diff --git a/scripting/source/pyprov/components.rdb b/scripting/source/pyprov/scriptproviderforpython.rdb index 2436cab14260..09a37e4da108 100644 --- a/scripting/source/pyprov/components.rdb +++ b/scripting/source/pyprov/scriptproviderforpython.rdb @@ -17,10 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.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> + <component loader="com.sun.star.loader.Python" + uri="vnd.openoffice.pymodule:pythonscript"> + <implementation + name="org.libreoffice.pyuno.LanguageScriptProviderForPython"> + <service name="com.sun.star.script.provider.ScriptProviderForPython"/> + <service name="com.sun.star.script.provider.LanguageScriptProvider"/> + </implementation> + </component> </components> |