[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

 sw/source/uibase/uiview/viewdlg2.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 84a0cdf166ea9ab5073b085193d0f10958897437
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Jul 24 13:05:26 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 24 17:31:38 2018 +0200

    sw,sc: Signature Line: fix VclPtr assertion
    
    Insert a Signature Line, right click, Sign..., Cancel
    
    include/vcl/vclptr.hxx:116: VclPtr<T>::~VclPtr() [with reference_type = AbstractSignSignatureLineDialog]: Assertion `(!m_rInnerRef.get() || m_rInnerRef->isDisposed() || m_rInnerRef->getRefCount() > 1) && "someone forgot to call dispose()"' failed.
    
    Reviewed-on: https://gerrit.libreoffice.org/57913
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 6de194cb685dbe105a73812afa73070d04341bfb)
    (The sc part is missing in libreoffice-6-1 so only fix sw)
    
    Change-Id: I09a1b37b917b267a84ee95fb375658974ee1b320
    Reviewed-on: https://gerrit.libreoffice.org/57924
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index 41bec30c8023..3e5174475249 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -84,8 +84,8 @@ void SwView::ExecDlgExt(SfxRequest const &rReq)
             assert(pFact && "VclAbstractDialogFactory fail!");
 
             const uno::Reference<frame::XModel> xModel(GetCurrentDocument());
-            VclPtr<AbstractSignSignatureLineDialog> pDialog
-                = pFact->CreateSignSignatureLineDialog(GetFrameWeld(), xModel);
+            ScopedVclPtr<AbstractSignSignatureLineDialog> pDialog(
+                pFact->CreateSignSignatureLineDialog(GetFrameWeld(), xModel));
             assert(pDialog && "Dialog creation failed!");
 
             if (pDialog)