[Libreoffice-commits] core.git: sc/source sw/source

[Libreoffice Gerrit user]

 sc/source/ui/view/tabvwshb.cxx       |    4 ++--
 sw/source/uibase/uiview/viewdlg2.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6de194cb685dbe105a73812afa73070d04341bfb
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Jul 24 13:05:26 2018 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue Jul 24 15:06:07 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.
    
    Change-Id: I09a1b37b917b267a84ee95fb375658974ee1b320
    Reviewed-on: https://gerrit.libreoffice.org/57913
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 4e5fb7b98869..5fc41502f1ea 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -362,8 +362,8 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
                     GetViewData().GetDocShell()->GetBaseModel());
 
                 VclAbstractDialogFactory* pFact = VclAbstractDialogFactory::Create();
-                VclPtr<AbstractSignSignatureLineDialog> pDialog
-                    = pFact->CreateSignSignatureLineDialog(GetFrameWeld(), xModel);
+                ScopedVclPtr<AbstractSignSignatureLineDialog> pDialog(
+                    pFact->CreateSignSignatureLineDialog(GetFrameWeld(), xModel));
                 pDialog->Execute();
                 break;
             }
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index e88a14128519..6308b552a1ae 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -71,8 +71,8 @@ void SwView::ExecDlgExt(SfxRequest const &rReq)
         {
             VclAbstractDialogFactory* pFact = VclAbstractDialogFactory::Create();
             const uno::Reference<frame::XModel> xModel(GetCurrentDocument());
-            VclPtr<AbstractSignSignatureLineDialog> pDialog
-                = pFact->CreateSignSignatureLineDialog(GetFrameWeld(), xModel);
+            ScopedVclPtr<AbstractSignSignatureLineDialog> pDialog(
+                pFact->CreateSignSignatureLineDialog(GetFrameWeld(), xModel));
             pDialog->Execute();
             break;
         }