summaryrefslogtreecommitdiff
path: root/xmlsecurity/source/component
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-02-13 12:51:28 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-02-14 14:21:40 +0100
commitbb9481a489cc21b0695c9a7c3e9d4ffe1446f8a9 (patch)
tree7f0e19b0a38cba49ceae3d8d42ae066f5ce1c497 /xmlsecurity/source/component
parent3157a3a8332ad342fb2b44659123217fa3450168 (diff)
weld DigitalSignaturesDialog
Change-Id: I197f4805558b07aeb9e66734d0fb5c250c41ad3e Reviewed-on: https://gerrit.libreoffice.org/67796 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'xmlsecurity/source/component')
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 2eeb6d9d13d8..4076af53bd86 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -398,19 +398,19 @@ bool DocumentDigitalSignatures::ImplViewSignatures(
DocumentSignatureMode eMode, bool bReadOnly )
{
bool bChanges = false;
- ScopedVclPtrInstance<DigitalSignaturesDialog> aSignaturesDialog(
- nullptr, mxCtx, eMode, bReadOnly, m_sODFVersion,
+ DigitalSignaturesDialog aSignaturesDialog(
+ Application::GetFrameWeld(mxParentWindow), mxCtx, eMode, bReadOnly, m_sODFVersion,
m_bHasDocumentSignature);
- bool bInit = aSignaturesDialog->Init();
+ bool bInit = aSignaturesDialog.Init();
SAL_WARN_IF( !bInit, "xmlsecurity.comp", "Error initializing security context!" );
if ( bInit )
{
- aSignaturesDialog->SetStorage(rxStorage);
+ aSignaturesDialog.SetStorage(rxStorage);
- aSignaturesDialog->SetSignatureStream( xSignStream );
- if ( aSignaturesDialog->Execute() )
+ aSignaturesDialog.SetSignatureStream( xSignStream );
+ if (aSignaturesDialog.run() == RET_OK)
{
- if ( aSignaturesDialog->SignaturesChanged() )
+ if (aSignaturesDialog.SignaturesChanged())
{
bChanges = true;
// If we have a storage and no stream, we are responsible for commit