diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:13:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:22 +0100 |
| commit | b58d56c5109f4cf6cacfc8e9c424b179a65bf1f1 (patch) | |
| tree | bc7dcc71437367b193cb18dc5011c98ceb8c2c8b /cui/source/inc/iconcdlg.hxx | |
| parent | 5185569e502240a064ef78d06d9de7fbbd93f3b6 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I7257532b90e3e393d56d5349531c9ad397523bca
Diffstat (limited to 'cui/source/inc/iconcdlg.hxx')
| -rw-r--r-- | cui/source/inc/iconcdlg.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index b63e121a5442..a852d92828a0 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -58,7 +58,7 @@ struct IconChoicePageData : nId ( Id ), fnCreatePage ( fnPage ), fnGetRanges ( fnRanges ), - pPage ( NULL ), + pPage ( nullptr ), bOnDemand ( bDemand ), bRefresh ( false ) {} @@ -160,7 +160,7 @@ protected: virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ); static SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); inline IconChoicePage* GetTabPage( sal_uInt16 nPageId ) - { return ( GetPageData (nPageId)->pPage ? GetPageData (nPageId)->pPage.get() : NULL); } + { return ( GetPageData (nPageId)->pPage ? GetPageData (nPageId)->pPage.get() : nullptr); } static void RefreshInputSet(); void ActivatePageImpl (); @@ -173,14 +173,14 @@ public: // the IconChoiceCtrl's could also be set in the Ctor IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, - const SfxItemSet * pItemSet = 0 ); + const SfxItemSet * pItemSet = nullptr ); virtual ~IconChoiceDialog (); virtual void dispose() override; // interface SvxIconChoiceCtrlEntry* AddTabPage( sal_uInt16 nId, const OUString& rIconText, const Image& rChoiceIcon, - CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, + CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = nullptr /* NULL allowed*/, bool bItemsOnDemand = false, sal_uLong nPos = TREELIST_APPEND ); void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } |