[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - scripting/Package_ScriptsPython.mk scripting/source

Tor Lillqvist tml at collabora.com
Tue Apr 3 14:37:15 UTC 2018


 scripting/Package_ScriptsPython.mk      |    1 +
 scripting/source/pyprov/pythonscript.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9fa8c9d3772a9c3197f73698ed8c4a9050e3750e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Mar 27 20:13:28 2018 +0300

    Add NamedRanges.py to the relevant Makefile
    
    Change-Id: Ic2d36182795b2d27aec8fed8665d8bb9f8f12a0f
    Reviewed-on: https://gerrit.libreoffice.org/51975
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit a260eabf5c228567fc64e99ca72d332f7ebaf0d4)
    Reviewed-on: https://gerrit.libreoffice.org/52094
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-on: https://gerrit.libreoffice.org/52317

diff --git a/scripting/Package_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk
index 8cc8a85472ff..7612b7ba58bd 100644
--- a/scripting/Package_ScriptsPython.mk
+++ b/scripting/Package_ScriptsPython.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/exa
 $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsPython,$(LIBO_SHARE_FOLDER)/Scripts,\
 	python/Capitalise.py \
 	python/HelloWorld.py \
+	python/NamedRanges.py \
 	python/SetCellColor.py \
 	python/pythonSamples/TableSample.py \
 ))
commit 43f115312c8ed59292b2c47bcd0cef74681521c4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jan 12 15:50:05 2018 +0200

    Fix class name in debug message
    
    Change-Id: I171e74a34273ddf969e49260fec487dd8cf2fb12
    Reviewed-on: https://gerrit.libreoffice.org/51981
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 8329f4541e27402d19729ae1588af8bfe61f7b49)
    Reviewed-on: https://gerrit.libreoffice.org/52093
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-on: https://gerrit.libreoffice.org/52316

diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
index e97784ce7025..ef131b3c1dab 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -859,7 +859,7 @@ class PackageBrowseNode( unohelper.Base, XBrowseNode ):
         return CONTAINER
 
     def getScript( self, uri ):
-        log.debug( "DirBrowseNode getScript " + uri + " invoked" )
+        log.debug( "PackageBrowseNode getScript " + uri + " invoked" )
         raise IllegalArgumentException( "PackageBrowseNode couldn't instantiate script " + uri , self , 0 )
 
 


More information about the Libreoffice-commits mailing list