diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:14:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:24 +0100 |
| commit | 217f7f236fd0ef0535cf11de35807bc5f1de9bb6 (patch) | |
| tree | f49d8a62e6500bd025853388b5dd9d33de357b9a /include | |
| parent | 6bab3811c374e3185ea07e7cb0d08f8b90ef81aa (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I9fe00eef7ddcd4a3c87e497a8d62f98e71a0d6d8
Diffstat (limited to 'include')
76 files changed, 174 insertions, 174 deletions
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 006b693890b0..0d1b8e493129 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -76,7 +76,7 @@ namespace accessibility // This has to be the instance of <AccessibleParaManager>, which // created and manages this accessible paragraph. AccessibleEditableTextPara ( const css::uno::Reference< css::accessibility::XAccessible >& rParent, - const AccessibleParaManager* _pParaManager = NULL ); + const AccessibleParaManager* _pParaManager = nullptr ); virtual ~AccessibleEditableTextPara (); diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 6500a0c90bed..d7e46488cbac 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -61,12 +61,12 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual sal_uInt16 GetEnumValue() const override; virtual void SetEnumValue( sal_uInt16 nNewVal ) override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 nFileVersion ) const override; diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index c8851cf48ed7..67830a704d26 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -40,14 +40,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) { diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index 58818451bffc..8bd272377ded 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -40,13 +40,13 @@ public: SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { SetValue(rBlink.GetValue()); diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index 5fbe55f3f60e..3e23250c2a69 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -69,13 +69,13 @@ namespace editeng { Color (*m_pColorGapFn)( Color ); public: - SvxBorderLine( const Color *pCol = 0, + SvxBorderLine( const Color *pCol = nullptr, long nWidth = 0, SvxBorderStyle nStyle = css::table::BorderLineStyle::SOLID, bool bUseLeftTop = false, Color (*pColorOutFn)( Color ) = &darkColor, Color (*pColorInFn)( Color ) = &darkColor, - Color (*pColorGapFn)( Color ) = NULL ); + Color (*pColorGapFn)( Color ) = nullptr ); SvxBorderLine( const SvxBorderLine& r ); SvxBorderLine& operator=( const SvxBorderLine& r ); @@ -83,7 +83,7 @@ namespace editeng { const Color& GetColor() const { return aColor; } Color GetColorOut( bool bLeftOrTop = true ) const; Color GetColorIn( bool bLeftOrTop = true ) const; - bool HasGapColor() const { return m_pColorGapFn != NULL; } + bool HasGapColor() const { return m_pColorGapFn != nullptr; } Color GetColorGap() const; void SetWidth( long nWidth = 0 ); diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index c8533fcdcbe8..763ed0899745 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -77,9 +77,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 nFileVersion ) const override; @@ -186,11 +186,11 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) 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; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool ScaleMetrics( long nMult, long nDiv ) override; diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 6d0e1ee26299..a6909f546cc2 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -79,13 +79,13 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = 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; - 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 SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index 2d9bae5c35c7..79929d402c40 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -63,7 +63,7 @@ public: SvxBulletItem( const SvxBulletItem& ); virtual ~SvxBulletItem(); - 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 SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const override; @@ -96,7 +96,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; static void StoreFont( SvStream&, const vcl::Font& ); static vcl::Font CreateFont( SvStream&, sal_uInt16 nVer ); diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index 8e008714782f..a735aea3641a 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -36,11 +36,11 @@ public: SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId ); - 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; inline SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) { SetValue(rHidden.GetValue()); diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 979fe5715085..34f39caa4f65 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -39,7 +39,7 @@ public: SvxCharReliefItem( FontRelief eValue /*= RELIEF_NONE*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; @@ -51,7 +51,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) 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/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index bededa42c4b3..74a90b50dae5 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -43,7 +43,7 @@ public: bool bFitIntoLine /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; @@ -52,7 +52,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) 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/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index e8a0738ace40..289d4d63ed4e 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -40,7 +40,7 @@ public: SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 nFileVersion ) const override; @@ -49,7 +49,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) 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/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index 95372c412158..ebb8994378b4 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -44,9 +44,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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; diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index 0e20f08202fd..942cb2586c9a 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -44,9 +44,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 OUString GetValueTextByPos( sal_uInt16 nPos ) const override; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index b7ae9574d3f1..828c58ea589b 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -51,9 +51,9 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper* pIntlWrapper = 0) const override; + OUString &rText, const IntlWrapper* pIntlWrapper = nullptr) const override; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; virtual SvStream& Store(SvStream& rStream, sal_uInt16 nVersion) const override; @@ -81,7 +81,7 @@ class EDITENG_DLLPUBLIC SvxBackgroundColorItem : public SvxColorItem SvxBackgroundColorItem(SvStream& rStrm, const sal_uInt16 nId); SvxBackgroundColorItem(const SvxBackgroundColorItem& rCopy); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SvStream& Store(SvStream& rStream, sal_uInt16 nVersion) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index 2fbf0aaf03da..4837c7023251 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -37,14 +37,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxContourItem& operator=(const SvxContourItem& rCont) { diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 9f0af96e42cc..fc1737932acf 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -43,9 +43,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 OUString GetValueTextByPos( sal_uInt16 nPos ) const override; diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index 349efd93045e..e92101c86101 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -340,7 +340,7 @@ struct EENotify sal_Int32 nParam2; EENotify( EENotifyType eType ) - { eNotificationType = eType; pEditEngine = NULL; pEditView = NULL; nParagraph = EE_PARA_NOT_FOUND; nParam1 = 0; nParam2 = 0; } + { eNotificationType = eType; pEditEngine = nullptr; pEditView = nullptr; nParagraph = EE_PARA_NOT_FOUND; nParam1 = 0; nParam2 = 0; } }; #endif // INCLUDED_EDITENG_EDITDATA_HXX diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 5f9779defe11..f60f826a19d5 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -160,7 +160,7 @@ private: EditEngine( const EditEngine& ) = delete; EditEngine& operator=( const EditEngine& ) = delete; - EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, vcl::Window* pFrameWin = NULL ); + EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, vcl::Window* pFrameWin = nullptr ); EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode); EDITENG_DLLPRIVATE void CheckIdleFormatter(); @@ -371,7 +371,7 @@ public: void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 ); // sal_uInt32: Error code of the stream. - sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); + sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr ); sal_uLong Write( SvStream& rOutput, EETextFormat ); void SetStatusEventHdl( const Link<EditStatus&,void>& rLink ); @@ -563,7 +563,7 @@ public: const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = css::i18n::CharacterIteratorMode::SKIPCELL); void SeekCursor( - ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = NULL, sal_uInt16 nIgnoreWhich = 0); + ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = nullptr, sal_uInt16 nIgnoreWhich = 0); EditPaM DeleteSelection(const EditSelection& rSel); @@ -602,7 +602,7 @@ public: const ViewsType& GetEditViews() const; void SetUndoMode(bool b); - void FormatAndUpdate(EditView* pCurView = NULL); + void FormatAndUpdate(EditView* pCurView = nullptr); bool Undo(EditView* pView); bool Redo(EditView* pView); diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index be36b0173829..6a0eac90b886 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -100,7 +100,7 @@ public: bool Store( SvStream& rOStream ) const; static EditTextObject* Create( - SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool = NULL ); + SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool = nullptr ); sal_Int32 GetParagraphCount() const; diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 7a1fcebf16b8..7de96d90dd0d 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -106,7 +106,7 @@ public: void SetWindow( vcl::Window* pWin ); vcl::Window* GetWindow() const; - void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); + void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = nullptr ); void Invalidate(); Pair Scroll( long nHorzScroll, long nVertScroll, ScrollRangeCheck nRangeCheck = ScrollRangeCheck::NoNegative ); @@ -149,7 +149,7 @@ public: void InsertText( const OUString& rNew, bool bSelect = false ); - bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = NULL ); + bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = nullptr ); bool MouseButtonUp( const MouseEvent& rMouseEvent ); bool MouseButtonDown( const MouseEvent& rMouseEvent ); @@ -177,7 +177,7 @@ public: void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 ); void RemoveAttribsKeepLanguages( bool bRemoveParaAttribs = false ); - sal_uInt32 Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); + sal_uInt32 Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr ); void SetBackgroundColor( const Color& rColor ); Color GetBackgroundColor() const; @@ -206,7 +206,7 @@ public: void SetAnchorMode( EVAnchorMode eMode ); EVAnchorMode GetAnchorMode() const; - void CompleteAutoCorrect( vcl::Window* pFrameWin = NULL ); + void CompleteAutoCorrect( vcl::Window* pFrameWin = nullptr ); EESpellState StartSpeller( bool bMultipleDoc = false ); EESpellState StartThesaurus(); @@ -219,12 +219,12 @@ public: bool IsCursorAtWrongSpelledWord( bool bMarkIfWrong = false ); bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false ); - void ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack = 0 ); + void ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack = nullptr ); void InsertField( const SvxFieldItem& rFld ); const SvxFieldItem* GetFieldUnderMousePointer() const; const SvxFieldItem* GetFieldUnderMousePointer( sal_Int32& nPara, sal_Int32& nPos ) const; - const SvxFieldItem* GetField( const Point& rPos, sal_Int32* pnPara = NULL, sal_Int32* pnPos = NULL ) const; + const SvxFieldItem* GetField( const Point& rPos, sal_Int32* pnPara = nullptr, sal_Int32* pnPos = nullptr ) const; const SvxFieldItem* GetFieldAtSelection() const; diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 4a1738e1e83a..da936d7def91 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -45,9 +45,9 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 nFileVersion ) const override; diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index cfeca83637cd..767af0af05c5 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -56,12 +56,12 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) 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; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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; diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index ac1a6d995125..7325fa02a156 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -55,9 +55,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 nItemVersion) const override; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 3b2523b2a404..25a59321176a 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -80,7 +80,7 @@ public: virtual ~SvxFieldItem(); 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 nVer ) const override; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index 4932a691107e..6afb9aaba87c 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -49,14 +49,14 @@ public: SvxFontListItem( const SvxFontListItem& rItem ); 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 QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) 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; const FontList* GetFontList() const { return pFontList; } }; diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index 2dc596b434bd..e12c2b3d83ee 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -50,7 +50,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16) const override; virtual SvStream& Store(SvStream& rStream, sal_uInt16 nItemVersion) const override; virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; @@ -58,7 +58,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper* = 0) const override; + OUString &rText, const IntlWrapper* = nullptr) const override; // Access methods: void SetFamilyName(const OUString& rFamilyName) diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 9fe72c8a8cd6..9dedc00be0c0 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -37,7 +37,7 @@ public: SvxForbiddenRuleItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; @@ -45,7 +45,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) const override; inline SvxForbiddenRuleItem& operator=( const SvxForbiddenRuleItem& rItem ) diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index e73cff48c30b..b8ca73d63185 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -51,10 +51,10 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) 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 SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override; diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index f676fe9c95fe..a4917b31d079 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -41,7 +41,7 @@ public: sal_uInt16 nWhich ); virtual ~SvxFrameDirectionItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; @@ -51,7 +51,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) 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/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index 45ac5aad3e78..494662ae55ec 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -49,9 +49,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool ScaleMetrics( long nMult, long nDiv ) override; diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index a29d635de2e9..c03a29a4cd5c 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -36,7 +36,7 @@ public: SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; @@ -44,7 +44,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) const override; inline SvxHangingPunctuationItem& operator=( const SvxHangingPunctuationItem& rItem ) diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index d008e278ef97..7f968f72a2e0 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -54,9 +54,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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; diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 22e3962fedc6..484df51ca67e 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -39,14 +39,14 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) 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; virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( sal_uInt16 nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) @@ -72,14 +72,14 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) 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; virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( sal_uInt16 nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) @@ -101,14 +101,14 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) 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; virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( sal_uInt16 nVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; SvxJustifyMethodItem& operator=(const SvxJustifyMethodItem& r); diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index ece244cc5ee7..cdba89bc3523 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -40,14 +40,14 @@ public: inline SvxFormatKeepItem& operator=( const SvxFormatKeepItem& rSplit ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; }; inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) : diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index fdac1564917c..e11cb7db8ab2 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -42,7 +42,7 @@ public: SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool ScaleMetrics( long nMult, long nDiv ) override; @@ -51,7 +51,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxKerningItem& operator=(const SvxKerningItem& rKern) { SetValue( rKern.GetValue() ); diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 653621be0f8a..192639be8581 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -44,9 +44,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 GetValueCount() const override; diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx index a1947c67446f..e331e91ca7c7 100644 --- a/include/editeng/lcolitem.hxx +++ b/include/editeng/lcolitem.hxx @@ -40,7 +40,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * pIntlWrapper = 0 ) + const IntlWrapper * pIntlWrapper = nullptr ) const override; inline SvxLineColorItem& operator=(const SvxLineColorItem& rColor) diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index b9f3c904d155..84b32282d436 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -52,9 +52,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool ScaleMetrics( long nMult, long nDiv ) override; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 94daed838586..0d39a7ef25ee 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -81,9 +81,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 nFileVersion ) const override; diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index 501946b49827..dc09423254dd 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -58,9 +58,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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; diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index a9a04ea2f5cf..5172c65e5b0e 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -32,14 +32,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH) { diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index bd0cc8317446..769df9863803 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -32,14 +32,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB) { diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 6c4a6500a773..fe39ef257640 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -178,7 +178,7 @@ public: void SetStart(sal_uInt16 nSet) {nStart = nSet;} sal_uInt16 GetStart() const {return nStart;} - virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0); + virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = nullptr, const sal_Int16* pOrient = nullptr); const SvxBrushItem* GetBrush() const {return pGraphicBrush;} void SetGraphic( const OUString& rName ); virtual void SetVertOrient(sal_Int16 eSet); @@ -298,7 +298,7 @@ public: SvxNumBulletItem(const SvxNumBulletItem& rCopy); virtual ~SvxNumBulletItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &rStream, sal_uInt16 nItemVersion) const override; sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual SvStream& Store(SvStream &rStream, sal_uInt16 nItemVersion ) const override; diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 84cde229bb3d..a8b2de3ea2a0 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -41,14 +41,14 @@ public: inline SvxOpaqueItem &operator=( const SvxOpaqueItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; }; inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const bool bOpa ) diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 69568e48f612..81a74bea7f8b 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -45,9 +45,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; css::uno::Reference< css::linguistic2::XSpellChecker1 > @@ -75,9 +75,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const override; virtual SvStream& Store( SvStream& rStrm, sal_uInt16 ) const override; diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index a3c473b96ada..0642a47722d6 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -39,14 +39,14 @@ public: SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans ) { diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 50df0a939a92..632f60d46309 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -225,8 +225,8 @@ public: void Scroll( long nHorzScroll, long nVertScroll ); - void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); - bool PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin = NULL ); + void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = nullptr ); + bool PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin = nullptr ); bool MouseButtonDown( const MouseEvent& ); bool MouseButtonUp( const MouseEvent& ); void ReleaseMouse(); @@ -263,7 +263,7 @@ public: bool AdjustHeight( long nDY ); - sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); + sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr ); void InsertText( const OUString& rNew, bool bSelect = false ); void InsertText( const OutlinerParaObject& rParaObj ); @@ -332,7 +332,7 @@ public: void ToggleBulletsNumbering( const bool bToggle, const bool bHandleBullets, - const SvxNumRule* pNumRule = NULL ); + const SvxNumRule* pNumRule = nullptr ); /** apply bullets/numbering for paragraphs @@ -369,7 +369,7 @@ public: bool IsCursorAtWrongSpelledWord( bool bMarkIfWrong = false ); bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false ); - void ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack = 0 ); + void ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack = nullptr ); void SetInvalidateMore( sal_uInt16 nPixel ); sal_uInt16 GetInvalidateMore() const; @@ -517,8 +517,8 @@ public: { pOutliner = pOutl; nPara = nPa; nPos = nPo; - pTxtColor = 0; pFldColor = 0; bSimpleClick = false; - mpSdrPage = 0; + pTxtColor = nullptr; pFldColor = nullptr; bSimpleClick = false; + mpSdrPage = nullptr; } ~EditFieldInfo() { @@ -538,7 +538,7 @@ public: void SetFieldColor( const Color& rColor ) { delete pFldColor; pFldColor = new Color( rColor ); } void ClearFieldColor() - { delete pFldColor; pFldColor = 0; } + { delete pFldColor; pFldColor = nullptr; } sal_Int32 GetPara() const { return nPara; } sal_Int32 GetPos() const { return nPos; } @@ -641,12 +641,12 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster OUString ImplGetBulletText( sal_Int32 nPara ); void ImplCheckNumBulletItem( sal_Int32 nPara ); void ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo, bool bUndoAction = false ); - void ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* pLevelStyle = NULL ); + void ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* pLevelStyle = nullptr ); void ImplBlockInsertionCallbacks( bool b ); void ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara ); - bool ImpConvertEdtToOut( sal_Int32 nPara, EditView* pView = 0 ); + bool ImpConvertEdtToOut( sal_Int32 nPara, EditView* pView = nullptr ); void ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount ); vcl::Font ImpCalcBulletFont( sal_Int32 nPara ) const; @@ -893,7 +893,7 @@ public: sal_Int32 GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const; sal_uLong GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine = 0 ); - sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); + sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr ); ::svl::IUndoManager& GetUndoManager(); ::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew); diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 56bc33f08994..f66dfeb3a982 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -40,7 +40,7 @@ public: SvxParaVertAlignItem( sal_uInt16 nValue /*= 0*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; @@ -49,7 +49,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) 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/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index d13cae123a76..79a4105693fa 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -43,13 +43,13 @@ public: inline SvxPaperBinItem &operator=( const SvxPaperBinItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; }; inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT ) diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index d32d7e26eefb..34089de2625f 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -39,14 +39,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) 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; }; #endif diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index 8e5c68df7020..458ce78c09db 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -42,12 +42,12 @@ public: sal_uInt16 nWh ); inline SvxPageModelItem& operator=( const SvxPageModelItem& rModel ); - 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; 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/editeng/postitem.hxx b/include/editeng/postitem.hxx index 3ffc6649132f..758df3b9a949 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -44,9 +44,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 OUString GetValueTextByPos( sal_uInt16 nPos ) const override; diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index bc4c43f66a61..9bd45c0b55c6 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -42,14 +42,14 @@ public: inline SvxPrintItem &operator=( const SvxPrintItem &rCpy ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; }; inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const bool bPrt ) diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index d8970407669b..7ce0b1c77aa0 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -50,10 +50,10 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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; diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx index 3952d80e9295..d825d5b40c94 100644 --- a/include/editeng/prszitem.hxx +++ b/include/editeng/prszitem.hxx @@ -38,14 +38,14 @@ public: const sal_uInt16 nID ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize) { diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx index abe0d1d4a0c6..67f09aceab4b 100644 --- a/include/editeng/rsiditem.hxx +++ b/include/editeng/rsiditem.hxx @@ -24,7 +24,7 @@ public: SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId, nRsid ) {} SvxRsidItem( SvStream& rIn, sal_uInt16 nId ) : SfxUInt32Item( nId, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 88e68cd0ca30..21264ec5216d 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -38,7 +38,7 @@ public: SvxScriptSpaceItem( bool bOn /*= false*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; @@ -46,7 +46,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) const override; inline SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem ) { diff --git a/include/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx index 4a914d5c9660..5e2bfcf7a0ae 100644 --- a/include/editeng/scripttypeitem.hxx +++ b/include/editeng/scripttypeitem.hxx @@ -37,7 +37,7 @@ public: TYPEINFO_OVERRIDE(); explicit SvxScriptTypeItem( SvtScriptType nType = SvtScriptType::LATIN ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; @@ -48,7 +48,7 @@ public: SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ); - 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; static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet, diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 175c000e073d..1fde4bb53f8d 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -42,7 +42,7 @@ public: TYPEINFO_OVERRIDE(); explicit SvxShadowItem( const sal_uInt16 nId , - const Color *pColor = 0, const sal_uInt16 nWidth = 100 /*5pt*/, + const Color *pColor = nullptr, const sal_uInt16 nWidth = 100 /*5pt*/, const SvxShadowLocation eLoc = SVX_SHADOW_NONE ); inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow ); @@ -55,9 +55,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool ScaleMetrics( long nMult, long nDiv ) override; diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 7b6f96074ace..01c649f756b1 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -40,14 +40,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { SetValue(rShadow.GetValue()); diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index 7540d00e3e87..d4b4a0a17c85 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -51,9 +51,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool ScaleMetrics( long nMult, long nDiv ) override; diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 4143674a766d..8726207bf418 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -42,14 +42,14 @@ public: inline SvxFormatSplitItem& operator=( const SvxFormatSplitItem& rSplit ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; }; inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) : diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 801f26c89fc0..1a43725de8e0 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -281,7 +281,7 @@ public: // to the actual SwTxtNode/EditNode string because it inserts the character // in rDoc and expects that to side-effect rTxt sal_uLong DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt, - sal_Int32 nPos, sal_Unicode cInsChar, bool bInsert, vcl::Window* pFrameWin = NULL ); + sal_Int32 nPos, sal_Unicode cInsChar, bool bInsert, vcl::Window* pFrameWin = nullptr ); // Return for the autotext expansion the previous word, // AutoCorrect - corresponding algorithm diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx index c84df967ac0d..869c4ef4c755 100644 --- a/include/editeng/svxfont.hxx +++ b/include/editeng/svxfont.hxx @@ -93,10 +93,10 @@ public: const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const; void QuickDrawText( OutputDevice *pOut, const Point &rPos, const OUString &rTxt, - const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32, const long* pDXArray = NULL ) const; + const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32, const long* pDXArray = nullptr ) const; Size QuickGetTextSize( const OutputDevice *pOut, const OUString &rTxt, - const sal_Int32 nIdx, const sal_Int32 nLen, long* pDXArray = NULL ) const; + const sal_Int32 nIdx, const sal_Int32 nLen, long* pDXArray = nullptr ) const; void DrawPrev( OutputDevice* pOut, Printer* pPrinter, const Point &rPos, const OUString &rTxt, diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index abe06ea0dac2..d521f1f1499f 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -59,7 +59,7 @@ class ContentNode; class EditNodeIdx { public: - EditNodeIdx(EditEngine* pEE, ContentNode* pNd = NULL); + EditNodeIdx(EditEngine* pEE, ContentNode* pNd = nullptr); ~EditNodeIdx() {} sal_Int32 GetIdx() const; EditNodeIdx* Clone() const; // Cloning itself @@ -269,7 +269,7 @@ protected: // Read Document-Info css::util::DateTime GetDateTimeStamp( ); OUString& GetTextToEndGroup( OUString& rStr ); - void ReadInfo( const sal_Char* pChkForVerNo = 0 ); + void ReadInfo( const sal_Char* pChkForVerNo = nullptr ); inline SfxItemSet& GetAttrSet(); // no text yet inserted? (SttPos from the top stack entry!) @@ -395,7 +395,7 @@ inline const Color& SvxRTFParser::GetColor( size_t nId ) const inline SfxItemSet& SvxRTFParser::GetAttrSet() { SvxRTFItemStackType* pTmp; - if( bNewGroup || 0 == ( pTmp = aAttrStack.empty() ? 0 : aAttrStack.back()) ) + if( bNewGroup || nullptr == ( pTmp = aAttrStack.empty() ? nullptr : aAttrStack.back()) ) pTmp = _GetAttrSet(); return pTmp->aAttrSet; } diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index b08d4dc47adf..ad87a3d5eb27 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -147,9 +147,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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; diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index 2c94a170a634..a5ebd4b2a823 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -40,14 +40,14 @@ public: // "pure virtual Methods" from SfxPoolItem 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 nVer) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const override; + const IntlWrapper* pIntl = nullptr ) 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/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index 3959f9a678d0..87e602517b72 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -43,9 +43,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 OUString GetValueTextByPos( sal_uInt16 nPos ) const override; @@ -92,7 +92,7 @@ public: SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; }; @@ -109,7 +109,7 @@ public: SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; }; diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index d71c699fcc61..e3573073cfea 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -55,9 +55,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 nFileVersion ) const override; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index f23103c2e41b..ff68e5584c52 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -297,8 +297,8 @@ public: const SvxItemPropertySet* getPropertySet() const throw() { return mpPropSet; } SvxEditSource* GetEditSource() const throw() { return mpEditSource; } - static bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ); - static bool GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, css::uno::Any& aAny, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ) throw( css::uno::RuntimeException ); + static bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = nullptr, SvxEditSource* pEditSource = nullptr ); + static bool GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, css::uno::Any& aAny, const ESelection* pSelection = nullptr, SvxEditSource* pEditSource = nullptr ) throw( css::uno::RuntimeException ); void attachField( const SvxFieldData* pData ) throw(); diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 70001f395766..51a347c3bbcb 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -44,9 +44,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 OUString GetValueTextByPos( sal_uInt16 nPos ) const override; diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index 243a96b2f6a5..ed1fedcfad9a 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -39,14 +39,14 @@ public: SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxWidowsItem& operator=( const SvxWidowsItem& rWidows ) { diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index c2b0bc516a52..7f5aabc58ede 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -36,7 +36,7 @@ public: SvxWritingModeItem& operator=( const SvxWritingModeItem& rItem ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; @@ -46,7 +46,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; + const IntlWrapper * = nullptr ) 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/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index 7f33039fb47f..68e4dac20feb 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -41,14 +41,14 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; inline SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) { diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index c0f104e75ba7..f1c5bac5a275 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -47,14 +47,14 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, - const IntlWrapper *pIntlWrapper = 0 ) const override; + const IntlWrapper *pIntlWrapper = nullptr ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) 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; - virtual SfxPoolItem *Clone( SfxItemPool * = 0) const override + virtual SfxPoolItem *Clone( SfxItemPool * = nullptr) const override { return new SvXMLAttrContainerItem( *this ); } bool AddAttr( const OUString& rLName, |