diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-02-13 10:32:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-02-14 09:57:40 +0100 |
| commit | a9a59d53783dd773fd4853266a1d98fab9912922 (patch) | |
| tree | d2da900f20f12988f7587b8cfa9e9442dc398940 /uui | |
| parent | f871e8f5b34aa43db7958cbed9edecf618c9afa0 (diff) | |
[API CHANGE] add setParentWindow to XDocumentDigitalSignatures
so we can specify which window modal dialogs are modal to
Change-Id: I7cd7348b5cd0f55d698553f313f745d5e0d6389d
Reviewed-on: https://gerrit.libreoffice.org/67765
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/secmacrowarnings.cxx | 2 | ||||
| -rw-r--r-- | uui/source/sslwarndlg.cxx | 4 | ||||
| -rw-r--r-- | uui/source/unknownauthdlg.cxx | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 4e8119c09648..af913b303172 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -94,6 +94,7 @@ IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl, weld::Button&, void) security::DocumentDigitalSignatures::createWithVersion(comphelper::getProcessComponentContext(), maODFVersion)); if( xD.is() ) { + xD->setParentWindow(m_xDialog->GetXWindow()); if( mxCert.is() ) xD->showCertificate( mxCert ); else if( mxStore.is() ) @@ -107,6 +108,7 @@ IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl, weld::Button&, void) { // insert path into trusted path list uno::Reference< security::XDocumentDigitalSignatures > xD( security::DocumentDigitalSignatures::createWithVersion(comphelper::getProcessComponentContext(), maODFVersion)); + xD->setParentWindow(m_xDialog->GetXWindow()); if( mxCert.is() ) xD->addAuthorToTrustedSources( mxCert ); else if( mxStore.is() ) diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index 9ff629e5b345..a1c340cc0afe 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -31,8 +31,8 @@ IMPL_LINK_NOARG(SSLWarnDialog, ViewCertHdl, weld::Button&, void) uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; xDocumentDigitalSignatures = css::security::DocumentDigitalSignatures::createDefault( m_xContext ); - - xDocumentDigitalSignatures.get()->showCertificate(m_rXCert); + xDocumentDigitalSignatures->setParentWindow(m_xDialog->GetXWindow()); + xDocumentDigitalSignatures->showCertificate(m_rXCert); } SSLWarnDialog::SSLWarnDialog(weld::Window* pParent, diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 3d92b74455ae..f6e4eb3f7b4d 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -43,8 +43,8 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl, weld::Button&, void) { uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures( css::security::DocumentDigitalSignatures::createDefault(m_xContext) ); - - xDocumentDigitalSignatures.get()->showCertificate(m_rXCert); + xDocumentDigitalSignatures->setParentWindow(m_xDialog->GetXWindow()); + xDocumentDigitalSignatures->showCertificate(m_rXCert); } UnknownAuthDialog::UnknownAuthDialog(weld::Window* pParent, |