scripting/source/protocolhandler/scripthandler.cxx | 2 +-
scripting/source/pyprov/pythonscript.py | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 56b8f9af4c0b3954708db574001c593ded70dbab
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Jan 12 15:27:01 2018 +0200
Bin some dead code
We defined the same function member in the class PythonScriptProvider
twice. The first one was some accidental leftover surely.
Change-Id: I10eebab7084af790a9263176f01f7817fa5124ff
Reviewed-on: https://gerrit.libreoffice.org/51965
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit e25b905106598578449d5b2864654d0f58c3147f)
Reviewed-on: https://gerrit.libreoffice.org/52088
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/52311
diff --git a/scripting/source/pyprov/pythonscript.py
b/scripting/source/pyprov/pythonscript.py
index 4803d0bebc23..e97784ce7025 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -980,11 +980,6 @@ class PythonScriptProvider( unohelper.Base, XBrowseNode,
XScriptProvider, XNameC
def getType( self ):
return self.dirBrowseNode.getType()
- def getScript( self, uri ):
- log.debug( "DirBrowseNode getScript " + uri + " invoked" )
-
- raise IllegalArgumentException( "DirBrowseNode couldn't instantiate
script " + uri , self , 0 )
-
def getScript( self, scriptUri ):
try:
log.debug( "getScript " + scriptUri + " invoked")
commit 60dbde6a1d93fdf450fe61fb67e382531128aa1d
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Jan 12 13:34:26 2018 +0200
Add a separator between two words in an exception message
Change-Id: I5c2e01249058e03edfcf036036f9595b87f0a070
Reviewed-on: https://gerrit.libreoffice.org/51963
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit 7e16966d517f1c25e673ddbb88e72cf418f5aeaa)
Reviewed-on: https://gerrit.libreoffice.org/52087
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/52310
diff --git a/scripting/source/protocolhandler/scripthandler.cxx
b/scripting/source/protocolhandler/scripthandler.cxx
index 150ffa052509..cf125b3ac84d 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -240,7 +240,7 @@ void SAL_CALL
ScriptProtocolHandler::dispatchWithNotification(
OUString reason = "ScriptProtocolHandler::dispatch: caught ";
- invokeResult <<= reason.concat( aException.getValueTypeName()
).concat( e.Message );
+ invokeResult <<= reason.concat( aException.getValueTypeName()
).concat( ": " ).concat( e.Message );
bCaughtException = true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
