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/fldui | |
parent | 6cd7bf2043146a630925a2e49336f02c802f707a (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r-- | sw/source/ui/fldui/DropDownFieldDialog.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/changedb.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddb.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddinf.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldedt.cxx | 20 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldpage.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldpage.hxx | 8 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldref.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldtdlg.cxx | 18 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldvar.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/fldui/inpdlg.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/fldui/javaedit.cxx | 10 |
12 files changed, 63 insertions, 63 deletions
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 083b7efe6214..2df5ba1199ba 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -35,7 +35,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r : SvxStandardDialog(pParent, "DropdownFieldDialog", "modules/swriter/ui/dropdownfielddialog.ui") , rSh( rS ) - , pDropField(0) + , pDropField(nullptr) { get(m_pListItemsLB, "list"); m_pListItemsLB->SetDropDownLineCount(12); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 3911cd579a5c..85b3ad829cc5 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -81,7 +81,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) m_pUsedDBTLB->SetDeselectHdl(aLink); m_pAvailDBTLB->SetSelectHdl(aLink); m_pAvailDBTLB->SetSelectHdl(aLink); - TreeSelectHdl(NULL); + TreeSelectHdl(nullptr); } // initialise database listboxes @@ -107,8 +107,8 @@ void SwChangeDBDlg::FillDBPopup() size_t nCount = aDBNameList.size(); m_pUsedDBTLB->Clear(); - SvTreeListEntry *pFirst = 0; - SvTreeListEntry *pLast = 0; + SvTreeListEntry *pFirst = nullptr; + SvTreeListEntry *pLast = nullptr; for(size_t k = 0; k < nCount; k++) { @@ -140,11 +140,11 @@ SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName) Image aDBImg = aImageList.GetImage(IMG_DB); Image aQueryImg = aImageList.GetImage(IMG_DBQUERY); Image& rToInsert = nCommandType ? aQueryImg : aTableImg; - while ((pParent = m_pUsedDBTLB->GetEntry(nParent++)) != NULL) + while ((pParent = m_pUsedDBTLB->GetEntry(nParent++)) != nullptr) { if (sDBName == m_pUsedDBTLB->GetEntryText(pParent)) { - while ((pChild = m_pUsedDBTLB->GetEntry(pParent, nChild++)) != NULL) + while ((pChild = m_pUsedDBTLB->GetEntry(pParent, nChild++)) != nullptr) { if (sTableName == m_pUsedDBTLB->GetEntryText(pChild)) return pChild; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 3e0c7620ccab..45fe095adea5 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -180,7 +180,7 @@ void SwFieldDBPage::Reset(const SfxItemSet*) } } } - TypeHdl(0); + TypeHdl(nullptr); m_pTypeLB->SetUpdateMode(true); m_pTypeLB->SetSelectHdl(LINK(this, SwFieldDBPage, TypeListBoxHdl)); @@ -420,7 +420,7 @@ void SwFieldDBPage::CheckInsert() if (nTypeId == TYP_DBFLD && pEntry) pEntry = m_pDatabaseTLB->GetParent(pEntry); - bInsert &= pEntry != 0; + bInsert &= pEntry != nullptr; } else bInsert = false; @@ -453,7 +453,7 @@ IMPL_LINK_TYPED( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void ) { bool bNumFormat = false; - if (pEntry != 0) + if (pEntry != nullptr) { OUString sTableName; OUString sColumnName; diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 3bdc85d99755..58ea65708db5 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -50,7 +50,7 @@ using namespace com::sun::star; SwFieldDokInfPage::SwFieldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SwFieldPage(pParent, "FieldDocInfoPage", "modules/swriter/ui/flddocinfopage.ui", rCoreSet) - , pSelEntry(0) + , pSelEntry(nullptr) , nOldSel(0) , nOldFormat(0) { @@ -110,12 +110,12 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) // initialise TypeListBox m_pTypeTLB->SetUpdateMode(false); m_pTypeTLB->Clear(); - pSelEntry = 0; + pSelEntry = nullptr; // display SubTypes in TypeLB - SvTreeListEntry* pEntry = 0; + SvTreeListEntry* pEntry = nullptr; - SvTreeListEntry* pInfo = 0; + SvTreeListEntry* pInfo = nullptr; sal_uInt16 nSubType = USHRT_MAX; if (IsFieldEdit()) @@ -189,7 +189,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) } // select old Pos - if (pSelEntry != 0) + if (pSelEntry != nullptr) { m_pTypeTLB->Select(pSelEntry); nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()); @@ -202,7 +202,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) FillSelectionLB(nSubType); if ( pSelEntry ) - TypeHdl(NULL); + TypeHdl(nullptr); m_pTypeTLB->SetUpdateMode(true); m_pTypeTLB->SetSelectHdl(LINK(this, SwFieldDokInfPage, TypeHdl)); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 4d4131039c62..c339618a5ef2 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -89,7 +89,7 @@ void SwFieldEditDlg::EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr) } SwFieldEditDlg::SwFieldEditDlg(SwView& rVw) - : SfxSingleTabDialog(&rVw.GetViewFrame()->GetWindow(), 0, + : SfxSingleTabDialog(&rVw.GetViewFrame()->GetWindow(), nullptr, "EditFieldDialog", "modules/swriter/ui/editfielddialog.ui") , pSh(rVw.GetWrtShellPtr()) { @@ -167,13 +167,13 @@ VclPtr<SfxTabPage> SwFieldEditDlg::CreatePage(sal_uInt16 nGroup) switch (nGroup) { case GRP_DOC: - pTabPage = SwFieldDokPage::Create(get_content_area(), 0); + pTabPage = SwFieldDokPage::Create(get_content_area(), nullptr); break; case GRP_FKT: - pTabPage = SwFieldFuncPage::Create(get_content_area(), 0); + pTabPage = SwFieldFuncPage::Create(get_content_area(), nullptr); break; case GRP_REF: - pTabPage = SwFieldRefPage::Create(get_content_area(), 0); + pTabPage = SwFieldRefPage::Create(get_content_area(), nullptr); break; case GRP_REG: { @@ -192,11 +192,11 @@ VclPtr<SfxTabPage> SwFieldEditDlg::CreatePage(sal_uInt16 nGroup) break; } case GRP_DB: - pTabPage = SwFieldDBPage::Create(get_content_area(), 0); + pTabPage = SwFieldDBPage::Create(get_content_area(), nullptr); static_cast<SwFieldDBPage*>(pTabPage.get())->SetWrtShell(*pSh); break; case GRP_VAR: - pTabPage = SwFieldVarPage::Create(get_content_area(), 0); + pTabPage = SwFieldVarPage::Create(get_content_area(), nullptr); break; } @@ -219,7 +219,7 @@ SwFieldEditDlg::~SwFieldEditDlg() void SwFieldEditDlg::dispose() { - SwViewShell::SetCareWin(NULL); + SwViewShell::SetCareWin(nullptr); pSh->EnterStdMode(); m_pPrevBT.clear(); m_pNextBT.clear(); @@ -246,7 +246,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, OKHdl, Button*, void) { VclPtr<SfxTabPage> pTabPage = GetTabPage(); if (pTabPage) - pTabPage->FillItemSet(0); + pTabPage->FillItemSet(nullptr); EndDialog( RET_OK ); } } @@ -264,13 +264,13 @@ IMPL_LINK_TYPED( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void ) pSh->EnterStdMode(); - SwFieldType *pOldTyp = 0; + SwFieldType *pOldTyp = nullptr; VclPtr<SwFieldPage> pTabPage = static_cast<SwFieldPage*>(GetTabPage()); //#112462# FillItemSet may delete the current field //that's why it has to be called before accessing the current field if( GetOKButton()->IsEnabled() ) - pTabPage->FillItemSet(0); + pTabPage->FillItemSet(nullptr); SwFieldMgr& rMgr = pTabPage->GetFieldMgr(); SwField *pCurField = rMgr.GetCurField(); diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index a9f672f14c8d..afd645ac8bcc 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -44,8 +44,8 @@ using namespace ::com::sun::star; SwFieldPage::SwFieldPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet) - , m_pCurField(0) - , m_pWrtShell(0) + , m_pCurField(nullptr) + , m_pWrtShell(nullptr) , m_nTypeSel(LISTBOX_ENTRY_NOTFOUND) , m_nSelectionSel(LISTBOX_ENTRY_NOTFOUND) , m_bFieldEdit(false) @@ -66,7 +66,7 @@ void SwFieldPage::Init() SwDocShell* pDocSh = static_cast<SwDocShell*>(SfxObjectShell::Current()); bool bNewMode = 0 != (::GetHtmlMode(pDocSh) & HTMLMODE_ON); - m_bFieldEdit = 0 == GetTabDialog(); + m_bFieldEdit = nullptr == GetTabDialog(); // newly initialise FieldManager. important for // Dok-Switch (fldtdlg:ReInitTabPage) @@ -110,7 +110,7 @@ void SwFieldPage::EditNewField( bool bOnlyActivate ) } m_nSelectionSel = LISTBOX_ENTRY_NOTFOUND; m_bRefresh = true; - Reset(0); + Reset(nullptr); m_bRefresh = false; } @@ -125,7 +125,7 @@ bool SwFieldPage::InsertField(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUS if (!IsFieldEdit()) // insert new field { - SwInsertField_Data aData(nTypeId, nSubType, rPar1, rPar2, nFormatId, 0, cSeparator, bIsAutomaticLanguage ); + SwInsertField_Data aData(nTypeId, nSubType, rPar1, rPar2, nFormatId, nullptr, cSeparator, bIsAutomaticLanguage ); //#i26566# provide parent for SwWrtShell::StartInputFieldDlg aData.m_pParent = &GetTabDialog()->GetOKButton(); bRet = m_aMgr.InsertField( aData ); @@ -237,7 +237,7 @@ bool SwFieldPage::InsertField(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUS case TYP_INPUTFLD: { // User- or SetField ? - if (m_aMgr.GetFieldType(RES_USERFLD, sPar1) == 0 && + if (m_aMgr.GetFieldType(RES_USERFLD, sPar1) == nullptr && !(pTmpField->GetSubType() & INP_TXT)) // SETEXPFLD { SwSetExpField* pField = static_cast<SwSetExpField*>(pTmpField); diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index 5bf7ed29211e..68580af6d0fc 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -61,10 +61,10 @@ protected: void Init(); void SavePos( const ListBox* pLst1, - const ListBox* pLst2 = 0, - const ListBox* pLst3 = 0); - void RestorePos( ListBox* pLst1, ListBox* pLst2 = 0, - ListBox* pLst3 = 0 ); + const ListBox* pLst2 = nullptr, + const ListBox* pLst3 = nullptr); + void RestorePos( ListBox* pLst1, ListBox* pLst2 = nullptr, + ListBox* pLst3 = nullptr ); void EnableInsert(bool bEnable = true); inline bool IsFieldEdit() const { return m_bFieldEdit; } diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 4b38523b2d73..66a5a42d43bf 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -52,7 +52,7 @@ SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet "modules/swriter/ui/fldrefpage.ui", rCoreSet) , maOutlineNodes() , maNumItems() - , mpSavedSelectedTextNode(0) + , mpSavedSelectedTextNode(nullptr) , mnSavedSelectedPos(0) { get(m_pTypeLB, "type"); @@ -127,7 +127,7 @@ void SwFieldRefPage::dispose() // #i83479# void SwFieldRefPage::SaveSelectedTextNode() { - mpSavedSelectedTextNode = 0; + mpSavedSelectedTextNode = nullptr; mnSavedSelectedPos = 0; if ( m_pSelectionToolTipLB->IsVisible() ) { @@ -642,12 +642,12 @@ void SwFieldRefPage::UpdateSubType() bool bEnable = m_pSelectionToolTipLB->GetEntryCount() != 0; m_pSelection->Enable( bEnable ); - if ( m_pSelectionToolTipLB->GetCurEntry() != 0 ) + if ( m_pSelectionToolTipLB->GetCurEntry() != nullptr ) { m_pSelectionToolTipLB->MakeVisible( m_pSelectionToolTipLB->GetCurEntry() ); } - if ( IsFieldEdit() && m_pSelectionToolTipLB->GetCurEntry() == 0 ) + if ( IsFieldEdit() && m_pSelectionToolTipLB->GetCurEntry() == nullptr ) { m_pNameED->SetText(sOldSel); } diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index ca4a4fa7f0cb..abb00aaefccb 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -66,14 +66,14 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pPa GetOKButton().SetClickHdl(LINK(this, SwFieldDlg, OKHdl)); - m_nDokId = AddTabPage("document", SwFieldDokPage::Create, 0); - m_nVarId = AddTabPage("variables", SwFieldVarPage::Create, 0); - m_nDokInf = AddTabPage("docinfo", SwFieldDokInfPage::Create, 0); + m_nDokId = AddTabPage("document", SwFieldDokPage::Create, nullptr); + m_nVarId = AddTabPage("variables", SwFieldVarPage::Create, nullptr); + m_nDokInf = AddTabPage("docinfo", SwFieldDokInfPage::Create, nullptr); if (!m_bHtmlMode) { - m_nRefId = AddTabPage("ref", SwFieldRefPage::Create, 0); - m_nFuncId = AddTabPage("functions", SwFieldFuncPage::Create, 0); + m_nRefId = AddTabPage("ref", SwFieldRefPage::Create, nullptr); + m_nFuncId = AddTabPage("functions", SwFieldFuncPage::Create, nullptr); utl::OConfigurationTreeRoot aCfgRoot = utl::OConfigurationTreeRoot::createWithComponentContext( @@ -87,7 +87,7 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pPa OUString("DatabaseFields")) >>= bDatabaseFields; if (bDatabaseFields) - m_nDbId = AddTabPage("database", SwFieldDBPage::Create, 0); + m_nDbId = AddTabPage("database", SwFieldDBPage::Create, nullptr); else RemoveTabPage("database"); } @@ -175,7 +175,7 @@ SfxItemSet* SwFieldDlg::CreateInputItemSet( sal_uInt16 nID ) return pISet; } else - return 0; + return nullptr; } // kick off inserting of new fields @@ -184,7 +184,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDlg, OKHdl, Button*, void) if (GetOKButton().IsEnabled()) { SfxTabPage* pPage = GetTabPage(GetCurPageId()); - pPage->FillItemSet(0); + pPage->FillItemSet(nullptr); GetOKButton().GrabFocus(); // because of InputField-Dlg } @@ -304,7 +304,7 @@ void SwFieldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) if (nId == m_nDbId) { SfxDispatcher* pDispatch = m_pBindings->GetDispatcher(); - SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0; + SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : nullptr; if(pViewFrame) { SfxViewShell* pViewShell = SfxViewShell::GetFirst( true, checkSfxViewShell<SwView> ); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 3dcbf74e2cb6..81e38b8aaf3d 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -354,7 +354,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox) } } } - if (GetCurField() != NULL && IsFieldEdit()) + if (GetCurField() != nullptr && IsFieldEdit()) { // GetFormula leads to problems with date formats because // only the numeric value without formatting is returned. @@ -498,7 +498,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox) pFieldTyp = GetFieldMgr().GetFieldType( RES_SETEXPFLD, sFieldTypeName ); else - pFieldTyp = 0; + pFieldTyp = nullptr; } if( GetCurField() && IsFieldEdit() ) @@ -650,7 +650,7 @@ void SwFieldVarPage::UpdateSubType() case TYP_SETREFPAGEFLD: { - if (GetCurField() != NULL + if (GetCurField() != nullptr && ((static_cast<SwRefPageSetField*>(GetCurField())->IsOn() && i) || (!static_cast<SwRefPageSetField*>(GetCurField()) ->IsOn() && !i))) @@ -682,7 +682,7 @@ void SwFieldVarPage::UpdateSubType() } const bool bEnable = m_pSelectionLB->GetEntryCount() != 0; - ListBox *pLB = 0; + ListBox *pLB = nullptr; if (bEnable) { @@ -723,7 +723,7 @@ sal_Int32 SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId) if( TYP_GETREFPAGEFLD != nTypeId ) { - if (GetCurField() != NULL && IsFieldEdit()) + if (GetCurField() != nullptr && IsFieldEdit()) { bSpecialFormat = GetCurField()->GetFormat() == SAL_MAX_UINT32; @@ -994,7 +994,7 @@ IMPL_LINK_TYPED( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) else if (nCurId == m_nApplyId) { OUString sName(m_pNameED->GetText()), sValue(m_pValueED->GetText()); - SwFieldType* pType = 0; + SwFieldType* pType = nullptr; sal_uInt16 nId = 0; sal_Int32 nNumFormatPos = m_pNumFormatLB->GetSelectEntryPos(); diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index c261f584830a..171bfec91edb 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -36,9 +36,9 @@ SwFieldInputDlg::SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rS, : SvxStandardDialog( pParent, "InputFieldDialog", "modules/swriter/ui/inputfielddialog.ui") , rSh( rS ) - , pInpField(0) - , pSetField(0) - , pUsrType(0) + , pInpField(nullptr) + , pSetField(nullptr) + , pUsrType(nullptr) { get(m_pLabelED, "name"); get(m_pEditED, "text"); @@ -73,7 +73,7 @@ SwFieldInputDlg::SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rS, case INP_USR: // user field - if( 0 != ( pUsrType = static_cast<SwUserFieldType*>(rSh.GetFieldType( + if( nullptr != ( pUsrType = static_cast<SwUserFieldType*>(rSh.GetFieldType( RES_USERFLD, pInpField->GetPar1() ) ) ) ) aStr = pUsrType->GetContent(); break; diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index ef953516cedd..de2b334556ac 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -45,8 +45,8 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) : bIsUrl(false), pSh(pWrtSh), - pFileDlg(NULL), - pOldDefDlgParent(NULL) + pFileDlg(nullptr), + pOldDefDlgParent(nullptr) { get(m_pTypeED, "scripttype"); get(m_pUrlRB, "url"); @@ -83,7 +83,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) : if( !bNew ) SetText( SW_RES( STR_JAVA_EDIT ) ); - RadioButtonHdl(NULL); + RadioButtonHdl(nullptr); } SwJavaEditDialog::~SwJavaEditDialog() @@ -118,7 +118,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, PrevHdl, Button*, void) pMgr->GoPrev(); pField = static_cast<SwScriptField*>(pMgr->GetCurField()); CheckTravel(); - RadioButtonHdl(NULL); + RadioButtonHdl(nullptr); } IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, NextHdl, Button*, void) @@ -129,7 +129,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, NextHdl, Button*, void) pMgr->GoNext(); pField = static_cast<SwScriptField*>(pMgr->GetCurField()); CheckTravel(); - RadioButtonHdl(NULL); + RadioButtonHdl(nullptr); } IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, OKHdl, Button*, void) |