strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Directly use o3tl::optional comparison

Browse source 
Change-Id: I864137704dd8c27d034dc34c947c97954dd18ef3
Reviewed-on: https://gerrit.libreoffice.org/84296
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2019-12-03 08:12:10 +01:00
parent 1d1366bd15
commit 0e29592223
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sw/source/core/crsr/findattr.cxx
View file

@ -64,25 +64,12 @@ static bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
return static_cast<const SvxColorItem&>(rItem1).GetValue().IsRGBEqual(
static_cast<const SvxColorItem&>(rItem2).GetValue() );
case RES_PAGEDESC:
bool bNumOffsetEqual = false;
::o3tl::optional<sal_uInt16> const oNumOffset1 =
static_cast<const SwFormatPageDesc&>(rItem1).GetNumOffset();
::o3tl::optional<sal_uInt16> const oNumOffset2 =
static_cast<const SwFormatPageDesc&>(rItem2).GetNumOffset();
if (!oNumOffset1 && !oNumOffset2)
{
bNumOffsetEqual = true;
}
else if (oNumOffset1 && oNumOffset2)
{
bNumOffsetEqual = *oNumOffset1 == *oNumOffset2;
}
else
{
bNumOffsetEqual = false;
}
if (!bNumOffsetEqual)
if (oNumOffset1 != oNumOffset2)
return false;
return static_cast<const SwFormatPageDesc&>(rItem1).GetPageDesc() == static_cast<const SwFormatPageDesc&>(rItem2).GetPageDesc();