diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-05-26 12:31:02 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-05-26 12:34:05 +0300 |
| commit | e63036368ab225ad03bfcc5fea15bc748ed49775 (patch) | |
| tree | 26c3fc8429e65f4e1eff5a27ddece1b9ee3a4bed /sw/source/uibase/sidebar | |
| parent | cc12a1b7277f8b6651655462c38b1ed418722fcb (diff) | |
loplugin:nullptr
Change-Id: Ic0802a92e857b427bd95840b16078f8f3c308a52
Diffstat (limited to 'sw/source/uibase/sidebar')
| -rw-r--r-- | sw/source/uibase/sidebar/PageMarginPanel.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/sidebar/PageMarginPanel.cxx b/sw/source/uibase/sidebar/PageMarginPanel.cxx index 2bb51273fc9a..b6e5a9ed1f39 100644 --- a/sw/source/uibase/sidebar/PageMarginPanel.cxx +++ b/sw/source/uibase/sidebar/PageMarginPanel.cxx @@ -42,12 +42,12 @@ VclPtr<vcl::Window> PageMarginPanel::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings) { - if( pParent == NULL ) - throw ::com::sun::star::lang::IllegalArgumentException("no parent window given to PageMarginPanel::Create", NULL, 0); + if( !pParent ) + throw ::com::sun::star::lang::IllegalArgumentException("no parent window given to PageMarginPanel::Create", nullptr, 0); if( !rxFrame.is() ) - throw ::com::sun::star::lang::IllegalArgumentException("no XFrame given to PageMarginPanel::Create", NULL, 0); - if( pBindings == NULL ) - throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to PageMarginPanel::Create", NULL, 0); + throw ::com::sun::star::lang::IllegalArgumentException("no XFrame given to PageMarginPanel::Create", nullptr, 0); + if( !pBindings ) + throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to PageMarginPanel::Create", nullptr, 0); return VclPtr<PageMarginPanel>::Create(pParent, rxFrame, pBindings); } @@ -119,7 +119,7 @@ void PageMarginPanel::MetricState( SfxItemState eState, const SfxPoolItem* pStat else { SfxViewFrame* pFrame = SfxViewFrame::Current(); - SfxObjectShell* pSh = NULL; + SfxObjectShell* pSh = nullptr; if ( pFrame ) pSh = pFrame->GetObjectShell(); if ( pSh ) |