[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - svtools/source

[Ilhan Yesil (via logerrit)]

 svtools/source/control/roadmap.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit e73aee0475a78b285078faa849a972969b01767d
Author:     Ilhan Yesil <ilhanyesil at gmx.de>
AuthorDate: Wed Jun 10 10:01:00 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Jun 25 00:31:54 2020 +0200

    tdf#133859 Wizard service: reinitialize data of roadmap
    
    Cherry-picked only part from master due to different class
    architecture in master..
    
    In libreoffice versions before 6.4, an ORoadmap class was used in the
    wizard. There, if the ORoadmap data are reinitialized, the
    InCompleteHyperLabel object must be destroyed first, before it will
    be set to nullptr.
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95969
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 54a3daec02f2eeada04efcd7958da4152db4611a)
    
    Change-Id: I5b4b2e6b3666b58acccace385c622f0a065fc368
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96925
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index e9c3bf9e302b..e1e89389807f 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -203,6 +203,7 @@ ORoadmap::ORoadmap(vcl::Window* _pParent, WinBits _nWinStyle)
 
 void ORoadmap::implInit(vcl::RenderContext& rRenderContext)
 {
+    delete m_pImpl->InCompleteHyperLabel;
     m_pImpl->InCompleteHyperLabel = nullptr;
     m_pImpl->setCurItemID(-1);
     m_pImpl->setComplete(true);