diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-10-20 10:49:24 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-10-20 12:48:43 +0200 |
| commit | f0006e79c4112b06b65c098722729b9a3f3301c7 (patch) | |
| tree | ac7dcac47f7c8da208484f91c55a1abc11b742be /svx | |
| parent | 168463ed0537a5a9737aa5226657af1e263d0036 (diff) | |
Handle link click directly in FixedHyperlink
Change-Id: I5b5f0648b6e6432b0928351a17d285df8c9da811
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/SafeModeDialog.cxx | 31 | ||||
| -rw-r--r-- | svx/source/dialog/SafeModeDialog.hxx | 1 |
2 files changed, 0 insertions, 32 deletions
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index b0f6ebeb2bbb..ef97afb9b833 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -67,8 +67,6 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) mpCBResetCustomizations->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); mpCBResetWholeUserProfile->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); - mpBugLink->SetClickHdl(LINK(this, SafeModeDialog, HandleHyperlink)); - // Disable restart btn until some checkbox is active mpBtnRestart->Disable(); @@ -167,30 +165,6 @@ void SafeModeDialog::applyChanges() css::uno::Reference< css::task::XInteractionHandler >()); } -void SafeModeDialog::openWebBrowser(const OUString & sURL, const OUString &sTitle) -{ - if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty - return; - - try - { - uno::Reference< system::XSystemShellExecute > xSystemShellExecute( - system::SystemShellExecute::create(comphelper::getProcessComponentContext())); - //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException - xSystemShellExecute->execute( sURL, OUString(), system::SystemShellExecuteFlags::URIS_ONLY ); - } - catch ( const uno::Exception& ) - { - uno::Any exc(cppu::getCaughtException()); - OUString msg(comphelper::anyToString(exc)); - const SolarMutexGuard guard; - ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, msg); - aErrorBox->SetText( sTitle ); - aErrorBox->Execute(); - } -} - - IMPL_LINK(SafeModeDialog, BtnHdl, Button*, pBtn, void) { if (pBtn == mpBtnContinue.get()) @@ -221,9 +195,4 @@ IMPL_LINK(SafeModeDialog, CheckBoxHdl, CheckBox&, /*pCheckBox*/, void) mpBtnRestart->Enable(bEnable); } -IMPL_LINK( SafeModeDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void ) -{ - SafeModeDialog::openWebBrowser( rHyperlink.GetURL(), GetText() ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/SafeModeDialog.hxx b/svx/source/dialog/SafeModeDialog.hxx index 815cb1190a48..f385fc44faaa 100644 --- a/svx/source/dialog/SafeModeDialog.hxx +++ b/svx/source/dialog/SafeModeDialog.hxx @@ -52,7 +52,6 @@ private: DECL_LINK(CheckBoxHdl, CheckBox&, void); DECL_LINK(BtnHdl, Button*, void); - DECL_LINK(HandleHyperlink, FixedHyperlink&, void); }; #endif |