diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:28 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:50 +0100 |
commit | 6cd7bf2043146a630925a2e49336f02c802f707a (patch) | |
tree | 786cecd8ab993e25cda497d45b68007050c30d61 /svx/source/gallery2/galbrws1.cxx | |
parent | 28f4bee7bd7378141d8569186162e1a3166eb012 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
Diffstat (limited to 'svx/source/gallery2/galbrws1.cxx')
-rw-r--r-- | svx/source/gallery2/galbrws1.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index f8153ff6c762..440c5eaf8ea5 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -115,7 +115,7 @@ GalleryBrowser1::GalleryBrowser1( mpThemes ( VclPtr<GalleryThemeListBox>::Create( this, WB_TABSTOP | WB_3DLOOK | WB_BORDER | WB_HSCROLL | WB_VSCROLL | WB_AUTOHSCROLL | WB_SORT ) ), mpGallery ( pGallery ), mpExchangeData ( new ExchangeData ), - mpThemePropsDlgItemSet( NULL ), + mpThemePropsDlgItemSet( nullptr ), aImgNormal ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_NORMAL ) ), aImgDefault ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_DEFAULT ) ), aImgReadOnly ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_READONLY ) ), @@ -154,14 +154,14 @@ void GalleryBrowser1::dispose() EndListening( *mpGallery ); mpThemes.disposeAndClear(); delete mpExchangeData; - mpExchangeData = NULL; + mpExchangeData = nullptr; maNewTheme.disposeAndClear(); Control::dispose(); } sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ) { - static const bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL ); + static const bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != nullptr ); sal_uIntPtr nRet = LISTBOX_ENTRY_NOTFOUND; @@ -229,7 +229,7 @@ void GalleryBrowser1::ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec) if( pTheme ) { bool bUpdateAllowed, bRenameAllowed, bRemoveAllowed; - static const bool bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL ); + static const bool bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != nullptr ); if( pTheme->IsReadOnly() ) bUpdateAllowed = bRenameAllowed = bRemoveAllowed = false; @@ -269,7 +269,7 @@ void GalleryBrowser1::ImplGalleryThemeProperties( const OUString & rThemeName, b SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); assert(pFact && "Got no AbstractDialogFactory!"); - VclAbstractDialog2* pThemeProps = pFact->CreateGalleryThemePropertiesDialog( NULL, mpExchangeData, mpThemePropsDlgItemSet ); + VclAbstractDialog2* pThemeProps = pFact->CreateGalleryThemePropertiesDialog( nullptr, mpExchangeData, mpThemePropsDlgItemSet ); assert(pThemeProps && "Got no GalleryThemePropertiesDialog!"); if ( bCreateNew ) @@ -342,7 +342,7 @@ IMPL_LINK_TYPED( GalleryBrowser1, DestroyThemePropertiesDlgHdl, void*, p, void ) VclAbstractDialog2* pDialog = static_cast<VclAbstractDialog2*>(p); delete pDialog; delete mpThemePropsDlgItemSet; - mpThemePropsDlgItemSet = 0; + mpThemePropsDlgItemSet = nullptr; } void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) @@ -526,13 +526,13 @@ bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) switch( rKEvt.GetKeyCode().GetCode() ) { case( KEY_INSERT ): - ClickNewThemeHdl( NULL ); + ClickNewThemeHdl( nullptr ); break; case( KEY_I ): { if( bMod1 ) - ClickNewThemeHdl( NULL ); + ClickNewThemeHdl( nullptr ); } break; |