cui/source/options/optgdlg.cxx | 2 +- cui/source/options/optinet2.cxx | 2 +- filter/source/pdf/impdialog.cxx | 14 ++++---------- 3 files changed, 6 insertions(+), 12 deletions(-)
New commits: commit 8684de9aae185ff340adc63ec8f1e5207e6e8cec Author: Caolán McNamara <[email protected]> AuthorDate: Mon Sep 23 19:43:36 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Sep 24 10:04:35 2019 +0200 enable/disable page toplevel container instead of the vcl TabPage that contains it Change-Id: I1d1da894afce4cf6d8fc109a77fd809e993de454 Reviewed-on: https://gerrit.libreoffice.org/79424 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index b2e864674705..deb1503f8743 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1220,7 +1220,7 @@ void ImpPDFTabSecurityPage::enablePermissionControls() } else { - if (mbHaveUserPassword && IsEnabled()) + if (mbHaveUserPassword && m_xContainer->get_sensitive()) { mxUserPwdSet->show(); mxUserPwdUnset->hide(); @@ -1234,7 +1234,7 @@ void ImpPDFTabSecurityPage::enablePermissionControls() } } - bool bLocalEnable = mbHaveOwnerPassword && IsEnabled(); + bool bLocalEnable = mbHaveOwnerPassword && m_xContainer->get_sensitive(); if (bIsPDFASel) { mxOwnerPwdPdfa->show(); @@ -1264,16 +1264,10 @@ void ImpPDFTabSecurityPage::enablePermissionControls() // This tab page is under control of the PDF/A-1a checkbox: // TODO: implement a method to do it. -void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity ) +void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity ) { - if( bEnableSecurity ) - { - Enable(); + m_xContainer->set_sensitive(bEnableSecurity); // after enable, check the status of control as if the dialog was initialized - } - else - Enable( false ); - enablePermissionControls(); } commit 0bd2ebaa039633659d0aab816d72306cc9660872 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Sep 23 20:10:11 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Sep 24 10:04:17 2019 +0200 options dialog has a controller now Change-Id: I34b486ba54c361401327dbe8fcee007da4ca72c1 Reviewed-on: https://gerrit.libreoffice.org/79426 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 657bd23ffb66..ff1e2a7bf245 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -912,7 +912,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) if( svtools::executeRestartDialog( comphelper::getProcessComponentContext(), nullptr, svtools::RESTART_REASON_OPENGL)) - GetParentDialog()->EndDialog(RET_OK); + GetDialogController()->response(RET_OK); } return bModified; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 10c6fd9b8c7e..36cb6917599b 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -705,7 +705,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl, weld::Button&, void) { SolarMutexGuard aGuard; if (svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, svtools::RESTART_REASON_ADDING_PATH)) - GetParentDialog()->EndDialog(RET_OK); + GetDialogController()->response(RET_OK); } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
