diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:24:53 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:47 +0100 |
commit | bf057fab3c0d17bf2832c8d9fc6d34b1b859e660 (patch) | |
tree | 7792f30782655fa9f0830b7320f9ff988c598fb1 /include/svl | |
parent | 6f06230da10c6a51c5538f1b5515b341475ea043 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I0f2f81dae91f62639e79799b1bed1b2df1fd79ab
Diffstat (limited to 'include/svl')
35 files changed, 91 insertions, 91 deletions
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index ed844fbd2c46..3dce3b88429f 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -52,7 +52,7 @@ public: virtual sal_uInt16 GetValueCount() const override; virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const override; virtual bool IsEnabled( sal_uInt16 ) const override; void DisableValue( sal_uInt16 ); diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index a14f0c77b9b3..ad9ce1867629 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, - const IntlWrapper * = 0) + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any & rVal, sal_uInt8 = 0) const override; diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 1ea75ae8e07f..a6861141fe3e 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -45,7 +45,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, - const IntlWrapper * = 0) + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -58,7 +58,7 @@ public: virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override; + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; sal_uInt8 GetValue() const { return m_nValue; } @@ -95,7 +95,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, - const IntlWrapper * = 0) + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -108,7 +108,7 @@ public: virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override; + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; sal_uInt16 GetValue() const { return m_nValue; } @@ -145,7 +145,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, - const IntlWrapper * = 0) + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -158,7 +158,7 @@ public: virtual SvStream & Store(SvStream &, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override; + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; sal_Int32 GetValue() const { return m_nValue; } @@ -195,7 +195,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, - const IntlWrapper * = 0) + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -208,7 +208,7 @@ public: virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override; + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; sal_uInt32 GetValue() const { return m_nValue; } diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx index 991a8036ec08..a9fb8e1aa771 100644 --- a/include/svl/cntwall.hxx +++ b/include/svl/cntwall.hxx @@ -47,7 +47,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItemVersion ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index bd72434ae87f..64beb5fe4181 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -45,7 +45,7 @@ public: virtual sal_uInt16 GetVersion(sal_uInt16) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = NULL ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; void SetValue( const OUString& rNewVal ); @@ -53,7 +53,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString & rText, - const IntlWrapper* pIntlWrapper = 0 ) const override; + const IntlWrapper* pIntlWrapper = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 4c59264de5e1..142c4c33c344 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -49,7 +49,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, - const IntlWrapper * = 0) + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -57,7 +57,7 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override; + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; const OUString & GetValue() const { return m_aValue; } diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index 46c8534327ea..84d9f4270ae4 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -91,7 +91,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, - const IntlWrapper * = 0) + const IntlWrapper * = nullptr) const override; virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 = 0) const override; @@ -104,7 +104,7 @@ public: virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override; + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; virtual OUString GetValueTextByVal(bool bTheValue) const; }; diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 3f7db59cc996..bf92859b07c5 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -232,7 +232,7 @@ protected: // three phase constructor for sub-classes SfxMiniRecordReader() - : _pStream(NULL) + : _pStream(nullptr) , _nEofRec(0) , _bSkipped(false) , _nPreTag(0) diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index 71324d81510c..3b78d7ed6cd9 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -43,12 +43,12 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString & rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) const override; sal_uInt16 GetValue() const { return nVal; } void SetValue( sal_uInt16 nNewVal ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index 3e552c2e40e6..7128cda41350 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.hxx @@ -35,7 +35,7 @@ public: virtual ~SfxGlobalNameItem(); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; SvGlobalName GetValue() const { return m_aName; } virtual bool PutValue ( const css::uno::Any& rVal, diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index 9fc6949eb69c..95bcf11b7ba8 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -26,7 +26,7 @@ public: TYPEINFO_OVERRIDE(); SfxGrabBagItem(); - SfxGrabBagItem(sal_uInt16 nWhich, const std::map<OUString, css::uno::Any>* pMap = 0); + SfxGrabBagItem(sal_uInt16 nWhich, const std::map<OUString, css::uno::Any>* pMap = nullptr); SfxGrabBagItem(const SfxGrabBagItem& rItem); virtual ~SfxGrabBagItem(); @@ -41,7 +41,7 @@ public: } virtual bool operator==(const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index 64410a8e0196..e3f2bc56f216 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -46,7 +46,7 @@ public: void GetList( ::std::vector < sal_Int32 >& rList ) const; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; }; diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index a6bfd1d09176..662eed5dc7ff 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -33,7 +33,7 @@ public: SfxImageItem( const SfxImageItem& ); virtual ~SfxImageItem(); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx index 59d63d6d1b42..4fe32060585b 100644 --- a/include/svl/inettype.hxx +++ b/include/svl/inettype.hxx @@ -219,8 +219,8 @@ class SVL_DLLPUBLIC INetContentTypes public: static INetContentType RegisterContentType(OUString const & rTypeName, OUString const & rPresentation, - OUString const * pExtension = 0, - OUString const * pSystemFileType = 0); + OUString const * pExtension = nullptr, + OUString const * pSystemFileType = nullptr); static INetContentType GetContentType(OUString const & rTypeName); @@ -237,7 +237,7 @@ public: static bool parse(OUString const & rMediaType, OUString & rType, OUString & rSubType, - INetContentTypeParameterList * pParameters = 0); + INetContentTypeParameterList * pParameters = nullptr); }; #endif // INCLUDED_SVL_INETTYPE_HXX diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index feb0734e77d9..3402e1d96d68 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -28,7 +28,7 @@ public: virtual bool GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, - OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const override; + OUString& rText, const IntlWrapper* pIntlWrapper = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -40,7 +40,7 @@ public: virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pOther = NULL ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pOther = nullptr ) const override; sal_Int64 GetValue() const { return mnValue;} diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 9ecbfce68b2d..ff5e7af020aa 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -34,7 +34,7 @@ public: virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override { return new SfxByteItem(*this); } }; @@ -62,7 +62,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, - const IntlWrapper * = 0) + const IntlWrapper * = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, @@ -75,7 +75,7 @@ public: virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override; + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; sal_Int16 GetValue() const { return m_nValue; } @@ -103,7 +103,7 @@ public: virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override { return new SfxUInt16Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override { return new SfxUInt16Item(*this); } void dumpAsXml(struct _xmlTextWriter* pWriter) const override; @@ -124,7 +124,7 @@ public: virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override { return new SfxInt32Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override { return new SfxInt32Item(*this); } }; @@ -144,7 +144,7 @@ public: virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override { return new SfxUInt32Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override { return new SfxUInt32Item(*this); } }; diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 8098e415572a..a719a11c69da 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -103,7 +103,7 @@ public: SfxItemPool( const OUString &rName, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxItemInfo *pItemInfos, - SfxPoolItem **pDefaults = 0, + SfxPoolItem **pDefaults = nullptr, bool bLoadRefCounts = true ); protected: @@ -154,7 +154,7 @@ public: virtual bool GetPresentation( const SfxPoolItem& rItem, SfxMapUnit ePresentationMetric, OUString& rText, - const IntlWrapper * pIntlWrapper = 0 ) const; + const IntlWrapper * pIntlWrapper = nullptr ) const; virtual SfxItemPool* Clone() const; const OUString& GetName() const; @@ -164,7 +164,7 @@ public: const SfxPoolItem* LoadItem( SvStream &rStream, bool bDirect = false, - const SfxItemPool *pRefPool = 0 ); + const SfxItemPool *pRefPool = nullptr ); bool StoreItem( SvStream &rStream, const SfxPoolItem &rItem, bool bDirect = false ) const; @@ -175,7 +175,7 @@ public: sal_uInt32 GetItemCount2(sal_uInt16 nWhich) const; const SfxPoolItem* LoadSurrogate(SvStream& rStream, sal_uInt16 &rWhich, sal_uInt16 nSlotId, - const SfxItemPool* pRefPool = 0 ); + const SfxItemPool* pRefPool = nullptr ); bool StoreSurrogate(SvStream& rStream, const SfxPoolItem *pItem ) const; diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index c3710dbd5961..3c2cba1e0e7d 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -71,7 +71,7 @@ public: SfxItemSet( SfxItemPool&, const sal_uInt16* nWhichPairTable ); virtual ~SfxItemSet(); - virtual SfxItemSet * Clone(bool bItems = true, SfxItemPool *pToPool = 0) const; + virtual SfxItemSet * Clone(bool bItems = true, SfxItemPool *pToPool = nullptr) const; // Get number of items sal_uInt16 Count() const { return m_nCount; } @@ -112,9 +112,9 @@ public: // Get item-status SfxItemState GetItemState( sal_uInt16 nWhich, bool bSrchInParent = true, - const SfxPoolItem **ppItem = 0 ) const; + const SfxPoolItem **ppItem = nullptr ) const; - bool HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem = NULL) const; + bool HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem = nullptr) const; void DisableItem(sal_uInt16 nWhich); void InvalidateItem( sal_uInt16 nWhich ); @@ -149,7 +149,7 @@ public: const SfxItemSet* GetParent() const { return m_pParent; } SvStream & Load( SvStream &, bool bDirect = false, - const SfxItemPool *pRefPool = 0 ); + const SfxItemPool *pRefPool = nullptr ); SvStream & Store( SvStream &, bool bDirect = false ) const; bool operator==(const SfxItemSet &) const; @@ -176,7 +176,7 @@ public: SfxAllItemSet( const SfxItemSet & ); SfxAllItemSet( const SfxAllItemSet & ); - virtual SfxItemSet * Clone( bool bItems = true, SfxItemPool *pToPool = 0 ) const override; + virtual SfxItemSet * Clone( bool bItems = true, SfxItemPool *pToPool = nullptr ) const override; virtual const SfxPoolItem* Put( const SfxPoolItem&, sal_uInt16 nWhich ) override; using SfxItemSet::Put; }; diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index 716e8fce8ea9..589bcff52078 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -36,7 +36,7 @@ public: virtual ~SfxLockBytesItem(); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index fbded02af880..43e9a394048f 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -130,8 +130,8 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + const IntlWrapper * = nullptr ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; diff --git a/include/svl/nranges.hxx b/include/svl/nranges.hxx index 497f3a1b296b..4cc9fc213f89 100644 --- a/include/svl/nranges.hxx +++ b/include/svl/nranges.hxx @@ -31,7 +31,7 @@ class SfxUShortRanges sal_uInt16* _pRanges; // 0-terminated array of sal_uInt16-pairs public: - SfxUShortRanges() : _pRanges( 0 ) {} + SfxUShortRanges() : _pRanges( nullptr ) {} SfxUShortRanges( const SfxUShortRanges &rOrig ); SfxUShortRanges( sal_uInt16 nWhich1, sal_uInt16 nWhich2 ); SfxUShortRanges( const sal_uInt16* nNumTable ); diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx index 8b9f3672da01..b32dc3608663 100644 --- a/include/svl/ondemand.hxx +++ b/include/svl/ondemand.hxx @@ -67,8 +67,8 @@ class OnDemandLocaleDataWrapper public: OnDemandLocaleDataWrapper() : eLastAnyLanguage( LANGUAGE_DONTKNOW ) - , pEnglish(0) - , pAny(0) + , pEnglish(nullptr) + , pAny(nullptr) , bInitialized(false) { pCurrent = pSystem = aSysLocale.GetLocaleDataPtr(); @@ -78,9 +78,9 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ) - : pEnglish(0) - , pAny(0) - , pCurrent(0) + : pEnglish(nullptr) + , pAny(nullptr) + , pCurrent(nullptr) , bInitialized(false) { pSystem = aSysLocale.GetLocaleDataPtr(); @@ -156,7 +156,7 @@ class OnDemandCalendarWrapper public: OnDemandCalendarWrapper() - : pPtr(0) + : pPtr(nullptr) , bValid(false) , bInitialized(false) {} @@ -184,7 +184,7 @@ public: if ( pPtr ) { delete pPtr; - pPtr = NULL; + pPtr = nullptr; } bInitialized = true; } @@ -229,7 +229,7 @@ public: OnDemandTransliterationWrapper() : eLanguage( LANGUAGE_SYSTEM ) , nType(css::i18n::TransliterationModules_END_OF_MODULE) - , pPtr(0) + , pPtr(nullptr) , bValid(false) , bInitialized(false) {} @@ -262,7 +262,7 @@ public: if ( pPtr ) { delete pPtr; - pPtr = NULL; + pPtr = nullptr; } bInitialized = true; } @@ -304,13 +304,13 @@ class OnDemandNativeNumberWrapper public: OnDemandNativeNumberWrapper() - : pPtr(0) + : pPtr(nullptr) , bInitialized(false) {} OnDemandNativeNumberWrapper( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - : pPtr(0) + : pPtr(nullptr) , bInitialized(false) { init( rxContext ); @@ -328,7 +328,7 @@ public: if ( pPtr ) { delete pPtr; - pPtr = NULL; + pPtr = nullptr; } bInitialized = true; } diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index f6a7df9b98bf..ff83ea32df8b 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -175,7 +175,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, - const IntlWrapper * pIntlWrapper = 0 ) const; + const IntlWrapper * pIntlWrapper = nullptr ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; virtual bool ScaleMetrics( long lMult, long lDiv ); @@ -186,7 +186,7 @@ public: virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nItemVersion ) const; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const = 0; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const = 0; sal_uLong GetRefCount() const { return m_nRefCount; } inline SfxItemKind GetKind() const { return m_nKind; } @@ -264,10 +264,10 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) const override; // create a copy of itself - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem @@ -280,7 +280,7 @@ public: TYPEINFO_OVERRIDE(); SfxSetItem( sal_uInt16 nWhich, SfxItemSet *pSet ); SfxSetItem( sal_uInt16 nWhich, const SfxItemSet &rSet ); - SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = 0 ); + SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = nullptr ); virtual ~SfxSetItem(); virtual bool operator==( const SfxPoolItem& ) const override; @@ -289,10 +289,10 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) const override; // create a copy of itself - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override = 0; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override = 0; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const override = 0; virtual SvStream& Store(SvStream &, sal_uInt16 nVer) const override; diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 92dd2abaa2b1..4e5e51dddf85 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -40,11 +40,11 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 5031f0732f53..c6bab73dc38c 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -41,10 +41,10 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index a449a9339b47..8739be11e4e5 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -42,8 +42,8 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + const IntlWrapper * = nullptr ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; inline sal_uInt16& From() { return nFrom; } virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; @@ -67,8 +67,8 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + const IntlWrapper * = nullptr ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; }; diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 9f1fac772b1c..57bc2e34eaea 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -37,7 +37,7 @@ public: TYPEINFO_OVERRIDE(); SfxStringListItem(); - SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=NULL ); + SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=nullptr ); SfxStringListItem( sal_uInt16 nWhich, SvStream& rStream ); SfxStringListItem( const SfxStringListItem& rItem ); virtual ~SfxStringListItem(); @@ -58,8 +58,8 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + const IntlWrapper * = nullptr ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 7a48eebf492c..acca4911fbcb 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -101,11 +101,11 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool operator == ( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; // ConfigItem virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override; diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index ad775c5f5424..ca20acc142f5 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -40,7 +40,7 @@ public: virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override; + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svl/style.hxx b/include/svl/style.hxx index cff7f49dfcee..c1d9a8209b7a 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -280,7 +280,7 @@ public: protected: SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2 - : SfxStyleSheetBase(OUString("dummy"), NULL, SFX_STYLE_FAMILY_ALL, 0) + : SfxStyleSheetBase(OUString("dummy"), nullptr, SFX_STYLE_FAMILY_ALL, 0) { assert(false); } diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx index 18f3bef940e1..f12528ad56c4 100644 --- a/include/svl/stylepool.hxx +++ b/include/svl/stylepool.hxx @@ -33,7 +33,7 @@ private: public: typedef std::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t; - explicit StylePool( SfxItemSet* pIgnorableItems = 0 ); + explicit StylePool( SfxItemSet* pIgnorableItems = nullptr ); /** Insert a SfxItemSet into the style pool. diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index 3d9894ba4f42..f9d3d1248fae 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -41,7 +41,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, @@ -49,7 +49,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; }; diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index aacc127d13e3..96c77cb600f1 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -117,7 +117,7 @@ struct SVL_DLLPUBLIC SfxUndoArray SfxUndoArray *pFatherUndoArray; SfxUndoArray(size_t nMax=0): nMaxUndoActions(nMax), nCurUndoAction(0), - pFatherUndoArray(0) {} + pFatherUndoArray(nullptr) {} virtual ~SfxUndoArray(); }; diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 107c8087b3d4..0819d35f28e5 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -50,7 +50,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, - const IntlWrapper * = 0) + const IntlWrapper * = nullptr) const override; virtual bool QueryValue( css::uno::Any& rVal, @@ -63,7 +63,7 @@ public: virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override; + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; OUString GetValueTextByVal(bool bTheValue) const; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 216d354d3db1..2e3760e084ee 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -704,8 +704,8 @@ public: returned, even if the format code only contains [$xxx] ! */ bool GetNewCurrencySymbolString( sal_uInt32 nFormat, OUString& rSymbol, - const NfCurrencyEntry** ppEntry = NULL, - bool* pBank = NULL ) const; + const NfCurrencyEntry** ppEntry = nullptr, + bool* pBank = nullptr ) const; /** Look up the corresponding NfCurrencyEntry matching rSymbol (may be CurrencySymbol or CurrencyAbbreviation) and possibly |