i18nutil/source/utility/paper.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit 910dc29435395f9fd9c3019c1d3c59a0dcea2474 Author: Patrick Luby <plub...@libreoffice.org> AuthorDate: Fri Dec 8 15:11:45 2023 -0500 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Mon Dec 11 14:04:31 2023 +0100 tdf#158379 check if PageDesc's m_pPSName is a nullptr Change-Id: If9f6d695d40c1d55ee2dfbdf1e3523b33343d7ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160504 Tested-by: Jenkins Reviewed-by: Patrick Luby <plub...@libreoffice.org> (cherry picked from commit 48748d5b5a89f27e1d2f610152145e3a19eda9a9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160473 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx index f88510c48afa..399b3295ed27 100644 --- a/i18nutil/source/utility/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -400,8 +400,7 @@ PaperInfo::PaperInfo(tools::Long nPaperWidth, tools::Long nPaperHeight) OString PaperInfo::toPSName(Paper ePaper) { - return static_cast<size_t>(ePaper) < nTabSize ? - OString(aDinTab[ePaper].m_pPSName) : OString(); + return static_cast<size_t>(ePaper) < nTabSize && aDinTab[ePaper].m_pPSName ? OString(aDinTab[ePaper].m_pPSName) : OString(); } Paper PaperInfo::fromPSName(const OString &rName)