diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:14:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:25 +0100 |
| commit | f19dda5a55156afda2c6dde6c51c455cc5657fc2 (patch) | |
| tree | a0ec501f676cf5ec67aaf0eb3b8572dc1bad0db0 /extensions/source/propctrlr/standardcontrol.cxx | |
| parent | e1e967a1bb0f4e4fac50f353c990389ccc73a053 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I5bbef6c88255f3e8c740a5239a5010cf1251b7fa
Diffstat (limited to 'extensions/source/propctrlr/standardcontrol.cxx')
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index c83c8dab740c..00138e56cf9b 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -666,7 +666,7 @@ namespace pcr // initialize the color listbox XColorListRef pColorList; SfxObjectShell* pDocSh = SfxObjectShell::Current(); - const SfxPoolItem* pItem = pDocSh ? pDocSh->GetItem( SID_COLOR_TABLE ) : NULL; + const SfxPoolItem* pItem = pDocSh ? pDocSh->GetItem( SID_COLOR_TABLE ) : nullptr; if ( pItem ) { DBG_ASSERT(dynamic_cast< const SvxColorListItem* >(pItem) != nullptr, "OColorControl::OColorControl: invalid color item!"); @@ -1031,8 +1031,8 @@ namespace pcr DropDownEditControl::DropDownEditControl( vcl::Window* _pParent, WinBits _nStyle ) :Edit( _pParent, _nStyle ) - ,m_pFloatingEdit( NULL ) - ,m_pDropdownButton( NULL ) + ,m_pFloatingEdit( nullptr ) + ,m_pDropdownButton( nullptr ) ,m_nOperationMode( eStringList ) ,m_bDropdown(false) ,m_pHelper(nullptr) |