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 /cui | |
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 'cui')
-rw-r--r-- | cui/source/dialogs/SignSignatureLineDialog.cxx | 1 | ||||
-rw-r--r-- | cui/source/options/optinet2.cxx | 3 | ||||
-rw-r--r-- | cui/source/options/optinet2.hxx | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx index 009ae54e055d..12c6590934fb 100644 --- a/cui/source/dialogs/SignSignatureLineDialog.cxx +++ b/cui/source/dialogs/SignSignatureLineDialog.cxx @@ -175,6 +175,7 @@ IMPL_LINK_NOARG(SignSignatureLineDialog, chooseCertificate, weld::Button&, void) Reference<XDocumentDigitalSignatures> xSigner(DocumentDigitalSignatures::createWithVersion( comphelper::getProcessComponentContext(), "1.2")); + xSigner->setParentWindow(m_xDialog->GetXWindow()); OUString aDescription; CertificateKind certificateKind = CertificateKind_NONE; // When signing ooxml, we only want X.509 certificates diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index bee5e2d64d14..e090744d5f90 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -816,12 +816,13 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void) aTSAURLsDlg.run(); } -IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl, Button*, void) { try { Reference< security::XDocumentDigitalSignatures > xD( security::DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext() ) ); + xD->setParentWindow(VCLUnoHelper::GetInterface(GetTabDialog())); xD->manageTrustedSources(); } catch (const Exception& e) diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index a5334c157052..dc19ed9466a5 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -138,7 +138,7 @@ private: DECL_LINK(MasterPasswordHdl, Button*, void); DECL_LINK(MasterPasswordCBHdl, Button*, void); DECL_LINK(ShowPasswordsHdl, Button*, void); - DECL_STATIC_LINK(SvxSecurityTabPage, MacroSecPBHdl, Button*, void ); + DECL_LINK(MacroSecPBHdl, Button*, void ); DECL_LINK(CertPathPBHdl, Button*, void ); DECL_LINK(TSAURLsPBHdl, Button*, void ); |