diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-27 13:56:12 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-04-03 13:49:36 +0100 |
| commit | 4f1f9c6e6e6b07515bb601d7acbdb4705e266366 (patch) | |
| tree | 71fd6df4ea2b04b1a7dc94592e3f2d501d4533d5 /offapi | |
| parent | 05fde8006966df49221871fe3489aba8c2ca8e3f (diff) | |
Introduced SystemShellExecuteFlags::URIS_ONLY
(cherry-picked from commit d4b67611c421ebe9b75284106fe389b434419961)
Conflicts:
extensions/source/update/check/updatecheck.cxx
filter/source/xsltdialog/xmlfiltertestdialog.cxx
sfx2/source/view/viewsh.cxx
shell/source/unix/exec/shellexec.cxx
Replaced master's new MSG_ERR_NO_ABS_URI_REF with re-using
RID_SECURITY_WARNING_NO_HYPERLINKS, to avoid introducing new resources
into the LO 3.5 series that require localization.
New css.system.SystemShellExecuteFlags.URIS_ONLY remains @since
LibreOffice 3.6. Officially, new features are only added when bumping
the minor revision number, not the micro one (but backporting does not
hurt here).
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
Diffstat (limited to 'offapi')
| -rw-r--r-- | offapi/com/sun/star/system/SystemShellExecuteFlags.idl | 6 | ||||
| -rw-r--r-- | offapi/com/sun/star/system/XSystemShellExecute.idl | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/offapi/com/sun/star/system/SystemShellExecuteFlags.idl b/offapi/com/sun/star/system/SystemShellExecuteFlags.idl index cd93fa1cdb5b..58950cb19668 100644 --- a/offapi/com/sun/star/system/SystemShellExecuteFlags.idl +++ b/offapi/com/sun/star/system/SystemShellExecuteFlags.idl @@ -47,6 +47,12 @@ published constants SystemShellExecuteFlags method <member scope="com::sun::star::system">XSystemShellExecute::execute()</member> fails. */ const long NO_SYSTEM_ERROR_MESSAGE = 1; + + /** Only allows opening of absolute URI references. + + @since LibreOffice 3.6 + */ + const long URIS_ONLY = 2; }; //============================================================================= diff --git a/offapi/com/sun/star/system/XSystemShellExecute.idl b/offapi/com/sun/star/system/XSystemShellExecute.idl index 4440b045cba4..4813fb42fdf0 100644 --- a/offapi/com/sun/star/system/XSystemShellExecute.idl +++ b/offapi/com/sun/star/system/XSystemShellExecute.idl @@ -64,8 +64,10 @@ published interface XSystemShellExecute: com::sun::star::uno::XInterface avoid showing system error messages, in case of failures, etc. @throws com::sun::star::lang::IllegalArgumentException - when the specified flags are wrong or exclude each other. -. + when the specified flags are wrong or exclude each other; also thrown, + with an ArgumentPosition of 0, when nFlags contains URIS_ONLY and + aCommand is not an absolute URI reference + @throws com::sun::star::sys::SystemExecuteException in the case of errors when trying to executed the specified command. |