[Libreoffice-commits] core.git: sd/source

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Thu Sep 12 19:58:22 UTC 2019


 sd/source/ui/view/drviews3.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9463ee0a105e13f1f5f6c71fac3549abe5aa79d0
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Sep 12 20:15:53 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Sep 12 21:57:34 2019 +0200

    sd edit diagram: dispose the diagram dialog after we don't need it
    
    Fixes:
    
    soffice.bin: /home/vmiklos/git/libreoffice/master/include/vcl/vclptr.hxx:110: VclPtr<reference_type>::~VclPtr() [with reference_type = VclAbstractDialog]: Assertion `(!m_rInnerRef.get() || m_rInnerRef->isDisposed() || m_rInnerRef->getRefCount() > 1) && "someone forgot to call dispose()"' failed.
    
    Change-Id: I4ac6a2e874f816f29ab593e3cbc87f3ddebb8109
    Reviewed-on: https://gerrit.libreoffice.org/78840
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 5664219e83ca..c5e1450f70e2 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -510,7 +510,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                 if (oox::drawingml::DrawingML::IsDiagram(xShape))
                 {
                     VclAbstractDialogFactory* pFact = VclAbstractDialogFactory::Create();
-                    VclPtr<VclAbstractDialog> pDlg
+                    ScopedVclPtr<VclAbstractDialog> pDlg
                         = pFact->CreateDiagramDialog(GetFrameWeld(), pObj->GetDiagramData());
                     pDlg->Execute();
                 }


More information about the Libreoffice-commits mailing list