diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2022-01-14 21:01:34 +0100 |
---|---|---|
committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-01-18 23:21:06 +0100 |
commit | c6620b4e538d21c1dfa321dde31b568eb8b8bd32 (patch) | |
tree | 809df99b7725ce779be3aa6b8d74e168783362e7 /cui/source/dialogs/cuihyperdlg.cxx | |
parent | 5fc43fe24c24c58e401707fa6fffe9250186b99c (diff) |
tdf#146612 Drop confirmation question when applying new doc hyperlink
To be consistent with other tabs of the dialog where Apply does
not show a similar question
Change-Id: Id3bced8ec861b7166974da5ad223513dbfec25c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128424
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'cui/source/dialogs/cuihyperdlg.cxx')
-rw-r--r-- | cui/source/dialogs/cuihyperdlg.cxx | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 3eef90cdf696..20c1b1e26f85 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -182,32 +182,27 @@ void SvxHpLinkDlg::Close() pViewFrame->ToggleChildWindow(SID_HYPERLINK_DIALOG); } -void SvxHpLinkDlg::Apply( bool bWarn ) +void SvxHpLinkDlg::Apply() { SfxItemSetFixed<SID_HYPERLINK_GETLINK, SID_HYPERLINK_SETLINK> aItemSet( SfxGetpApp()->GetPool() ); SvxHyperlinkTabPageBase* pCurrentPage = static_cast<SvxHyperlinkTabPageBase*>( GetTabPage( GetCurPageId() ) ); - // tdf#109390: only show warning that the dialog was not filled properly - // if the user pressed Apply - if ( pCurrentPage->AskApply( bWarn ) ) - { - pCurrentPage->FillItemSet( &aItemSet ); + pCurrentPage->FillItemSet( &aItemSet ); - const SvxHyperlinkItem *aItem = aItemSet.GetItem(SID_HYPERLINK_SETLINK); - if ( !aItem->GetURL().isEmpty() ) - GetDispatcher()->ExecuteList(SID_HYPERLINK_SETLINK, - SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { aItem }); + const SvxHyperlinkItem *aItem = aItemSet.GetItem(SID_HYPERLINK_SETLINK); + if ( !aItem->GetURL().isEmpty() ) + GetDispatcher()->ExecuteList(SID_HYPERLINK_SETLINK, + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { aItem }); - static_cast<SvxHyperlinkTabPageBase*>( GetTabPage( GetCurPageId() ) )->DoApply(); - } + static_cast<SvxHyperlinkTabPageBase*>( GetTabPage( GetCurPageId() ) )->DoApply(); } /// Click on OK button IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl, weld::Button&, void) { - Apply( false ); + Apply(); m_xDialog->response(RET_OK); } @@ -218,7 +213,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl, weld::Button&, void) |************************************************************************/ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl, weld::Button&, void) { - Apply( true ); + Apply(); } /************************************************************************* |