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/tbxctrls/PaletteManager.cxx | |
| parent | 28f4bee7bd7378141d8569186162e1a3166eb012 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
Diffstat (limited to 'svx/source/tbxctrls/PaletteManager.cxx')
| -rw-r--r-- | svx/source/tbxctrls/PaletteManager.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index 1e17072c0e7e..430623ebc500 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -36,7 +36,7 @@ PaletteManager::PaletteManager() : mnNumOfPalettes(2), mnCurrentPalette(0), mnColorCount(0), - mpBtnUpdater(NULL), + mpBtnUpdater(nullptr), mLastColor(COL_AUTO), maColorSelectFunction(PaletteManager::DispatchColorCommand) { @@ -112,8 +112,8 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet &rColorSet) if ( pDocSh ) { - const SfxPoolItem* pItem = NULL; - if ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) + const SfxPoolItem* pItem = nullptr; + if ( nullptr != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); } @@ -228,7 +228,7 @@ void PaletteManager::PopupColorPicker(const OUString& aCommand) { // The calling object goes away during aColorDlg.Execute(), so we must copy this OUString aCommandCopy = aCommand; - SvColorDialog aColorDlg( 0 ); + SvColorDialog aColorDlg( nullptr ); aColorDlg.SetColor ( mLastColor ); aColorDlg.SetMode( svtools::ColorPickerMode_MODIFY ); if( aColorDlg.Execute() == RET_OK ) |