[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source

[László Németh (via logerrit)]

 sw/source/filter/ww8/wrtw8nds.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 024a39100f7d19505886c4dafd9fba4948b86b52
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Tue Nov 10 17:16:59 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Nov 11 14:28:37 2020 +0100

    DOCX: fix memory leak of cell formula export
    
    clean-up of commit cf596c43315bb96b5e7256a82256f1ccb8c9c4d0
    (tdf#133163 DOCX: export formula cell).
    
    The problem was reported by Miklós Vajna.
    
    (cherry picked from commit b0b5812bc6b74369c7909313fcb7fd86c535aea3)
    
    Conflicts:
            sw/source/filter/ww8/wrtw8nds.cxx
    
    Change-Id: Ia636a6ffe8386e58e31e37c0d8afc283e6f2fc4d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105580
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 2f6ff3c14cef..2d31a2f52aed 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2255,7 +2255,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
             if ( pBox->IsFormulaOrValueBox() == RES_BOXATR_FORMULA &&
                  GetExportFormat() == MSWordExportBase::ExportFormat::DOCX )
             {
-                auto pFormula = static_cast<SwTableBoxFormula*>(pBox->GetFrameFormat()->GetTableBoxFormula().Clone());
+                std::unique_ptr<SwTableBoxFormula> pFormula(static_cast<SwTableBoxFormula*>(pBox->GetFrameFormat()->GetTableBoxFormula().Clone()));
                 pFormula->PtrToBoxNm( &pTableNode->GetTable() );
                 OutputField( nullptr, ww::eEquals, " = " + pFormula->GetFormula(),
                     FieldFlags::Start | FieldFlags::CmdStart | FieldFlags::CmdEnd | FieldFlags::Close );