[Libreoffice-commits] core.git: 2 commits - sal/osl writerfilter/source

[Caolán McNamara (via logerrit)]

 sal/osl/unx/nlsupport.cxx                       |    1 +
 writerfilter/source/dmapper/StyleSheetTable.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 885e6064f05b6e8360cc020872d4696afeb15305
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 7 09:49:31 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Oct 7 16:31:46 2019 +0200

    cid#1448512 silence bogus Out-of-bounds access
    
    Change-Id: I6febe3d48fc9018b373a940d88d2afeefad7502c
    Reviewed-on: https://gerrit.libreoffice.org/80355
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 9be260b6dd03..76c4cedb2000 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -639,6 +639,7 @@ void imp_getProcessLocale( rtl_Locale ** ppLocale )
             }
         }
     }
+    // coverity[overrun-buffer-arg: FALSE] - coverity gets this very wrong
     *ppLocale = parse_locale(locale);
 }
 
commit 9f68c71116661813efc19223a0ead921e3a38e02
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 7 09:51:52 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Oct 7 16:31:32 2019 +0200

    cid#1130173 Logically dead code
    
    Change-Id: I3b283a3283d865f5f96d872bad219ce9c3f872df
    Reviewed-on: https://gerrit.libreoffice.org/80356
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Tested-by: Jenkins

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 4b305abf17c6..5dcc856ca564 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -577,7 +577,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
                 pProperties->resolve(*pTblStylePrHandler);
                 StyleSheetEntry* pEntry = m_pImpl->m_pCurrentEntry.get();
                 TableStyleSheetEntry& rTableEntry = dynamic_cast<TableStyleSheetEntry&>(*pEntry);
-                rTableEntry.AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag((nSprmId == NS_ooxml::LN_CT_Style_tcPr) ? OUString("tcPr") : OUString("trPr")));
+                rTableEntry.AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag("tcPr"));
 
                 // This is a <w:tcPr> directly under <w:style>, so it affects the whole table.
                 rTableEntry.pProperties->InsertProps(pTblStylePrHandler->getProperties());