From 6cd7bf2043146a630925a2e49336f02c802f707a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 Nov 2015 10:25:28 +0100 Subject: loplugin:nullptr (automatic rewrite) Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5 --- svx/source/dialog/imapdlg.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'svx/source/dialog/imapdlg.cxx') diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 12ed1babc5ef..34b1dbd7d424 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -117,7 +117,7 @@ VCL_BUILDER_FACTORY(StatusBar) SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window* _pParent) : SfxModelessDialog(_pBindings, pCW, _pParent, "ImapDialog", "svx/ui/imapdialog.ui") - , pCheckObj(NULL) + , pCheckObj(nullptr) , aIMapItem(SID_IMAP_EXEC, *this, *_pBindings) { get(m_pTbxIMapDlg1, "toolbar"); @@ -758,7 +758,7 @@ IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrModel* pModel = pWnd->GetSdrModel(); const SdrView* pView = pWnd->GetSdrView(); - const bool bPolyEdit = ( pObj != NULL ) && dynamic_cast( pObj) != nullptr; + const bool bPolyEdit = ( pObj != nullptr ) && dynamic_cast( pObj) != nullptr; const bool bDrawEnabled = !( bPolyEdit && m_pTbxIMapDlg1->IsItemChecked( mnPolyEditId ) ); m_pTbxIMapDlg1->EnableItem( mnApplyId, pOwnData->bExecState && pWnd->IsChanged() ); @@ -811,10 +811,10 @@ IMPL_LINK_NOARG_TYPED(SvxIMapDlg, MiscHdl, LinkParamNone*, void) SvxIMapDlg* GetIMapDlg() { - SfxChildWindow* pWnd = NULL; + SfxChildWindow* pWnd = nullptr; if (SfxViewFrame::Current() && SfxViewFrame::Current()->HasChildWindow(SvxIMapDlgChildWindow::GetChildWindowId())) pWnd = SfxViewFrame::Current()->GetChildWindow(SvxIMapDlgChildWindow::GetChildWindowId()); - return pWnd ? static_cast(pWnd->GetWindow()) : NULL; + return pWnd ? static_cast(pWnd->GetWindow()) : nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit