[Libreoffice-commits] core.git: 2 commits - canvas/source leak-suppress.txt

[Noel Grandin (via logerrit)]

 canvas/source/tools/canvastools.cxx |    2 +-
 leak-suppress.txt                   |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ca21e8618f446733ab5d046178ebb47c2d204840
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu May 7 15:44:10 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu May 7 19:28:07 2020 +0200

    ignore leaks in idlc
    
    which seems to be leaking deliberately and we don't really care
    about leaks in this tool
    
    Change-Id: I6b6630fb64f905037efc043ea81c5cdc5a3207a0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93644
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/leak-suppress.txt b/leak-suppress.txt
index 6f00829c78ca..e3700295304d 100644
--- a/leak-suppress.txt
+++ b/leak-suppress.txt
@@ -51,3 +51,6 @@ leak:_PyMem_RawMalloc
 
 # ignore leak in gpgmepp external library
 leak:mkdefsinc
+
+# idlc deliberately leaks
+leak:idlc/source/idlcmain.cxx
commit 4c016865f9ea78813d5cde84a4d214b34f2f1dd9
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu May 7 15:40:15 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu May 7 19:27:58 2020 +0200

    fix bug in extracting property
    
    introduced with
        commit 17cd7dd708631f7af9e66860b403627416e4545e
        tdf#43671 set emphasis mark of vcl::Font (windows).
    but has probably never been a problem because I guess this
    propertyset almost always has 0 or 1 element.
    
    Change-Id: I17c64e376ee81cc9f92173015d2632331c63ae0e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93643
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 54e93fcb3625..2ca1b5081724 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -1317,7 +1317,7 @@ namespace canvas::tools
             for(sal_Int32 nIdx = 0; nIdx < rExtraFontProperties.getLength(); ++nIdx)
             {
                 if (rExtraFontProperties[nIdx].Name == "EmphasisMark")
-                    rExtraFontProperties[0].Value >>= rEmphasisMark;
+                    rExtraFontProperties[nIdx].Value >>= rEmphasisMark;
             }
         }