diff options
Diffstat (limited to 'sw/source/ui/chrdlg/swuiccoll.cxx')
| -rw-r--r-- | sw/source/ui/chrdlg/swuiccoll.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 533f2fce92b3..8e74408a5972 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -56,7 +56,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) , m_rSh(::GetActiveView()->GetWrtShell()), m_pCmds( SwCondCollItem::GetCmds() ), - m_pFormat(0), + m_pFormat(nullptr), m_bNewTemplate(false) { @@ -97,7 +97,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pTbLinks->SetSpaceBetweenEntries( 0 ); SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER)); - const SfxStyleFamilyItem* pFamilyItem = 0; + const SfxStyleFamilyItem* pFamilyItem = nullptr; size_t nCount = aFamilies.size(); for( size_t i = 0; i < nCount; ++i ) @@ -197,10 +197,10 @@ void SwCondCollPage::Reset(const SfxItemSet *) { OUString aEntry( m_aStrArr[n] + "\t" ); - const SwCollCondition* pCond = 0; + const SwCollCondition* pCond = nullptr; if( m_pFormat && RES_CONDTXTFMTCOLL == m_pFormat->Which() && - 0 != ( pCond = static_cast<SwConditionTextFormatColl*>(m_pFormat)-> - HasCondition( SwCollCondition( 0, m_pCmds[n].nCnd, m_pCmds[n].nSubCond ) ) ) + nullptr != ( pCond = static_cast<SwConditionTextFormatColl*>(m_pFormat)-> + HasCondition( SwCollCondition( nullptr, m_pCmds[n].nCnd, m_pCmds[n].nSubCond ) ) ) && pCond->GetTextFormatColl() ) { aEntry += pCond->GetTextFormatColl()->GetName(); @@ -225,7 +225,7 @@ IMPL_LINK_TYPED( SwCondCollPage, OnOffHdl, Button*, pBox, void ) m_pRemovePB->Enable( bEnable ); m_pAssignPB->Enable( bEnable ); if( bEnable ) - SelectHdl(0); + SelectHdl(nullptr); } IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveClickHdl, Button*, pBtn, void) |