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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 58e06eda8ace..90c25442f3ae 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -634,7 +634,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle uno::Reference< XSystemShellExecute > xSystemShellExecute( m_xContext->getServiceManager()->createInstanceWithContext( OUSTR( "com.sun.star.system.SystemShellExecute" ), m_xContext), uno::UNO_QUERY_THROW); //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException - xSystemShellExecute->execute( sURL, OUString(), SystemShellExecuteFlags::DEFAULTS ); + xSystemShellExecute->execute( sURL, OUString(), SystemShellExecuteFlags::URIS_ONLY ); } catch ( const uno::Exception& ) { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index b8dabbb63493..841db303ee11 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -1425,7 +1425,7 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, svt::FixedHyperlink*, pHyperlink ) m_context), uno::UNO_QUERY_THROW); //throws lang::IllegalArgumentException, system::SystemShellExecuteException xSystemShellExecute->execute( - sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS); + sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); } catch ( const uno::Exception& ) { |