summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-03-27 13:56:12 +0200
committerMichael Meeks <michael.meeks@suse.com>2012-04-03 13:49:36 +0100
commit4f1f9c6e6e6b07515bb601d7acbdb4705e266366 (patch)
tree71fd6df4ea2b04b1a7dc94592e3f2d501d4533d5 /toolkit
parent05fde8006966df49221871fe3489aba8c2ca8e3f (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 'toolkit')
-rw-r--r--toolkit/source/awt/vclxwindows.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 2669f0f21dce..c8c9edf801c4 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2979,7 +2979,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
{
// start browser
xSystemShellExecute->execute(
- sURL, ::rtl::OUString(), ::com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
+ sURL, ::rtl::OUString(), ::com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
}
catch( uno::Exception& )
{