i18nutil/source/utility/paper.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit e07f4f2dbf65ee723f8bdf05587085783257dd5a
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:41 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/+/160474
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/i18nutil/source/utility/paper.cxx
b/i18nutil/source/utility/paper.cxx
index f6871e655f58..10b08a037b43 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)
