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/misc | |
parent | 6cd7bf2043146a630925a2e49336f02c802f707a (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/ui/misc')
-rw-r--r-- | sw/source/ui/misc/docfnote.cxx | 20 | ||||
-rw-r--r-- | sw/source/ui/misc/glossary.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/misc/insfnote.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/misc/linenum.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/num.cxx | 16 | ||||
-rw-r--r-- | sw/source/ui/misc/outline.cxx | 20 | ||||
-rw-r--r-- | sw/source/ui/misc/pgfnote.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/srtdlg.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/titlepage.cxx | 10 |
11 files changed, 54 insertions, 54 deletions
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 86fde7dbe628..5f32002007d0 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -47,8 +47,8 @@ SwFootNoteOptionDlg::SwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rS) aOldOkHdl = GetOKButton().GetClickHdl(); GetOKButton().SetClickHdl( LINK( this, SwFootNoteOptionDlg, OkHdl ) ); - m_nFootNoteId = AddTabPage( "footnotes", SwFootNoteOptionPage::Create, 0 ); - m_nEndNoteId = AddTabPage( "endnotes", SwEndNoteOptionPage::Create, 0 ); + m_nFootNoteId = AddTabPage( "footnotes", SwFootNoteOptionPage::Create, nullptr ); + m_nEndNoteId = AddTabPage( "endnotes", SwEndNoteOptionPage::Create, nullptr ); } void SwFootNoteOptionDlg::PageCreated( sal_uInt16 /*nId*/, SfxTabPage &rPage ) @@ -74,13 +74,13 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN, bEN ? OString("EndnotePage") : OString("FootnotePage"), bEN ? OUString("modules/swriter/ui/endnotepage.ui") : OUString("modules/swriter/ui/footnotepage.ui"), &rSet) - , m_pNumCountBox(NULL) - , m_pPosFT(NULL) - , m_pPosPageBox(NULL) - , m_pPosChapterBox(NULL) - , m_pContEdit(NULL) - , m_pContFromEdit(NULL) - , pSh(0) + , m_pNumCountBox(nullptr) + , m_pPosFT(nullptr) + , m_pPosPageBox(nullptr) + , m_pPosChapterBox(nullptr) + , m_pContEdit(nullptr) + , m_pContFromEdit(nullptr) + , pSh(nullptr) , bPosDoc(false) , bEndNote(bEN) { @@ -338,7 +338,7 @@ IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, PosChapterHdl, Button*, void) static SwCharFormat* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFormatName ) { - SwCharFormat* pFormat = 0; + SwCharFormat* pFormat = nullptr; const sal_uInt16 nChCount = pSh->GetCharFormatCount(); for(sal_uInt16 i = 0; i< nChCount; i++) { diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 6f94e2c7c6a0..3b62c88e7ee2 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -192,7 +192,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, : SvxStandardDialog(&pViewFrame->GetWindow(), "AutoTextDialog", "modules/swriter/ui/autotext.ui") , sReadonlyPath(SW_RESSTR(STR_READONLY_PATH)) - , pExampleFrame(0) + , pExampleFrame(nullptr) , pGlossaryHdl(pGlosHdl) , bResume(false) , bSelection(pWrtShell->IsSelection()) @@ -367,7 +367,7 @@ SvTreeListEntry* SwGlossaryDlg::DoesBlockExist(const OUString& rBlock, } } } - return 0; + return nullptr; } IMPL_LINK_TYPED( SwGlossaryDlg, NameModify, Edit&, rEdit, void ) @@ -423,7 +423,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool ) const OUString aEditText(m_pNameED->GetText()); const bool bHasEntry = !aEditText.isEmpty() && !m_pShortNameEdit->GetText().isEmpty(); - const bool bExists = 0 != DoesBlockExist(aEditText, m_pShortNameEdit->GetText()); + const bool bExists = nullptr != DoesBlockExist(aEditText, m_pShortNameEdit->GetText()); const bool bIsGroup = pEntry && !m_pCategoryBox->GetParent(pEntry); pMn->EnableItem("new", bSelection && bHasEntry && !bExists); pMn->EnableItem("newtext", bSelection && bHasEntry && !bExists); @@ -693,7 +693,7 @@ void SwGlossaryDlg::Init() m_pCategoryBox->Clear(); // display text block regions const size_t nCnt = pGlossaryHdl->GetGroupCnt(); - SvTreeListEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = nullptr; const OUString sSelStr(::GetCurrGlosGroup().getToken(0, GLOS_DELIM)); const sal_Int32 nSelPath = ::GetCurrGlosGroup().getToken(1, GLOS_DELIM).toInt32(); // #i66304# - "My AutoText" comes from mytexts.bau, but should be translated @@ -836,7 +836,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, CheckBoxHdl, Button *, pBox, void ) SwGlTreeListBox::SwGlTreeListBox(vcl::Window* pParent, WinBits nBits) : SvTreeListBox(pParent, nBits) , sReadonly(SW_RESSTR(SW_STR_READONLY)), - pDragEntry(0) + pDragEntry(nullptr) { SetDragDropMode( DragDropMode::CTRL_MOVE|DragDropMode::CTRL_COPY ); } @@ -970,7 +970,7 @@ TriState SwGlTreeListBox::NotifyCopyingOrMoving( SvTreeListEntry* pEntry, bool bIsMove) { - pDragEntry = 0; + pDragEntry = nullptr; // 1. move in different groups? // 2. allowed to write to both groups? if(!pTarget) // move to the beginning diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 8f0f7247e7e0..5565cb7aa6de 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -68,7 +68,7 @@ void SwInsFootNoteDlg::Apply() eCharSet, RES_CHRATR_FONT ); aSet.Put( aFont ); rSh.SetAttrSet( aSet, SetAttrMode::DONTEXPAND ); - rSh.ResetSelect(0, false); + rSh.ResetSelect(nullptr, false); rSh.Left(CRSR_SKIP_CHARS, false, 1, false ); } rSh.EndUndo( UNDO_END ); @@ -143,7 +143,7 @@ IMPL_LINK_TYPED( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn, void ) Apply(); // go to the next foot/endnote here - rSh.ResetSelect(0, false); + rSh.ResetSelect(nullptr, false); if (pBtn == m_pNextBT) rSh.GotoNextFootnoteAnchor(); else @@ -198,10 +198,10 @@ SwInsFootNoteDlg::~SwInsFootNoteDlg() void SwInsFootNoteDlg::dispose() { - SwViewShell::SetCareWin(0); + SwViewShell::SetCareWin(nullptr); if (bEdit) - rSh.ResetSelect(0, false); + rSh.ResetSelect(nullptr, false); m_pNumberFrame.clear(); m_pNumberAutoBtn.clear(); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 2589db7bbb9d..008dd90f91cd 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -43,7 +43,7 @@ static rtl::Reference<SwDocStyleSheet> lcl_getDocStyleSheet(const OUString& rNam SfxStyleSheetBase* pStyle = mpBase->Find(rName, (SfxStyleFamily)nFamily); SAL_WARN_IF( !pStyle, "linenumbering.ui", "Style not found" ); if(!pStyle) - return NULL; + return nullptr; return new SwDocStyleSheet(*static_cast<SwDocStyleSheet*>(pStyle)); } diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 6b15cf6a57a5..e6281bafe1e3 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -63,10 +63,10 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OutlinePositionPage", "modules/swriter/ui/outlinepositionpage.ui", &rSet) - , pActNum(0) - , pSaveNum(0) - , pWrtSh(0) - , pOutlineDlg(0) + , pActNum(nullptr) + , pSaveNum(nullptr) + , pWrtSh(nullptr) + , pOutlineDlg(nullptr) , nActNumLvl(0) , bModified(false) , bPreset(false) @@ -205,9 +205,9 @@ void SwNumPositionTabPage::InitControls() USHRT_MAX != nActNumLvl; m_pDistBorderMF->Enable( !bLabelAlignmentPosAndSpaceModeActive && - ( bSingleSelection || bRelative || pOutlineDlg.get() != 0 ) ); + ( bSingleSelection || bRelative || pOutlineDlg.get() != nullptr ) ); m_pDistBorderFT->Enable( !bLabelAlignmentPosAndSpaceModeActive && - ( bSingleSelection || bRelative || pOutlineDlg.get() != 0 ) ); + ( bSingleSelection || bRelative || pOutlineDlg.get() != nullptr ) ); bool bSetDistEmpty = false; bool bSameDistBorderNum = !bLabelAlignmentPosAndSpaceModeActive; @@ -491,7 +491,7 @@ void SwNumPositionTabPage::Reset( const SfxItemSet* rSet ) void SwNumPositionTabPage::InitPosAndSpaceMode() { - if ( pActNum == 0 ) + if ( pActNum == nullptr ) { OSL_FAIL( "<SwNumPositionTabPage::InitPosAndSpaceMode()> - misusage of method -> <pAktNum> has to be already set!" ); return; @@ -945,7 +945,7 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(vcl::Window* pParent, , rWrtSh(rSh) { GetUserButton()->SetClickHdl(LINK(this, SwSvxNumBulletTabDialog, RemoveNumberingHdl)); - GetUserButton()->Enable(rWrtSh.GetNumRuleAtCurrCrsrPos() != NULL); + GetUserButton()->Enable(rWrtSh.GetNumRuleAtCurrCrsrPos() != nullptr); m_nSingleNumPageId = AddTabPage("singlenum", RID_SVXPAGE_PICK_SINGLE_NUM ); m_nBulletPageId = AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET ); AddTabPage("outlinenum", RID_SVXPAGE_PICK_NUM ); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 325fb6682afe..0c691319bb1d 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -170,8 +170,8 @@ SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* p pNumRule = new SwNumRule( *rSh.GetOutlineNumRule() ); GetCancelButton().SetClickHdl(LINK(this, SwOutlineTabDialog, CancelHdl)); - m_nNumPosId = AddTabPage("position", &SwNumPositionTabPage::Create, 0); - m_nOutlineId = AddTabPage("numbering", &SwOutlineSettingsTabPage::Create, 0); + m_nNumPosId = AddTabPage("position", &SwNumPositionTabPage::Create, nullptr); + m_nOutlineId = AddTabPage("numbering", &SwOutlineSettingsTabPage::Create, nullptr); OUString sHeadline; sal_uInt16 i; @@ -287,7 +287,7 @@ IMPL_LINK_TYPED( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool ) if(pRules) aStrArr[i] = &pRules->GetName(); else - aStrArr[i] = 0; + aStrArr[i] = nullptr; } pDlg->SetUserNames(aStrArr); if(RET_OK == pDlg->Execute()) @@ -419,9 +419,9 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(vcl::Window* pParent, : SfxTabPage(pParent, "OutlineNumberingPage", "modules/swriter/ui/outlinenumberingpage.ui", &rSet) , aNoFormatName(SW_RESSTR(SW_STR_NONE)) - , pSh(NULL) - , pNumRule(NULL) - , pCollNames(NULL) + , pSh(nullptr) + , pNumRule(nullptr) + , pCollNames(nullptr) , nActLevel(1) { get(m_pLevelLB, "level"); @@ -464,7 +464,7 @@ void SwOutlineSettingsTabPage::Update() bool bSameCharFormat = true; const SwNumFormat* aNumFormatArr[MAXLEVEL]; - const SwCharFormat* pFirstFormat = 0; + const SwCharFormat* pFirstFormat = nullptr; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) { @@ -703,7 +703,7 @@ IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, CharFormatHdl, ListBox&, void) OUString sEntry = m_pCharFormatLB->GetSelectEntry(); sal_uInt16 nMask = 1; bool bFormatNone = sEntry == SwViewShell::GetShellRes()->aStrNone; - SwCharFormat* pFormat = 0; + SwCharFormat* pFormat = nullptr; if(!bFormatNone) { sal_uInt16 nChCount = pSh->GetCharFormatCount(); @@ -734,7 +734,7 @@ IMPL_LINK_NOARG_TYPED(SwOutlineSettingsTabPage, CharFormatHdl, ListBox&, void) { SwNumFormat aNumFormat(pNumRule->Get(i)); if(bFormatNone) - aNumFormat.SetCharFormat(0); + aNumFormat.SetCharFormat(nullptr); else aNumFormat.SetCharFormat(pFormat); pNumRule->Set(i, aNumFormat); @@ -1097,7 +1097,7 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle pVDev->SetFont(aStdFont); pVDev->DrawText( Point(nXStart + nTextOffset, nYStart), - (pOutlineNames == 0 + (pOutlineNames == nullptr ? utl::ConfigManager::getProductName() : pOutlineNames[nLevel])); } diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index cf875f1ce3e6..2ab8e3cd5b83 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -219,7 +219,7 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet) if ( pDocSh ) { const SfxPoolItem* pColorItem = pDocSh->GetItem( SID_COLOR_TABLE ); - if ( pColorItem != NULL ) + if ( pColorItem != nullptr ) pColorList = static_cast<const SvxColorListItem*>(pColorItem)->GetColorList(); } @@ -303,7 +303,7 @@ bool SwFootNotePage::FillItemSet(SfxItemSet *rSet) rFootnoteInfo.SetWidth(Fraction( static_cast< long >(m_pLineLengthEdit->GetValue()), 100)); const SfxPoolItem* pOldItem; - if(0 == (pOldItem = GetOldItem( *rSet, FN_PARAM_FTN_INFO )) || + if(nullptr == (pOldItem = GetOldItem( *rSet, FN_PARAM_FTN_INFO )) || aItem != *pOldItem ) rSet->Put(aItem); diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index d4410caf9953..1ce914db8290 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -220,7 +220,7 @@ void SwTextGridPage::Reset(const SfxItemSet *rSet) if(SfxItemState::DEFAULT <= rSet->GetItemState(RES_TEXTGRID)) { const SwTextGridItem& rGridItem = static_cast<const SwTextGridItem&>(rSet->Get(RES_TEXTGRID)); - RadioButton* pButton = 0; + RadioButton* pButton = nullptr; switch(rGridItem.GetGridType()) { case GRID_NONE : pButton = m_pNoGridRB; break; diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index a75f46504e51..7cbc05f5bacf 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -87,7 +87,7 @@ static bool lcl_GetSelTable( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY ) if( !pTableNd ) return false; - _FndBox aFndBox( 0, 0 ); + _FndBox aFndBox( nullptr, nullptr ); // look for all boxes / lines { @@ -112,7 +112,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) , aRowText(SW_RES(STR_ROW)) , aNumericText(SW_RES(STR_NUMERIC)) , rSh(rShell) - , pColRes(0) + , pColRes(nullptr) , nX(99) , nY(99) { @@ -208,7 +208,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) m_pLangLB->SetLanguageList( SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, true ); m_pLangLB->SelectLanguage( nLang ); - LanguageHdl( 0 ); + LanguageHdl( nullptr ); m_pLangLB->SetSelectHdl( LINK( this, SwSortDlg, LanguageListBoxHdl )); m_pSortUp1RB->Check(bAsc1); @@ -332,7 +332,7 @@ void SwSortDlg::Apply() OUString sEntry( m_pTypDLB1->GetSelectEntry() ); if( sEntry == aNumericText ) sEntry.clear(); - else if( 0 != (pUserData = m_pTypDLB1->GetSelectEntryData()) ) + else if( nullptr != (pUserData = m_pTypDLB1->GetSelectEntryData()) ) sEntry = *static_cast<OUString*>(pUserData); SwSortKey *pKey = new SwSortKey( nCol1, sEntry, @@ -345,7 +345,7 @@ void SwSortDlg::Apply() OUString sEntry( m_pTypDLB2->GetSelectEntry() ); if( sEntry == aNumericText ) sEntry.clear(); - else if( 0 != (pUserData = m_pTypDLB2->GetSelectEntryData()) ) + else if( nullptr != (pUserData = m_pTypDLB2->GetSelectEntryData()) ) sEntry = *static_cast<OUString*>(pUserData); SwSortKey *pKey = new SwSortKey( nCol2, sEntry, @@ -358,7 +358,7 @@ void SwSortDlg::Apply() OUString sEntry( m_pTypDLB3->GetSelectEntry() ); if( sEntry == aNumericText ) sEntry.clear(); - else if( 0 != (pUserData = m_pTypDLB3->GetSelectEntryData()) ) + else if( nullptr != (pUserData = m_pTypDLB3->GetSelectEntryData()) ) sEntry = *static_cast<OUString*>(pUserData); SwSortKey *pKey = new SwSortKey( nCol3, sEntry, diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index 05a4fb555f09..bfe7bdfdf8e1 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -82,7 +82,7 @@ void SwModalRedlineAcceptDlg::AcceptAll( bool bAccept ) pFilterTP->CheckAuthor(false); pFilterTP->CheckRange(false); pFilterTP->CheckAction(false); - pImplDlg->FilterChangedHdl(NULL); + pImplDlg->FilterChangedHdl(nullptr); } pImplDlg->CallAcceptReject( false, bAccept ); diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 2ebdd8725fd3..2e7f901f0cc6 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -35,7 +35,7 @@ namespace SfxItemSet aSet( pSh->GetAttrPool(), RES_PAGEDESC, RES_PAGEDESC ); if (pSh->GetCurAttr( aSet )) { - const SfxPoolItem* pItem(0); + const SfxPoolItem* pItem(nullptr); if (SfxItemState::SET == aSet.GetItemState( RES_PAGEDESC, true, &pItem ) && pItem) { ::boost::optional<sal_uInt16> oNumOffset = static_cast<const SwFormatPageDesc *>(pItem)->GetNumOffset(); @@ -55,7 +55,7 @@ namespace const size_t nCurIdx = pSh->GetCurPageDesc(); const SwPageDesc &rCurrentDesc = pSh->GetPageDesc( nCurIdx ); - const SwFormatPageDesc *pPageFormatDesc(0); + const SwFormatPageDesc *pPageFormatDesc(nullptr); sal_uInt16 nDontCare; lcl_GetPageDesc(pSh, nDontCare, &pPageFormatDesc); @@ -152,7 +152,7 @@ sal_uInt16 SwTitlePageDlg::GetInsertPosition() const SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) : SfxModalDialog( pParent, "DLG_TITLEPAGE", "modules/swriter/ui/titlepage.ui"), - mpPageFormatDesc(0) + mpPageFormatDesc(nullptr) { get(m_pUseExistingPagesRB, "RB_USE_EXISTING_PAGES"); get(m_pPageCountNF, "NF_PAGE_COUNT"); @@ -199,7 +199,7 @@ SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) : if (mpIndexDesc != &rPageDesc) { mpNormalDesc = &rPageDesc; - bMaybeResetNumbering = lcl_GetPageDesc(mpSh, nResetPage, NULL); + bMaybeResetNumbering = lcl_GetPageDesc(mpSh, nResetPage, nullptr); break; } ++nTitlePages; @@ -333,7 +333,7 @@ IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, OKHdl, Button*, void) if (m_pRestartNumberingCB->IsChecked() || nNoPages > 1) { sal_uInt16 nPgNo = m_pRestartNumberingCB->IsChecked() ? m_pRestartNumberingNF->GetValue() : 0; - const SwPageDesc *pNewDesc = nNoPages > 1 ? mpNormalDesc : 0; + const SwPageDesc *pNewDesc = nNoPages > 1 ? mpNormalDesc : nullptr; mpSh->GotoPage(GetInsertPosition() + nNoPages, false); lcl_ChangePage(mpSh, nPgNo, pNewDesc); } |