scripting/source/protocolhandler/scripthandler.cxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 825ba822a9d445e81ff8b05aac69949cad40182b
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Jan 12 14:16:51 2018 +0200
Filter out "SynchronMode" too
Change-Id: I2c5111ee34929b9740796f5e1f08b3a8a58218e4
Reviewed-on: https://gerrit.libreoffice.org/51964
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit 2147cbf6204ebca8fb5a306ad5d81215b1175ac2)
Reviewed-on: https://gerrit.libreoffice.org/52089
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/scripting/source/protocolhandler/scripthandler.cxx
b/scripting/source/protocolhandler/scripthandler.cxx
index 2315fc1963fa..3f17347aa9ca 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -200,10 +200,12 @@ void SAL_CALL
ScriptProtocolHandler::dispatchWithNotification(
int argCount = 0;
for ( int index = 0; index < lArgs.getLength(); index++ )
{
- // Sometimes we get a propertyval with name = "Referer"
- // this is not an argument to be passed to script, so
- // ignore.
- if ( lArgs[ index ].Name != "Referer" ||
+ // Sometimes we get a propertyval with name = "Referer" or
"SynchronMode". These
+ // are not actual arguments to be passed to script, but
flags describing the
+ // call, so ignore. Who thought that passing such
"meta-arguments" mixed in with
+ // real arguments was a good idea?
+ if ( (lArgs[ index ].Name != "Referer" &&
+ lArgs[ index ].Name != "SynchronMode") ||
lArgs[ index ].Name.isEmpty() ) //TODO:???
{
inArgs.realloc( ++argCount );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
