scripting/source/pyprov/pythonscript.py | 5 +++++ sfx2/uiconfig/ui/loadtemplatedialog.ui | 1 + 2 files changed, 6 insertions(+)
New commits: commit 830a499e5b0ff9732202a927d6956609270550cb Author: Caolán McNamara <[email protected]> AuthorDate: Fri Aug 16 10:18:34 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Aug 29 09:20:22 2019 +0200 an absolute uri is invalid input Change-Id: I392be4282be8ed67e3451b28d2c9f22acd4c87fc Reviewed-on: https://gerrit.libreoffice.org/77564 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Stephan Bergmann <[email protected]> (cherry picked from commit 3c076e54f736980e208f5c27ecf179aa90aea103) Reviewed-on: https://gerrit.libreoffice.org/77572 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/77918 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py index 64e1337d642e..d2705d45133b 100644 --- a/scripting/source/pyprov/pythonscript.py +++ b/scripting/source/pyprov/pythonscript.py @@ -231,6 +231,11 @@ class MyUriHelper: log.debug( message ) raise RuntimeException( message ) + if xFileUri.isAbsolute(): + message = "pythonscript: an absolute uri is invalid '" + sFileUri+ "'" + log.debug( message ) + raise RuntimeException( message ) + # absolute path to the .py file xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, True, RETAIN) sAbsScriptUri = xAbsScriptUri.getUriReference() commit 6d54ae6b6a0947ed9961fe88bc3d1d5f09633505 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Aug 15 13:17:43 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Aug 29 09:20:12 2019 +0200 Resolves: tdf#126943 load styles should be modal Change-Id: I7526cd974d3c3ac47f29fda95af226d42d63f583 Reviewed-on: https://gerrit.libreoffice.org/77518 Tested-by: Jenkins Reviewed-by: Xisco Faulí <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/77917 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sfx2/uiconfig/ui/loadtemplatedialog.ui b/sfx2/uiconfig/ui/loadtemplatedialog.ui index 5c3fecf13ac0..29ee17a09d54 100644 --- a/sfx2/uiconfig/ui/loadtemplatedialog.ui +++ b/sfx2/uiconfig/ui/loadtemplatedialog.ui @@ -22,6 +22,7 @@ <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes" context="loadtemplatedialog|LoadTemplateDialog">New</property> + <property name="modal">True</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
