diff options
Diffstat (limited to 'sw/source/filter/html')
| -rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 3cc9826e2785..836e7db42cfa 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -560,14 +560,14 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat, // If necessary, take the hard attribute from the style if( pFormatInfo->pItemSet ) { - OSL_ENSURE( !rInfo.pItemSet.get(), "Where does this ItemSet come from?" ); + OSL_ENSURE(!rInfo.pItemSet, "Where does this ItemSet come from?"); rInfo.pItemSet.reset(new SfxItemSet( *pFormatInfo->pItemSet )); } // additionally, add the hard attribute from the paragraph if( pNodeItemSet ) { - if( rInfo.pItemSet.get() ) + if (rInfo.pItemSet) rInfo.pItemSet->Put( *pNodeItemSet ); else rInfo.pItemSet.reset(new SfxItemSet( *pNodeItemSet )); @@ -591,7 +591,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat, else aULSpaceItem.SetUpper( rHWrt.m_nHeaderFooterSpace ); - if (!rInfo.pItemSet.get()) + if (!rInfo.pItemSet) { rInfo.pItemSet.reset(new SfxItemSet(*rFormat.GetAttrSet().GetPool(), svl::Items<RES_UL_SPACE, RES_UL_SPACE>{})); } diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index a056d8dca4d2..313e161c4573 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2279,7 +2279,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, OSL_ENSURE( m_nRows>0 && m_nCols>0 && m_nCurrentRow==m_nRows, "Was CloseTable not called?" ); - OSL_ENSURE(m_xLayoutInfo.get() == nullptr, "Table already has layout info"); + OSL_ENSURE(m_xLayoutInfo == nullptr, "Table already has layout info"); // Calculate borders of the table and all contained tables SetBorders(); |