diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:48 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:53 +0100 |
commit | 01b49802c7cda7fd4d5ba71263cef7bc95234b89 (patch) | |
tree | b8d92f1c6abf5ac548d0bcb0c581ebfcffd8bfac /sw/source/ui/frmdlg/wrap.cxx | |
parent | 6cd7bf2043146a630925a2e49336f02c802f707a (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/ui/frmdlg/wrap.cxx')
-rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index d30e3edc58a3..2f56c86bd372 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -71,7 +71,7 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet) , m_nOldLowerMargin(0) , m_nAnchorId(FLY_AT_PARA) , m_nHtmlMode(0) - , m_pWrtSh(0) + , m_pWrtSh(nullptr) , m_bFormat(false) , m_bNew(true) , m_bHtmlMode(false) @@ -222,7 +222,7 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet) m_pWrapThroughRB->Enable(!m_pWrapOutlineCB->IsChecked()); m_bContourImage = !bContour; - RadioButton* pBtn = NULL; + RadioButton* pBtn = nullptr; switch (nSur) { @@ -286,7 +286,7 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet) m_pTopMarginED->SetValue(m_pTopMarginED->Normalize(rUL.GetUpper()), FUNIT_TWIP); m_pBottomMarginED->SetValue(m_pBottomMarginED->Normalize(rUL.GetLower()), FUNIT_TWIP); - ContourHdl(0); + ContourHdl(nullptr); ActivatePage( *rSet ); } @@ -331,7 +331,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) if ( bContour ) aSur.SetOutside(m_pWrapOutsideCB->IsChecked()); - if(0 == (pOldItem = GetOldItem( *rSet, RES_SURROUND )) || + if(nullptr == (pOldItem = GetOldItem( *rSet, RES_SURROUND )) || aSur != *pOldItem ) { rSet->Put(aSur); @@ -340,7 +340,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) if (!m_bDrawMode) { - if(0 == (pOldItem = GetOldItem( *rSet, FN_OPAQUE )) || + if(nullptr == (pOldItem = GetOldItem( *rSet, FN_OPAQUE )) || aOp != *pOldItem ) { rSet->Put(aOp); @@ -357,7 +357,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) if ( bTopMod || bBottomMod ) { - if(0 == (pOldItem = GetOldItem(*rSet, RES_UL_SPACE)) || + if(nullptr == (pOldItem = GetOldItem(*rSet, RES_UL_SPACE)) || aUL != *pOldItem ) { rSet->Put( aUL, RES_UL_SPACE ); @@ -374,7 +374,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) if ( bLeftMod || bRightMod ) { - if( 0 == (pOldItem = GetOldItem(*rSet, RES_LR_SPACE)) || + if( nullptr == (pOldItem = GetOldItem(*rSet, RES_LR_SPACE)) || aLR != *pOldItem ) { rSet->Put(aLR, RES_LR_SPACE); @@ -386,7 +386,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) { bool bChecked = m_pWrapTransparentCB->IsChecked() && m_pWrapTransparentCB->IsEnabled(); if ((m_pWrapTransparentCB->GetSavedValue() == 1) != bChecked) - bModified |= 0 != rSet->Put(SfxInt16Item(FN_DRAW_WRAP_DLG, bChecked ? 0 : 1)); + bModified |= nullptr != rSet->Put(SfxInt16Item(FN_DRAW_WRAP_DLG, bChecked ? 0 : 1)); } return bModified; @@ -448,7 +448,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) aVal.nHeight = aSize.Height(); m_aFrmSize = aSize; - aMgr.ValidateMetrics(aVal, 0); + aMgr.ValidateMetrics(aVal, nullptr); SwTwips nLeft; SwTwips nRight; @@ -575,7 +575,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) ((m_nAnchorId == FLY_AT_PARA) || (m_nAnchorId == FLY_AT_CHAR)) && nSur != SURROUND_NONE ); } - ContourHdl(0); + ContourHdl(nullptr); } SfxTabPage::sfxpg SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) @@ -595,7 +595,7 @@ IMPL_LINK_TYPED( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void ) { MetricField& rEdit = static_cast<MetricField&>(rSpin); sal_Int64 nValue = rEdit.GetValue(); - MetricField *pOpposite = 0; + MetricField *pOpposite = nullptr; if (&rEdit == m_pLeftMarginED) pOpposite = m_pRightMarginED; else if (&rEdit == m_pRightMarginED) @@ -627,7 +627,7 @@ IMPL_LINK_TYPED( SwWrapTabPage, WrapTypeHdl, Button *, pBtn, void ) ((m_nAnchorId == FLY_AT_PARA) || (m_nAnchorId == FLY_AT_CHAR)) && (pBtn != m_pNoWrapRB) ); - ContourHdl(0); + ContourHdl(nullptr); } IMPL_LINK_NOARG_TYPED(SwWrapTabPage, ContourHdl, Button*, void) |