diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-26 10:21:41 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-03 09:47:42 +0000 |
| commit | 0b21f434b45c350cd9cc5b820226245d6824bf86 (patch) | |
| tree | 2db24f59783e6a91bee55fb2cd75421836f6dd60 /xmlsecurity | |
| parent | c4c30cfac570aeb0f8ac91b36b986e438e2811bc (diff) | |
masses of MessBoxes not being disposed promptly
since...
commit ba81e5c6bd420b41a84ade6ccd774011a8089f7f
Date: Thu May 28 21:35:43 2015 +0100
tdf#91702 - fix stack-based MessBox allocation.
There is no special ScopedVclPtr<X>::Create or
ScopedVclPtrInstance<X>::Create just
VclPtr<X>::Create and a raw VclPtr<X>::Create()->foo
doesn't call dispose on the owned X
(cherry picked from commit a860df25dd7bf62ecb6b3d3ed38803b981f56d52)
Change-Id: Ifacc8d5e742820701307c3c37b9b86487667d84f
Reviewed-on: https://gerrit.libreoffice.org/27537
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/workben/signaturetest.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index f79296fb5d32..d09f99b0b547 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -277,7 +277,7 @@ bool DigitalSignaturesDialog::canAddRemove() //It the user presses 'Add' or 'Remove' several times then, then the warning //is shown every time until the user presses 'OK'. From then on, the warning //is not displayed anymore as long as the signatures dialog is alive. - if (ScopedVclPtr<MessageDialog>::Create( + if (ScopedVclPtrInstance<MessageDialog>( nullptr, XMLSEC_RES(STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO)->Execute() == RET_NO) ret = false; else diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index d9987108c60d..5ced7d40d20b 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -294,7 +294,7 @@ IMPL_LINK_NOARG_TYPED(MyWin, VerifyDigitalSignaturesHdl, Button*, void) if ( !rInf.SignatureIsValid ) aText.append( "NOT " ); aText.append( "valid" ); - ScopedVclPtr<InfoBox>::Create( this, aText )->Execute(); + ScopedVclPtrInstance<InfoBox>(this, aText)->Execute(); } } |