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 /extensions | |
| parent | fdo#46955 fix RTF import of all capitals char prop (diff) | |
| download | core-4f1f9c6e6e6b07515bb601d7acbdb4705e266366.tar.gz core-4f1f9c6e6e6b07515bb601d7acbdb4705e266366.zip | |
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 'extensions')
| -rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index c88ea8206190..6485a7702035 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -1512,7 +1512,7 @@ UpdateCheck::showReleaseNote(const rtl::OUString& rURL) const try { if( xShellExecute.is() ) - xShellExecute->execute(rURL, rtl::OUString(), c3s::SystemShellExecuteFlags::DEFAULTS); + xShellExecute->execute(rURL, rtl::OUString(), c3s::SystemShellExecuteFlags::URIS_ONLY); } catch(c3s::SystemShellExecuteException&) { } } |