lotuswordpro/source/filter/lwptablelayout.cxx | 6 +++---
oox/source/ole/olehelper.cxx | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 57fce217fa6ee9d11b4899bbb2d11c05b76becb3
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat May 11 10:13:20 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat May 11 14:30:40 2024 +0200
cid#1597279 Unchecked return value
Change-Id: I603d8269f6831c07dc48b767545180120388831d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167505
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index ae0cafdebb25..c5042aa5a6d9 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -526,7 +526,7 @@ bool MSConvertOCXControls::WriteOCXExcelKludgeStream( const
css::uno::Reference<
return false;
rName = exportHelper.getTypeName();
SvGlobalName aName;
- aName.MakeId(exportHelper.getGUID());
+ (void)aName.MakeId(exportHelper.getGUID());
BinaryXOutputStream aOut( xOutStrm, false );
OleHelper::exportGuid( aOut, aName );
exportHelper.exportControl( xOutStrm, rSize );
commit cc3a8a025b816fd94e98070d84140c392f142f91
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat May 11 10:12:20 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat May 11 14:30:33 2024 +0200
cid#1597280 Dereference null return value
Change-Id: I0275c178a478b7143b0cf4ed19f030009b7bd2fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167504
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 9c1ceea67f5b..90fb18c7ba67 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -916,12 +916,11 @@ void LwpTableLayout::SplitRowToCells(XFTable* pTmpTable,
rtl::Reference<XFTable>
//register style for heading row
double fHeight = 0;
- OUString styleName;
std::unique_ptr<XFRowStyle> xRowStyle(new XFRowStyle);
XFRow* pRow = pTmpTable->GetRow(1);
if (!pRow)
throw std::runtime_error("missing row");
- styleName = pRow->GetStyleName();
+ OUString styleName = pRow->GetStyleName();
// get settings of the row and assign them to new row style
XFStyleManager* pXFStyleManager =
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
@@ -932,7 +931,8 @@ void LwpTableLayout::SplitRowToCells(XFTable* pTmpTable,
rtl::Reference<XFTable>
for (i=1;i<=nRowNum;i++)
{
styleName = pTmpTable->GetRow(i)->GetStyleName();
-
fHeight+=static_cast<XFRowStyle*>(pXFStyleManager->FindStyle(styleName))->GetRowHeight();
+ if (XFRowStyle* pRowStyle =
static_cast<XFRowStyle*>(pXFStyleManager->FindStyle(styleName)))
+ fHeight+=pRowStyle->GetRowHeight();
}
if (m_nDirection & 0x0030)
{
