diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:50 +0100 |
| commit | 6cd7bf2043146a630925a2e49336f02c802f707a (patch) | |
| tree | 786cecd8ab993e25cda497d45b68007050c30d61 /include/svx | |
| parent | 28f4bee7bd7378141d8569186162e1a3166eb012 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
Diffstat (limited to 'include/svx')
164 files changed, 401 insertions, 401 deletions
diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index 825176b78f18..3381acd18ac2 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -30,13 +30,13 @@ private: public: TYPEINFO_OVERRIDE(); - AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix = 0); + AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix = nullptr); AffineMatrixItem(SvStream& rIn); AffineMatrixItem(const AffineMatrixItem&); virtual ~AffineMatrixItem(); 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& rIn, sal_uInt16 nVer ) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx index c71bf7fe59f1..a5308f082761 100644 --- a/include/svx/IAccessibleParent.hxx +++ b/include/svx/IAccessibleParent.hxx @@ -83,12 +83,12 @@ public: //Add this method to support Form Controls virtual AccessibleControlShape* GetAccControlShapeFromModel (css::beans::XPropertySet*) - throw (css::uno::RuntimeException){return NULL;}; + throw (css::uno::RuntimeException){return nullptr;}; virtual css::uno::Reference< css::accessibility::XAccessible> GetAccessibleCaption (const css::uno::Reference< css::drawing::XShape>&) - throw (css::uno::RuntimeException){return NULL;}; + throw (css::uno::RuntimeException){return nullptr;}; virtual bool IsDocumentSelAll(){ return false; } }; diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx index 022212541911..85573017690d 100644 --- a/include/svx/ShapeTypeHandler.hxx +++ b/include/svx/ShapeTypeHandler.hxx @@ -66,7 +66,7 @@ struct ShapeTypeDescriptor ShapeTypeDescriptor() : mnShapeTypeId (-1), msServiceName (), - maCreateFunction (NULL) + maCreateFunction (nullptr) {} }; diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx index 0d6dca01f69d..6b0c78564a92 100644 --- a/include/svx/SmartTagItem.hxx +++ b/include/svx/SmartTagItem.hxx @@ -65,7 +65,7 @@ public: // "pure virtual Methoden" vom 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) const override; // leer virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; // leer virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index ed82e3bd01c5..a550f6a852d7 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -43,14 +43,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 SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation) @@ -84,10 +84,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 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& rStream, sal_uInt16 nVer ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const override; diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index 47ef27aaa0b0..f633d50b1cc1 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -50,7 +50,7 @@ public: void InsertEntry ( const OUString& rStr, sal_uLong nPos = TREELIST_APPEND, - void* pUserData = NULL, + void* pUserData = nullptr, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); void RemoveEntry ( sal_uLong nPos ); diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index ef99a35caed1..28734b791f93 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -170,7 +170,7 @@ public: sal_uInt16 nId ); SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; sal_uInt16 GetValueCount() const override { return CHSTYLE_COUNT; } @@ -185,7 +185,7 @@ public: sal_uInt16 nId ); SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; sal_uInt16 GetValueCount() const override { return CHREGRESS_COUNT; } @@ -201,7 +201,7 @@ public: SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; sal_uInt16 GetValueCount() const override { return CHDESCR_COUNT; } @@ -216,7 +216,7 @@ public: SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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; @@ -234,7 +234,7 @@ public: SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; sal_uInt16 GetValueCount() const override { return CHTXTORDER_COUNT; } @@ -249,7 +249,7 @@ public: SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; sal_uInt16 GetValueCount() const override { return CHERROR_COUNT; } @@ -268,7 +268,7 @@ public: SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; sal_uInt16 GetValueCount() const override { return CHINDICATE_COUNT; } @@ -294,10 +294,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 bool operator == (const SfxPoolItem&) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const override; + virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index f2588fcb5fdb..91a353adefa0 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFormatItem : public SfxPoolItem protected: virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; public: TYPEINFO_OVERRIDE(); diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index 4ce568103a20..ee3dd3ec9ac2 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -69,10 +69,10 @@ public: const void* GetEditingObject() const; void Update( const Graphic& rGraphic, bool bGraphicLinked, - const tools::PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); + const tools::PolyPolygon* pPolyPoly = nullptr, void* pEditingObj = nullptr ); static tools::PolyPolygon CreateAutoContour( const Graphic& rGraphic, - const Rectangle* pRect = NULL, + const Rectangle* pRect = nullptr, const sal_uIntPtr nFlags = 0L ); }; diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index ab9d01ee779d..4e6c81791426 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -143,14 +143,14 @@ public: The rStr contains the entire redline entry; the columns are delimited by '\t'. */ SvTreeListEntry* InsertEntry(const OUString &rStr, RedlinData *pUserData, - SvTreeListEntry* pParent = NULL, sal_uIntPtr nPos = TREELIST_APPEND); + SvTreeListEntry* pParent = nullptr, sal_uIntPtr nPos = TREELIST_APPEND); /** Insert a redline entry. The rStr contains the entire redline entry; the columns are delimited by '\t'. */ SvTreeListEntry* InsertEntry(const OUString &rStr, RedlinData *pUserData, const Color&, - SvTreeListEntry* pParent = NULL, sal_uIntPtr nPos = TREELIST_APPEND); + SvTreeListEntry* pParent = nullptr, sal_uIntPtr nPos = TREELIST_APPEND); /** Insert a redline entry. @@ -158,7 +158,7 @@ public: rStr contains the rest of the redline entry; the columns are delimited by '\t'. */ SvTreeListEntry* InsertEntry(const Image &rRedlineType, const OUString &rStr, RedlinData *pUserData, - SvTreeListEntry* pParent = NULL, sal_uIntPtr nPos = TREELIST_APPEND); + SvTreeListEntry* pParent = nullptr, sal_uIntPtr nPos = TREELIST_APPEND); virtual SvTreeListEntry* CreateEntry() const override; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index d5f4859f1d08..f19a07e66284 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -99,7 +99,7 @@ protected: RECT_POINT GetRPFromPoint( Point, bool bRTL = false ) const; Point GetPointFromRP( RECT_POINT ) const; - void SetFocusRect( const Rectangle* pRect = NULL ); // pRect == NULL -> calculate rectangle in method + void SetFocusRect( const Rectangle* pRect = nullptr ); // pRect == NULL -> calculate rectangle in method Point SetActualRPWithoutInvalidate( RECT_POINT eNewRP ); // returns the last point virtual void GetFocus() override; diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index dfddd02f2d61..db33d5bbdf5e 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -39,10 +39,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 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 PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -63,10 +63,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 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 PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -87,10 +87,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 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 PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -111,10 +111,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 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 PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -135,10 +135,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 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 PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -159,10 +159,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 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 PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index 3dcdeebe18cb..643438edd1f7 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -38,7 +38,7 @@ public: virtual ~SvxB3DVectorItem(); 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 nVersion) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 0fff7e1fa168..72ea295193e5 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -204,8 +204,8 @@ private: SVX_DLLPRIVATE void Reset(); SVX_DLLPRIVATE bool LBSelectColor( ColorLB* pLb, const Color& rColor ); - SVX_DLLPRIVATE sal_uInt16 GetLightSource( const PushButton* pBtn = NULL ); - SVX_DLLPRIVATE ColorLB* GetLbByButton( const PushButton* pBtn = NULL ); + SVX_DLLPRIVATE sal_uInt16 GetLightSource( const PushButton* pBtn = nullptr ); + SVX_DLLPRIVATE ColorLB* GetLbByButton( const PushButton* pBtn = nullptr ); SVX_DLLPRIVATE bool GetUILightState( const PushButton& rBtn ) const; SVX_DLLPRIVATE void SetUILightState( PushButton& aBtn, bool bState ); diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx index 655373ffe811..06a21fb35a5e 100644 --- a/include/svx/fmmodel.hxx +++ b/include/svx/fmmodel.hxx @@ -48,9 +48,9 @@ private: public: TYPEINFO_OVERRIDE(); - FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); - FmFormModel(const OUString& rPath, SfxItemPool* pPool=NULL, - SfxObjectShell* pPers=NULL ); + FmFormModel(SfxItemPool* pPool=nullptr, SfxObjectShell* pPers=nullptr ); + FmFormModel(const OUString& rPath, SfxItemPool* pPool=nullptr, + SfxObjectShell* pPers=nullptr ); FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable); diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index def260c9e8e2..03139b02e1db 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -58,7 +58,7 @@ public: virtual SdrPage* Clone(SdrModel* pNewModel) const override; virtual void InsertObject(SdrObject* pObj, size_t nPos = SAL_MAX_SIZE, - const SdrInsertReason* pReason=NULL) override; + const SdrInsertReason* pReason=nullptr) override; virtual SdrObject* RemoveObject(size_t nObjNum) override; @@ -78,7 +78,7 @@ public: protected: FmFormPage(const FmFormPage& rPage); - void lateInit(const FmFormPage& rPage, FmFormModel* pNewModel = 0); + void lateInit(const FmFormPage& rPage, FmFormModel* pNewModel = nullptr); }; #endif // INCLUDED_SVX_FMPAGE_HXX diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx index be6b7f58d19c..a88dadfc9499 100644 --- a/include/svx/fmsearch.hxx +++ b/include/svx/fmsearch.hxx @@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { // Helper methods SVX_DLLPUBLIC bool IsSearchableControl( const css::uno::Reference< css::uno::XInterface>& _xControl, - OUString* pCurrentText = NULL); + OUString* pCurrentText = nullptr); // check if the control has one of the interfaces we can use for searching // *pCurrentText will be filled with the current text of the control (as used when searching this control) diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 44e1a6967045..7250ea1bf3aa 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -95,7 +95,7 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell }; friend class FormShellWaitObject; - const OutputDevice* GetCurrentViewDevice() const { return m_pFormView ? m_pFormView->GetActualOutDev() : NULL; } + const OutputDevice* GetCurrentViewDevice() const { return m_pFormView ? m_pFormView->GetActualOutDev() : nullptr; } public: SFX_DECL_INTERFACE(SVX_INTERFACE_FORM_SH) @@ -106,7 +106,7 @@ private: static void InitInterface_Impl(); public: - FmFormShell(SfxViewShell* pParent, FmFormView* pView = NULL); + FmFormShell(SfxViewShell* pParent, FmFormView* pView = nullptr); virtual ~FmFormShell(); void Execute( SfxRequest& ); diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 390ee84ff083..3c970a0d50e7 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -77,10 +77,10 @@ namespace vcl { class Window; } // displaying a database exception for the user // display info about a simple css::sdbc::SQLException -void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent = NULL); -SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent = NULL); -void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = NULL); -void displayException(const css::uno::Any&, vcl::Window* _pParent = NULL); +void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent = nullptr); +SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent = nullptr); +void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = nullptr); +void displayException(const css::uno::Any&, vcl::Window* _pParent = nullptr); sal_Int32 getElementPos(const css::uno::Reference< css::container::XIndexAccess>& xCont, const css::uno::Reference< css::uno::XInterface>& xElement); @@ -164,7 +164,7 @@ class SAL_WARN_UNUSED FmXDisposeListener ::osl::Mutex& m_rMutex; public: - FmXDisposeListener(::osl::Mutex& _rMutex) : m_pAdapter(NULL), m_rMutex(_rMutex) { } + FmXDisposeListener(::osl::Mutex& _rMutex) : m_pAdapter(nullptr), m_rMutex(_rMutex) { } virtual ~FmXDisposeListener(); virtual void disposing(const css::lang::EventObject& _rEvent, sal_Int16 _nId) throw( css::uno::RuntimeException ) = 0; diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index da73d92a58fe..1549cecda66e 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -63,7 +63,7 @@ class SVX_DLLPUBLIC FmFormView : public E3dView public: TYPEINFO_OVERRIDE(); - FmFormView(FmFormModel* pModel, OutputDevice* pOut = 0L); + FmFormView(FmFormModel* pModel, OutputDevice* pOut = nullptr); virtual ~FmFormView(); /** create a control pair (label/bound control) for the database field description given. diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index 8b2230201eec..c9be5b5bbd7f 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -41,7 +41,7 @@ public: sal_uInt16 nFlags, const OUString& rString, const vcl::Font& rFont, - const Color* pColor = NULL ); + const Color* pColor = nullptr ); virtual ~SvLBoxFontString(); @@ -75,7 +75,7 @@ public: /** Inserts a list entry and sets the font used for this entry. @param pColor The font color. NULL = use default listbox text color. */ void InsertFontEntry( - const OUString& rString, const vcl::Font& rFont, const Color* pColor = NULL ); + const OUString& rString, const vcl::Font& rFont, const Color* pColor = nullptr ); /** Selects/deselects an entry specified by its position in the list box. */ void SelectEntryPos( sal_uLong nPos, bool bSelect = true ); diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index 17fc58b791a1..2ef4f4a5357f 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -456,7 +456,7 @@ SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimiti const Style& rRFromB, /// Vertical frame border from bottom to right end of rBorder. const DiagStyle& rRFromBL, /// Diagonal frame border from bottom-left to right end of rBorder. - const Color* pForceColor = 0,/// If specified, overrides frame border color. + const Color* pForceColor = nullptr,/// If specified, overrides frame border color. const long& rRotationT = 9000, /// Angle of the top slanted frames in 100th of degree const long& rRotationB = 9000 /// Angle of the bottom slanted frames in 100th of degree ); @@ -474,7 +474,7 @@ SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimiti const Style& rRFromR, /// Horizontal frame border from right to right end of rBorder. const Style& rRFromB, /// Vertical frame border from bottom to right end of rBorder. - const Color* pForceColor = 0,/// If specified, overrides frame border color. + const Color* pForceColor = nullptr,/// If specified, overrides frame border color. const long& rRotationT = 9000, /// Angle of the top slanted frame in 100th of degrees const long& rRotationB = 9000 /// Angle of the bottom slanted frame in 100th of degrees ); @@ -537,7 +537,7 @@ SVX_DLLPUBLIC void DrawHorFrameBorder( const Style& rRFromB, /// Vertical frame border from bottom to right end of rBorder. const DiagStyle& rRFromBL, /// Diagonal frame border from bottom-left to right end of rBorder. - const Color* pForceColor = 0 /// If specified, overrides frame border color. + const Color* pForceColor = nullptr /// If specified, overrides frame border color. ); @@ -608,7 +608,7 @@ SVX_DLLPUBLIC void DrawVerFrameBorder( const Style& rBFromR, /// Horizontal frame border from right to bottom end of rBorder. const DiagStyle& rBFromTR, /// Diagonal frame border from top-right to bottom end of rBorder. - const Color* pForceColor = 0 /// If specified, overrides frame border color. + const Color* pForceColor = nullptr /// If specified, overrides frame border color. ); @@ -636,7 +636,7 @@ SVX_DLLPUBLIC void DrawDiagFrameBorders( const Style& rTRFromB, /// Vertical frame border from bottom to top-right end of rBLTR. const Style& rTRFromL, /// Horizontal frame border from left to top-right end of rBLTR. - const Color* pForceColor = 0, /// If specified, overrides frame border color. + const Color* pForceColor = nullptr, /// If specified, overrides frame border color. bool bDiagDblClip = false /// true = Use clipping for crossing double frame borders. ); diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index 5b60d70ff4f3..a1d1f6350937 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -360,7 +360,7 @@ public: void DrawRange( drawinglayer::processor2d::BaseProcessor2D* rDev, size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow, - const Color* pForceColor = 0 ) const; + const Color* pForceColor = nullptr ) const; /** Draws the part of the specified range, that is inside the clipping range. @param pForceColor @@ -368,12 +368,12 @@ public: void DrawRange( OutputDevice& rDev, size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow, - const Color* pForceColor = 0 ) const; + const Color* pForceColor = nullptr ) const; /** Draws the part of the array, that is inside the clipping range. @param pForceColor If not NULL, only this color will be used to draw all frame borders. */ - void DrawArray( OutputDevice& rDev, const Color* pForceColor = 0 ) const; + void DrawArray( OutputDevice& rDev, const Color* pForceColor = nullptr ) const; diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index b11d85fbf6d9..63e8a8932e91 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -71,7 +71,7 @@ public: GalleryPreview(vcl::Window* pParent, WinBits nStyle = WB_TABSTOP | WB_BORDER, - GalleryTheme* pTheme = NULL); + GalleryTheme* pTheme = nullptr); void SetGraphic( const Graphic& rGraphic ) { aGraphicObj.SetGraphic( rGraphic ); } bool SetGraphic( const INetURLObject& ); diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx index c0dfb00446c6..51cc52c714bf 100644 --- a/include/svx/gallery.hxx +++ b/include/svx/gallery.hxx @@ -62,19 +62,19 @@ public: static bool InsertURL( sal_uIntPtr nThemeId, const OUString& rURL ); static bool GetGraphicObj( const OUString& rThemeName, sal_uIntPtr nPos, - Graphic* pGraphic = NULL, BitmapEx* pThumb = NULL, + Graphic* pGraphic = nullptr, BitmapEx* pThumb = nullptr, bool bProgess = false ); static bool GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos, - Graphic* pGraphic = NULL, BitmapEx* pThumb = NULL, + Graphic* pGraphic = nullptr, BitmapEx* pThumb = nullptr, bool bProgess = false ); static sal_uIntPtr GetSdrObjCount( const OUString& rThemeName ); static sal_uIntPtr GetSdrObjCount( sal_uIntPtr nThemeId ); static bool GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrModelPos, - SdrModel* pModel = NULL, BitmapEx* pThumb = NULL ); + SdrModel* pModel = nullptr, BitmapEx* pThumb = nullptr ); static bool GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos, - SdrModel* pModel = NULL, BitmapEx* pThumb = NULL ); + SdrModel* pModel = nullptr, BitmapEx* pThumb = nullptr ); static bool BeginLocking( const OUString& rThemeName ); static bool BeginLocking( sal_uIntPtr nThemeId ); diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index fd91e62542f4..8c334f0662b7 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -128,7 +128,7 @@ public: SAL_DLLPRIVATE size_t GetThemeCount() const { return aThemeList.size(); } SAL_DLLPRIVATE const GalleryThemeEntry* GetThemeInfo( size_t nPos ) - { return nPos < aThemeList.size() ? aThemeList[ nPos ] : NULL; } + { return nPos < aThemeList.size() ? aThemeList[ nPos ] : nullptr; } SAL_DLLPRIVATE const GalleryThemeEntry* GetThemeInfo( const OUString& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } bool HasTheme( const OUString& rThemeName ); diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index c58cfc820ddc..59fe41463285 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -57,7 +57,7 @@ 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; // bridge to UNO 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/svx/galmisc.hxx b/include/svx/galmisc.hxx index 741624ed6067..5d7ddbeb448e 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -43,7 +43,7 @@ struct ExchangeData tools::Time aThemeChangeTime; ExchangeData() - : pTheme(NULL) + : pTheme(nullptr) , aThemeChangeDate( Date::EMPTY ) , aThemeChangeTime( tools::Time::EMPTY ) { @@ -142,7 +142,7 @@ class SVX_DLLPUBLIC GalleryProgress public: - GalleryProgress( GraphicFilter* pFilter = NULL ); + GalleryProgress( GraphicFilter* pFilter = nullptr ); ~GalleryProgress(); void Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal ); diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 84213b152b70..6d44850bad47 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -110,7 +110,7 @@ private: SAL_DLLPRIVATE bool ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ); SAL_DLLPRIVATE void ImplWrite(); SAL_DLLPRIVATE const GalleryObject* ImplGetGalleryObject( size_t nPos ) const - { return ( nPos < aObjectList.size() ) ? aObjectList[ nPos ] : NULL; } + { return ( nPos < aObjectList.size() ) ? aObjectList[ nPos ] : nullptr; } const GalleryObject* ImplGetGalleryObject( const INetURLObject& rURL ); SAL_DLLPRIVATE size_t ImplGetGalleryObjectPos( const GalleryObject* pObj ) const @@ -178,7 +178,7 @@ public: bool IsDefault() const; SAL_DLLPRIVATE bool IsModified() const; - void Actualize( const Link<const INetURLObject&, void>& rActualizeLink, GalleryProgress* pProgress = NULL ); + void Actualize( const Link<const INetURLObject&, void>& rActualizeLink, GalleryProgress* pProgress = nullptr ); SAL_DLLPRIVATE void AbortActualize() { bAbortActualize = true; } SAL_DLLPRIVATE Gallery* GetParent() const { return pParent; } diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index f2dc589b7c94..e5d590bea879 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; }; diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index f9160deb6a86..2092902adf6c 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -44,7 +44,7 @@ public: 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, diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 91e95430467a..b795a8ed97d8 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -422,7 +422,7 @@ public: virtual void SetDesignMode(bool bMode); bool IsDesignMode() const {return m_bDesignMode;} - bool IsOpen() const {return m_pSeekCursor != NULL;} + bool IsOpen() const {return m_pSeekCursor != nullptr;} void SetFilterMode(bool bMode); bool IsFilterMode() const {return m_bFilterMode;} diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index a95c5b745788..7fa034968239 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -65,7 +65,7 @@ protected: static const sal_uInt16 pRanges[]; virtual void ActivatePage( const SfxItemSet& rSet ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index 4d525ba69976..b65f553a61fb 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -53,19 +53,19 @@ public: TYPEINFO_OVERRIDE(); SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ): - SfxPoolItem(_nWhich), pMacroTable(NULL) { eType = HLINK_DEFAULT; nMacroEvents=0; }; + SfxPoolItem(_nWhich), pMacroTable(nullptr) { eType = HLINK_DEFAULT; nMacroEvents=0; }; SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ); SvxHyperlinkItem( sal_uInt16 nWhich, const OUString& rName, const OUString& rURL, const OUString& rTarget, const OUString& rIntName, SvxLinkInsertMode eTyp = HLINK_FIELD, sal_uInt16 nEvents = 0, - SvxMacroTableDtor *pMacroTbl =NULL ); + SvxMacroTableDtor *pMacroTbl =nullptr ); virtual ~SvxHyperlinkItem () { delete pMacroTable; } inline SvxHyperlinkItem& operator=( const SvxHyperlinkItem &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 PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index dd8a047be38a..4a4390c8402c 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -51,8 +51,8 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID( SvxIMapDlgChildWindow ); - static void UpdateIMapDlg( const Graphic& rGraphic, const ImageMap* pImageMap = NULL, - const TargetList* pTargetList = NULL, void* pEditingObj = NULL ); + static void UpdateIMapDlg( const Graphic& rGraphic, const ImageMap* pImageMap = nullptr, + const TargetList* pTargetList = nullptr, void* pEditingObj = nullptr ); }; @@ -152,8 +152,8 @@ public: void SetTargetList( const TargetList& rTargetList ); - void UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap = NULL, - const TargetList* pTargetList = NULL, void* pEditingObj = NULL ); + void UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap = nullptr, + const TargetList* pTargetList = nullptr, void* pEditingObj = nullptr ); virtual void KeyInput( const KeyEvent& rKEvt ) override; }; diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index 0bc391a5a378..f8251d7d719f 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -73,7 +73,7 @@ class SVX_DLLPUBLIC NumSettings_Impl , eNumAlign(SVX_ADJUST_LEFT) , nNumAlignAt(0) , nNumIndentAt(0) - , pBrushItem(0) + , pBrushItem(nullptr) , aSize(0,0) {} ~NumSettings_Impl(){} @@ -121,7 +121,7 @@ class SVX_DLLPUBLIC GrfBulDataRelation: public BulletsSettings BulletsSettings(eTy), nTabIndex((sal_uInt16)0xFFFF), nGallaryIndex((sal_uInt16)0xFFFF), - pGrfObj(0), + pGrfObj(nullptr), aSize(0,0) {} virtual ~GrfBulDataRelation(){} @@ -139,7 +139,7 @@ class SVX_DLLPUBLIC MixBulletsSettings_Impl eType(eTy), nIndex((sal_uInt16)0xFFFF), nIndexDefault((sal_uInt16)0xFFFF), - pBullets(0) + pBullets(nullptr) {} ~MixBulletsSettings_Impl(){} }; @@ -157,7 +157,7 @@ class SVX_DLLPUBLIC NumberSettings_Impl bIsCustomized(false), nIndex((sal_uInt16)0xFFFF), nIndexDefault((sal_uInt16)0xFFFF), - pNumSetting(NULL) + pNumSetting(nullptr) {} ~NumberSettings_Impl(){} }; @@ -173,7 +173,7 @@ class SVX_DLLPUBLIC OutlineSettings_Impl public: OutlineSettings_Impl() : bIsCustomized(false), - pNumSettingsArr(NULL) + pNumSettingsArr(nullptr) {} ~OutlineSettings_Impl(){ } @@ -194,7 +194,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase public: NBOTypeMgrBase(const NBOType aType) : eType(aType) - , pSet(0) + , pSet(nullptr) , eCoreUnit(SFX_MAPUNIT_TWIP) , aNumCharFmtName(OUString()) , bIsLoading(false) diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index 15bf28b6cb2a..218d741eacf8 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -67,7 +67,7 @@ public: sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, double nNumVal, - const OUString* pNumStr = NULL ); + const OUString* pNumStr = nullptr ); ~SvxNumberFormatShell(); @@ -81,7 +81,7 @@ public: sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, double nNumVal, - const OUString* pNumStr = NULL ); + const OUString* pNumStr = nullptr ); void GetInitSettings( sal_uInt16& nCatLbPos, @@ -141,7 +141,7 @@ public: bool IsUserDefined( const OUString& rFmtString ); bool IsTmpCurrencyFormat( const OUString& rFmtString ); - bool FindEntry( const OUString& rFmtString, sal_uInt32* pAt = NULL ); + bool FindEntry( const OUString& rFmtString, sal_uInt32* pAt = nullptr ); void ValidateNewEntries( bool bValidate = true ) { bUndoAddList = !bValidate; } size_t GetUpdateDataCount() const; diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index bdf8956bf60d..7e5b49d76891 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -50,14 +50,14 @@ public: virtual ~SvxNumberInfoItem(); 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& rStream, sal_uInt16 nVer ) 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; SvNumberFormatter* GetNumberFormatter() const { return pFormatter; } const OUString& GetValueString() const { return aStringVal; } diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 6497021689c7..cce441b9af8b 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -82,13 +82,13 @@ class E3dObjList : public SdrObjList public: TYPEINFO_OVERRIDE(); - E3dObjList(SdrModel* pNewModel = 0, SdrPage* pNewPage = 0, E3dObjList* pNewUpList = 0); + E3dObjList(SdrModel* pNewModel = nullptr, SdrPage* pNewPage = nullptr, E3dObjList* pNewUpList = nullptr); SVX_DLLPUBLIC virtual ~E3dObjList(); virtual E3dObjList* Clone() const override; - virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const SdrInsertReason* pReason=NULL) override; - virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const SdrInsertReason* pReason=NULL) override; + virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const SdrInsertReason* pReason=nullptr) override; + virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const SdrInsertReason* pReason=nullptr) override; virtual SdrObject* NbcRemoveObject(size_t nObjNum) override; virtual SdrObject* RemoveObject(size_t nObjNum) override; diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx index 3940dd5d456d..d05e768f1c11 100644 --- a/include/svx/ofaitem.hxx +++ b/include/svx/ofaitem.hxx @@ -35,7 +35,7 @@ public: OfaPtrItem( const OfaPtrItem& ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; void* GetValue() const { return pPtr; } }; diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index beafc874b897..af696eaf5da5 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -82,13 +82,13 @@ public: SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){}; SvxGridItem( const SvxGridItem& pTestItem ); - 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 GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; }; diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 92861a43d430..5c5be296c234 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -72,13 +72,13 @@ public: SvxPageItem( const sal_uInt16 nId ); SvxPageItem( const SvxPageItem& rItem ); - 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 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; @@ -113,12 +113,12 @@ public: SvxSetItem( const SvxSetItem& rItem ); SvxSetItem( const sal_uInt16 nId, SfxItemSet* pSet ); - 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 SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const override; diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index ce4c769eb5f6..7d4f8bef0137 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -41,9 +41,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; inline SvxPostItAuthorItem& operator=( const SvxPostItAuthorItem& rAuthor ) { @@ -72,9 +72,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; inline SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate ) { @@ -104,9 +104,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; inline SvxPostItTextItem& operator=( const SvxPostItTextItem& rText ) { diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 37e1efa1bfdc..174291bbad18 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -44,13 +44,13 @@ public: virtual ~SvxRotateModeItem(); virtual sal_uInt16 GetValueCount() 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 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; 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/svx/rulritem.hxx b/include/svx/rulritem.hxx index adb3d4f44880..4e5f4cdc3bbb 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -38,9 +38,9 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem 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; private: const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) = delete; @@ -71,9 +71,9 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem 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; private: const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) = delete; @@ -103,9 +103,9 @@ protected: 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; private: const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete; @@ -172,9 +172,9 @@ protected: 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 bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -227,9 +227,9 @@ protected: 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 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/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index 9e06f9dd8ab5..709e71d1ed01 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -32,7 +32,7 @@ public: SdrAngleItem(): SfxInt32Item() {} SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle=0): SfxInt32Item(nId,nAngle) {} SdrAngleItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(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 GetPresentation(SfxItemPresentation ePres, @@ -40,7 +40,7 @@ public: SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * - pIntlWrapper = 0) const override; + pIntlWrapper = nullptr) const override; }; diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index 1deefc5bae85..40126247bee1 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -45,10 +45,10 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = 0) const override; + OUString &rText, const IntlWrapper * = nullptr) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 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; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 3e7ed752439c..1fb2a997ac96 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -61,12 +61,12 @@ private: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = 0) const override; + OUString &rText, const IntlWrapper * = nullptr) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 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; diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx index 0e7472ee1d50..bf4d64bcd856 100644 --- a/include/svx/sdgcoitm.hxx +++ b/include/svx/sdgcoitm.hxx @@ -37,7 +37,7 @@ public: SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent ) {} SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, 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; }; @@ -54,7 +54,7 @@ public: SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent ) {} SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, 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; }; @@ -71,7 +71,7 @@ public: SdrGrafBlueItem( short nBluePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, nBluePercent ) {} SdrGrafBlueItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, 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; }; diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index 407890e3900d..ad7e6623b5c6 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -38,7 +38,7 @@ public: sal_uInt16 nWhichId = SDRATTR_GRAFCROP ) : SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, nWhichId ) {} - 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 sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; }; diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index ad6fbccb841a..637ddc8c14ab 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -37,7 +37,7 @@ public: SdrGrafGamma100Item( sal_uInt32 nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} SdrGrafGamma100Item( SvStream& rIn ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, 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/svx/sdginitm.hxx b/include/svx/sdginitm.hxx index 14b3ca12a8be..4c56571f0ae1 100644 --- a/include/svx/sdginitm.hxx +++ b/include/svx/sdginitm.hxx @@ -37,7 +37,7 @@ public: SdrGrafInvertItem( bool bInvert = false ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {} SdrGrafInvertItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_GRAFINVERT, 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; }; diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx index 188ee2b908e6..d5e1dda99185 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -37,7 +37,7 @@ public: SdrGrafLuminanceItem( short nLuminancePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, nLuminancePercent ) {} SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, 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; }; @@ -54,7 +54,7 @@ public: SdrGrafContrastItem( short nContrastPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, nContrastPercent ) {} SdrGrafContrastItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, 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; }; diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 041f567c81c9..50ec71cbfaf9 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -38,7 +38,7 @@ public: SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {} SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, 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 sal_uInt16 GetValueCount() const override; GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); } @@ -47,7 +47,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; }; diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx index b96c2963316b..8d10226e3520 100644 --- a/include/svx/sdgtritm.hxx +++ b/include/svx/sdgtritm.hxx @@ -36,7 +36,7 @@ public: SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {} SdrGrafTransparenceItem( SvStream& rIn ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, 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; }; diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 4204bff8497e..26221899b632 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -34,7 +34,7 @@ public: SdrMetricItem(): SfxInt32Item() {} SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): SfxInt32Item(nId,nVal) {} SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(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 HasMetrics() const override; virtual bool ScaleMetrics(long nMul, long nDiv) override; @@ -42,7 +42,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; }; diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 88295c4bd361..da42ef403359 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -34,12 +34,12 @@ public: SdrOnOffItem(): SfxBoolItem() {} SdrOnOffItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {} SdrOnOffItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(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 OUString GetValueTextByVal(bool bVal) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index 391d0c82fe40..c25179edab07 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -35,10 +35,10 @@ public: SdrPercentItem(): SfxUInt16Item() {} SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal=0): SfxUInt16Item(nId,nVal) {} SdrPercentItem(sal_uInt16 nId, SvStream& rIn): SfxUInt16Item(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 GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; @@ -53,10 +53,10 @@ public: SdrSignedPercentItem(): SfxInt16Item() {} SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {} SdrSignedPercentItem( sal_uInt16 nId, SvStream& rIn ) : SfxInt16Item( 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 GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const override; + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr ) const override; }; diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index 0a48efffa9e8..9e8b4e972ffd 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -102,7 +102,7 @@ public: // Check if this primitive is animated in any OC (View) which means it has // generated a PrimitiveAnimation - bool isAnimated() const { return (0 != mpPrimitiveAnimation); } + bool isAnimated() const { return (nullptr != mpPrimitiveAnimation); } // Take some action when new objects are inserted void ActionChildInserted(ViewContact& rChild); diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index d25613a1fa80..09c8505ef819 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -99,7 +99,7 @@ namespace sdr const drawinglayer::geometry::ViewInformation2D getCurrentViewInformation2D() const; // complete redraw - virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0) const; + virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = nullptr) const; // flush. Do buffered updates. virtual void flush(); diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx index f69a8578a71d..2bf74f5cdbe4 100644 --- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx @@ -73,10 +73,10 @@ namespace drawinglayer attribute::SdrTextAttribute createNewSdrTextAttribute( const SfxItemSet& rSet, const SdrText& rText, - const sal_Int32* pLeft = 0, - const sal_Int32* pUpper = 0, - const sal_Int32* pRight = 0, - const sal_Int32* pLower = 0); + const sal_Int32* pLeft = nullptr, + const sal_Int32* pUpper = nullptr, + const sal_Int32* pRight = nullptr, + const sal_Int32* pLower = nullptr); attribute::FillGradientAttribute SVX_DLLPUBLIC createNewTransparenceGradientAttribute( const SfxItemSet& rSet); @@ -112,10 +112,10 @@ namespace drawinglayer attribute::SdrFillTextAttribute createNewSdrFillTextAttribute( const SfxItemSet& rSet, const SdrText* pSdrText, - const sal_Int32* pLeft = 0, - const sal_Int32* pUpper = 0, - const sal_Int32* pRight = 0, - const sal_Int32* pLower = 0); + const sal_Int32* pLeft = nullptr, + const sal_Int32* pUpper = nullptr, + const sal_Int32* pRight = nullptr, + const sal_Int32* pLower = nullptr); // helpers void calculateRelativeCornerRadius( diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index 9026130c3ad7..ccc3b84d5e25 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -39,10 +39,10 @@ namespace sdr virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const override; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) const override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; // Called after ItemChange() is done for all items. virtual void PostItemChange(const sal_uInt16 nWhich) override; diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx index efdcbdcb06e0..80ae6abd2f2d 100644 --- a/include/svx/sdr/properties/properties.hxx +++ b/include/svx/sdr/properties/properties.hxx @@ -62,11 +62,11 @@ namespace sdr // Test changeability for a single item. If a implementation wants to prevent // changing an item it should override this method. - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const = 0; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) const = 0; // Do the internal ItemChange. If only nWhich is given, the item needs to be cleared. // Also needs to handle if nWhich and pNewItem is 0, which means to clear all items. - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) = 0; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) = 0; // Called after ItemChange() is done for all items. Allows local reactions on // specific item changes @@ -146,7 +146,7 @@ namespace sdr // Move local items to a new ItemPool. // Override this to do it for hierarchical objects like e.g. groups. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = nullptr); // Set new model. virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel); diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 23fa8c13e070..d1a87a24dc74 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -66,7 +66,7 @@ public: SVX_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ) override; // slots - SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = 0 ); + SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = nullptr ); SVX_DLLPRIVATE void onDelete( sal_uInt16 nSId ); SVX_DLLPRIVATE void onSelect( sal_uInt16 nSId ); SVX_DLLPRIVATE void onFormatTable( SfxRequest& rReq ); @@ -134,7 +134,7 @@ private: SVX_DLLPRIVATE void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ); - SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, const css::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 ); + SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, const css::awt::MouseEvent* pMouseEvent = nullptr, sal_uInt16 nAction = 0 ); SVX_DLLPRIVATE bool StopTextEdit(); SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* pWindow ); diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index 060c5ac04076..6519984252b8 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -97,7 +97,7 @@ private: void impCreateOverlayManager(); public: - SdrPaintWindow(SdrPaintView& rNewPaintView, OutputDevice& rOut, vcl::Window* pWindow = 0); + SdrPaintWindow(SdrPaintView& rNewPaintView, OutputDevice& rOut, vcl::Window* pWindow = nullptr); ~SdrPaintWindow(); // data read accesses diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index 77feb1e5c4d2..18c4a88b3238 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -28,12 +28,12 @@ public: TYPEINFO_OVERRIDE(); SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,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 HasMetrics() const override; virtual bool ScaleMetrics(long nMul, long nDiv) override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/include/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx index 23c71492cc6f..056a5e79bb6a 100644 --- a/include/svx/sdtacitm.hxx +++ b/include/svx/sdtacitm.hxx @@ -31,7 +31,7 @@ public: virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override { return new SdrTextAniCountItem(rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const override + virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override { return new SdrTextAniCountItem(*this); } }; diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 8a7b75afaf1d..eb2daff1fbe3 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -37,7 +37,7 @@ public: TYPEINFO_OVERRIDE(); SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {} SdrTextAniDirectionItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,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 sal_uInt16 GetValueCount() const override; SdrTextAniDirection GetValue() const { return (SdrTextAniDirection)SfxEnumItem::GetValue(); } @@ -47,7 +47,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index f77c048d1419..65079f9a9d8d 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -39,7 +39,7 @@ public: SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {} SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich,(sal_uInt16)eAdj) {} SdrTextVertAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,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 sal_uInt16 GetValueCount() const override; // { return 5; } SdrTextVertAdjust GetValue() const { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); } @@ -48,7 +48,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; @@ -66,7 +66,7 @@ public: TYPEINFO_OVERRIDE(); SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {} SdrTextHorzAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,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 sal_uInt16 GetValueCount() const override; SdrTextHorzAdjust GetValue() const { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); } @@ -75,7 +75,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 6bd211bd5aa7..0ffb06114462 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -81,7 +81,7 @@ public: TYPEINFO_OVERRIDE(); SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {} SdrTextAniKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIKIND,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 sal_uInt16 GetValueCount() const override; // { return 5; } SdrTextAniKind GetValue() const { return (SdrTextAniKind)SfxEnumItem::GetValue(); } @@ -90,7 +90,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index 02b7bcab7b38..3bf6f6705a06 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -28,9 +28,9 @@ public: TYPEINFO_OVERRIDE(); SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {} SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,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 GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index cf175ec18c6b..47faebebde22 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -31,11 +31,11 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = 0) const override; + OUString &rText, const IntlWrapper * = nullptr) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const override; SVX_DLLPRIVATE virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index 3ca7db028c3e..ec6230f5202c 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -47,7 +47,7 @@ public: TYPEINFO_OVERRIDE(); SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {} SdrTextFitToSizeTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,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 sal_uInt16 GetValueCount() const override; SdrFitToSizeType GetValue() const { return (SdrFitToSizeType)SfxEnumItem::GetValue(); } @@ -56,7 +56,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; virtual bool HasBoolValue() const override; virtual bool GetBoolValue() const override; virtual void SetBoolValue(bool bVal) override; diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index ff7691d1addd..a7f1b56a5d00 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -34,10 +34,10 @@ public: SdrYesNoItem(): SfxBoolItem() {} SdrYesNoItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {} SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(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 OUString GetValueTextByVal(bool bVal) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 071d442308c0..da098aabf55f 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -71,7 +71,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrCreateView(SdrModel* pModel1, OutputDevice* pOut = 0L); + SdrCreateView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrCreateView(); public: @@ -107,19 +107,19 @@ public: sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; } // Beginning the regular Create - bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); + bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=nullptr, short nMinMov=-3, SdrPageView* pPV=nullptr); bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject); void MovCreateObj(const Point& rPnt); bool EndCreateObj(SdrCreateCmd eCmd); void BckCreateObj(); // go back one polygon point void BrkCreateObj(); - bool IsCreateObj() const { return pAktCreate!=NULL; } + bool IsCreateObj() const { return pAktCreate!=nullptr; } SdrObject* GetCreateObj() const { return pAktCreate; } // BegCreateCaptionObj() creates a SdrCaptionObj (legend item). // rObjSiz is the initial size of the legend text frame. // Only the length of the tip is dragged - bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); + bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=nullptr, short nMinMov=-3, SdrPageView* pPV=nullptr); // If TextEditAfterCreate is sal_True (the default), // then after the creation of a TextFrame object (OBJ_TEXT, diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx index 91ea052a8326..ac2a978e3695 100644 --- a/include/svx/svddrag.hxx +++ b/include/svx/svddrag.hxx @@ -76,7 +76,7 @@ protected: //public: SdrDragStatUserData* pUser; // Userdata public: - SdrDragStat(): aPnts() { pUser=NULL; Reset(); } + SdrDragStat(): aPnts() { pUser=nullptr; Reset(); } ~SdrDragStat() { Clear(false); } void Reset(); SdrView* GetView() const { return pView; } diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index fe3f71cfa9e0..5d39bdb91220 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -75,7 +75,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrDragView(SdrModel* pModel1, OutputDevice* pOut = 0L); + SdrDragView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrDragView(); public: @@ -101,7 +101,7 @@ public: // If pForcedMeth is passed, then pHdl, ... is not evaluated, but this Drag // method is used. In this, the ownership of the instance passes // to the View and is destroyed at the end of the dragging. - virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL); + virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut=nullptr, SdrHdl* pHdl=nullptr, short nMinMov=-3, SdrDragMethod* pForcedMeth=nullptr); void MovDragObj(const Point& rPnt); bool EndDragObj(bool bCopy=false); void BrkDragObj(); @@ -122,7 +122,7 @@ public: // Interactive insertion of a new point. nIdx=0 => in front of the first point bool IsInsObjPointPossible() const; - bool BegInsObjPoint(const Point& rPnt, bool bNewObj) { return ImpBegInsObjPoint(false, 0L, rPnt, bNewObj, 0L); } + bool BegInsObjPoint(const Point& rPnt, bool bNewObj) { return ImpBegInsObjPoint(false, 0L, rPnt, bNewObj, nullptr); } void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); } bool EndInsObjPoint(SdrCreateCmd eCmd); bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && mbInsPolyPoint; } diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 4f6e0dc553c5..3da98ac09106 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -170,7 +170,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrEditView(SdrModel* pModel1, OutputDevice* pOut = 0L); + SdrEditView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrEditView(); public: @@ -326,7 +326,7 @@ public: // Using pUserGrp an own group object can be set. // This is not used immediately, but via Clone copied. // The method creates SdrObjGroup-instancess if NULL is passed, - void GroupMarked(const SdrObject* pUserGrp=NULL); + void GroupMarked(const SdrObject* pUserGrp=nullptr); // All marked object groups are dissolved (1 level). // Now all previously marked member objects are marked. @@ -400,7 +400,7 @@ public: // are marked and these are capable to deliver a StarView-metafile, // this methods converts the metafile to a drawing object. // The SdrGrafObjs/SdrOle2Objs are replaced by the new objects. - void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=NULL); + void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=nullptr); bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; } // If the mode VirtualObjectBundling is switched on, all ToTop/ToBtm diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 737891d5024d..5fccc68595fe 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -139,7 +139,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut = 0L); + SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrObjEditView(); public: @@ -178,8 +178,8 @@ public: // StatusEventHdl. // Similarly a specific OutlinerView can be specified. - virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, vcl::Window* pWin = 0L, bool bIsNewObj = false, - SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, + virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = nullptr, vcl::Window* pWin = nullptr, bool bIsNewObj = false, + SdrOutliner* pGivenOutliner = nullptr, OutlinerView* pGivenOutlinerView = nullptr, bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true); // bDontDeleteReally is a special parameter for writer // If this flag is set, then a maybe empty textobject is not deleted. @@ -251,7 +251,7 @@ public: void MovMacroObj(const Point& rPnt); void BrkMacroObj(); bool EndMacroObj(); - bool IsMacroObj() const { return pMacroObj!=NULL; } + bool IsMacroObj() const { return pMacroObj!=nullptr; } /** fills the given any with a XTextCursor for the current text selection. Leaves the any untouched if there currently is no text selected */ diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 822a9be3e00f..48698441d128 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -117,7 +117,7 @@ SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); * * @returns true, if the set contains such items */ -bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnlyEE=NULL); +bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnlyEE=nullptr); /** * @returns a new WhichTable, which we need to squash at some point with a delete diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx index 19e2d070477b..e9489e0eb981 100644 --- a/include/svx/svdglev.hxx +++ b/include/svx/svdglev.hxx @@ -35,12 +35,12 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView void ImpCopyMarkedGluePoints(); typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*); typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*, const void*); - void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); - void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); + void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1=nullptr, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr); + void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1=nullptr, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrGlueEditView(SdrModel* pModel1, OutputDevice* pOut = 0L); + SdrGlueEditView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrGlueEditView(); public: diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index b24d32bc8848..197a451c01a9 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -467,7 +467,7 @@ public: // 3.Level Position (x+y) void Sort(); size_t GetHdlCount() const { return aList.size(); } - SdrHdl* GetHdl(size_t nNum) const { return nNum<aList.size() ? aList[nNum] : NULL; } + SdrHdl* GetHdl(size_t nNum) const { return nNum<aList.size() ? aList[nNum] : nullptr; } size_t GetHdlNum(const SdrHdl* pHdl) const; void SetHdlSize(sal_uInt16 nSiz); sal_uInt16 GetHdlSize() const { return nHdlSize; } @@ -485,7 +485,7 @@ public: void RemoveAllByKind(SdrHdlKind eKind); // Last inserted handles are likely hit (if the handles are above each other) - SdrHdl* IsHdlListHit(const Point& rPnt, bool bBack=false, bool bNext=false, SdrHdl* pHdl0=NULL) const; + SdrHdl* IsHdlListHit(const Point& rPnt, bool bBack=false, bool bNext=false, SdrHdl* pHdl0=nullptr) const; SdrHdl* GetHdl(SdrHdlKind eKind1) const; }; diff --git a/include/svx/svditer.hxx b/include/svx/svditer.hxx index b5f61f73b126..f533ba6675d9 100644 --- a/include/svx/svditer.hxx +++ b/include/svx/svditer.hxx @@ -68,7 +68,7 @@ public: SdrObject* Next() { sal_uInt32 idx = (mbReverse ? --mnIndex : mnIndex++); - return idx < maObjList.size() ? maObjList[idx] : NULL; + return idx < maObjList.size() ? maObjList[idx] : nullptr; } sal_uInt32 Count() { return maObjList.size(); } diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index d6f8c3aa5fe3..1150e2e3e7d2 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -83,7 +83,7 @@ protected: SdrLayerID GetUniqueLayerID() const; void Broadcast() const; public: - explicit SdrLayerAdmin(SdrLayerAdmin* pNewParent=NULL); + explicit SdrLayerAdmin(SdrLayerAdmin* pNewParent=nullptr); SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin); ~SdrLayerAdmin(); const SdrLayerAdmin& operator=(const SdrLayerAdmin& rSrcLayerAdmin); diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index a3f56206b44e..ff8510b8cfa2 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -56,7 +56,7 @@ protected: sal_uInt16 mnUser; // E.g. for CopyObjects, also copy Edges public: - explicit SdrMark(SdrObject* pNewObj = 0L, SdrPageView* pNewPageView = 0L); + explicit SdrMark(SdrObject* pNewObj = nullptr, SdrPageView* pNewPageView = nullptr); SdrMark(const SdrMark& rMark); virtual ~SdrMark(); diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index a8e4d65c4f1f..ab42395a664e 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -322,7 +322,7 @@ public: const SfxItemPool& GetItemPool() const { return *pItemPool; } SfxItemPool& GetItemPool() { return *pItemPool; } - SdrOutliner& GetDrawOutliner(const SdrTextObj* pObj=NULL) const; + SdrOutliner& GetDrawOutliner(const SdrTextObj* pObj=nullptr) const; SdrOutliner& GetHitTestOutliner() const { return *pHitTestOutliner; } const SdrTextObj* GetFormattingTextObj() const; @@ -330,7 +330,7 @@ public: void SetTextDefaults() const; static void SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt ); - SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj=NULL) const; + SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj=nullptr) const; TextChain * GetTextChain() const; // ReferenceDevice for the EditEngine @@ -606,7 +606,7 @@ public: static const css::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId(); - virtual ImageMap* GetImageMapForObject(SdrObject*){return NULL;}; + virtual ImageMap* GetImageMapForObject(SdrObject*){return nullptr;}; /** enables (true) or disables (false) recording of undo actions If undo actions are added while undo is disabled, they are deleted. diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 53ce2a5a7d70..5d37f2bdc1fd 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -176,7 +176,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrMarkView(SdrModel* pModel1, OutputDevice* pOut = 0L); + SdrMarkView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrMarkView(); public: @@ -200,7 +200,7 @@ public: void MovMarkObj(const Point& rPnt); bool EndMarkObj(); void BrkMarkObj(); - bool IsMarkObj() const { return (0L != mpMarkObjOverlay); } + bool IsMarkObj() const { return (nullptr != mpMarkObjOverlay); } // DragModes: SDRDRAG_CREATE,SDRDRAG_MOVE,SDRDRAG_RESIZE,SDRDRAG_ROTATE,SDRDRAG_MIRROR,SDRDRAG_SHEAR,SDRDRAG_CROOK // Move==Resize @@ -274,13 +274,13 @@ public: bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const; // Pick: Supported options for nOptions are SEARCH_NEXT, SEARCH_BACKWARD (ni) - SdrHdl* PickHandle(const Point& rPnt, SdrSearchOptions nOptions=SdrSearchOptions::NONE, SdrHdl* pHdl0=NULL) const; + SdrHdl* PickHandle(const Point& rPnt, SdrSearchOptions nOptions=SdrSearchOptions::NONE, SdrHdl* pHdl0=nullptr) const; // Pick: Supported options for nOptions are: // SdrSearchOptions::DEEP SdrSearchOptions::ALSOONMASTER SdrSearchOptions::TESTMARKABLE SdrSearchOptions::TESTTEXTEDIT // SdrSearchOptions::WITHTEXT SdrSearchOptions::TESTTEXTAREA SdrSearchOptions::BACKWARD SdrSearchOptions::MARKED // SdrSearchOptions::WHOLEPAGE - bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions, SdrObject** ppRootObj, bool* pbHitPassDirect=NULL) const; + bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions, SdrObject** ppRootObj, bool* pbHitPassDirect=nullptr) const; bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions=SdrSearchOptions::NONE) const; bool MarkObj(const Point& rPnt, short nTol=-2, bool bToggle=false, bool bDeep=false); @@ -305,13 +305,13 @@ public: // Just objects are marked which are inclosed completely bool MarkObj(const Rectangle& rRect, bool bUnmark=false); void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false); - void MarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => all displayed pages - void UnmarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => all displayed pages + void MarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages + void UnmarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages // This function is time-consuming intensive, as the MarkList has to be scanned. bool IsObjMarked(SdrObject* pObj) const; // void MarkAll(SdrPageView* pPV=NULL) { MarkAllObj(pPV); } -> replace with inline - void UnMarkAll(SdrPageView* pPV=NULL) { UnmarkAllObj(pPV); } + void UnMarkAll(SdrPageView* pPV=nullptr) { UnmarkAllObj(pPV); } // Request/set the size of the marking handles. Declaration in Pixel. // The value is meant to be the edge length ( link length ). @@ -336,8 +336,8 @@ public: bool MarkPoints(const Rectangle& rRect, bool bUnmark=false) { return MarkPoints(&rRect,bUnmark); } bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); } bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return rHdl.IsSelected(); } - bool MarkAllPoints() { return MarkPoints(NULL,false); } - bool UnmarkAllPoints() { return MarkPoints(NULL,true); } + bool MarkAllPoints() { return MarkPoints(nullptr,false); } + bool UnmarkAllPoints() { return MarkPoints(nullptr,true); } // Selects the first marked point (P1) which is hit by rPnt // and from there it searches the first non-marked point(P2). @@ -358,7 +358,7 @@ public: void MovMarkPoints(const Point& rPnt); bool EndMarkPoints(); void BrkMarkPoints(); - bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); } + bool IsMarkPoints() const { return (nullptr != mpMarkPointsOverlay); } // Select that additional handles are displayed permanently. void SetPlusHandlesAlwaysVisible(bool bOn); @@ -392,8 +392,8 @@ public: SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const; // Mark all points within this rectangular (View coordinates) - bool MarkAllGluePoints() { return MarkGluePoints(NULL,false); } - bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,true); } + bool MarkAllGluePoints() { return MarkGluePoints(nullptr,false); } + bool UnmarkAllGluePoints() { return MarkGluePoints(nullptr,true); } // Selects the first marked point (P1) which is hit by rPnt // and from there it searches the first non-marked point(P2). @@ -410,7 +410,7 @@ public: void MovMarkGluePoints(const Point& rPnt); bool EndMarkGluePoints(); void BrkMarkGluePoints(); - bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); } + bool IsMarkGluePoints() const { return (nullptr != mpMarkGluePointsOverlay); } // bRestraintPaint=sal_False causes the handles not to be drawn immediately. // AdjustMarkHdl is just called in case of changes; usually this causes an Invalidate diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 707d29ba1c77..96c133c02d17 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -168,7 +168,7 @@ public: /* is merging default attributes from type-shape into the SdrCustomShapeGeometryItem. If pType is NULL then the type is being taken from the "Type" property of the SdrCustomShapeGeometryItem. MergeDefaultAttributes is called when creating CustomShapes via UI and after importing */ - void MergeDefaultAttributes( const OUString* pType = NULL ); + void MergeDefaultAttributes( const OUString* pType = nullptr ); /* the method is checking if the geometry data is unchanged/default, in this case the data might not be stored */ enum DefaultType @@ -240,7 +240,7 @@ public: virtual void EndTextEdit( SdrOutliner& rOutl ) override; virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const override; virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, - Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const override; + Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const override; virtual SdrObjCustomShape* Clone() const override; SdrObjCustomShape& operator=(const SdrObjCustomShape& rObj); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 9eb54d9aaf73..401ce8782866 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -876,7 +876,7 @@ public: void DeleteUserData(sal_uInt16 nNum); // switch ItemPool for this object - void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); + void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = nullptr); // access to the UNO representation of the shape virtual css::uno::Reference< css::uno::XInterface > getUnoShape(); @@ -1008,7 +1008,7 @@ private: SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel); public: - static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL); + static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=nullptr); static SdrObject* MakeNewObject( sal_uInt32 nInventor, sal_uInt16 nIdentifier, const Rectangle& rSnapRect, SdrPage* pPage ); static void InsertMakeObjectHdl(const Link<SdrObjFactory*,void>& rLink); static void RemoveMakeObjectHdl(const Link<SdrObjFactory*,void>& rLink); @@ -1021,7 +1021,7 @@ typedef tools::WeakReference< SdrObject > SdrObjectWeakRef; template< typename T > T* SdrObject::CloneHelper() const { OSL_ASSERT( typeid( T ) == typeid( *this )); - T* pObj = dynamic_cast< T* >( SdrObjFactory::MakeNewObject(GetObjInventor(),GetObjIdentifier(),NULL)); + T* pObj = dynamic_cast< T* >( SdrObjFactory::MakeNewObject(GetObjInventor(),GetObjIdentifier(),nullptr)); if (pObj!=NULL) *pObj=*static_cast< const T* >( this ); return pObj; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index fa3c35c1d82b..c27ca02f3dfe 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -199,7 +199,7 @@ protected: XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; - static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); + static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=nullptr); static SdrEscapeDirection ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2); void ImpSetTailPoint(bool bTail1, const Point& rPt); void ImpUndirtyEdgeTrack(); // eventuelle Neuberechnung des Verbindungsverlaufs diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 146ee871c226..ad8edf9a18c3 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -137,7 +137,7 @@ public: virtual bool BegTextEdit(SdrOutliner& rOutl) override; virtual const Size& GetTextSize() const override; virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, - Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const override; + Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const override; virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const override; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override; virtual sal_uInt16 GetOutlinerViewAnchorMode() const override; diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 26a0ad7179e9..56ebce724092 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -86,7 +86,7 @@ public: // The original size of the object (size of the icon for iconified object) // no conversion is done if no target mode is provided - Size GetOrigObjSize( MapMode* pTargetMapMode = NULL ) const; + Size GetOrigObjSize( MapMode* pTargetMapMode = nullptr ) const; // #i118524# Allow suppress SetVisAreaSize in changing methods when call // comes from OLE client diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 3e7d06ab77b8..c7cbe19daa87 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -42,8 +42,8 @@ protected: public: TYPEINFO_OVERRIDE(); - SdrPageObj(SdrPage* pNewPage = 0L); - SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = 0L); + SdrPageObj(SdrPage* pNewPage = nullptr); + SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = nullptr); virtual ~SdrPageObj(); SdrPage* GetReferencedPage() const { return mpShownPage;} diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index a7fcd40fd93b..6befde2a9125 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -174,7 +174,7 @@ public: // #i121917# virtual bool HasText() const override; - bool IsTextEditActive() const { return (pEdtOutl != 0L); } + bool IsTextEditActive() const { return (pEdtOutl != nullptr); } bool IsTextEditActive( const sdr::table::CellPos& rPos ); /** returns true only if we are in edit mode and the user actually changed anything */ @@ -182,8 +182,8 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const override; + void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const override; void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const override; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 586a5838ec3c..e40435c6213e 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -226,12 +226,12 @@ public: void SetTextEditOffset(const Point& rNew) { maTextEditOffset = rNew; } protected: - OverflowingText *mpOverflowingText = NULL; + OverflowingText *mpOverflowingText = nullptr; bool mbIsUnchainableClone = false; // the successor in a chain - SdrTextObj *mpNextInChain = NULL; - SdrTextObj *mpPrevInChain = NULL; + SdrTextObj *mpNextInChain = nullptr; + SdrTextObj *mpPrevInChain = nullptr; // indicating the for its text to be chained to another text box bool mbToBeChained : 1; @@ -348,7 +348,7 @@ public: // Eine Attributierung kann nur am Textrahmen vollzogen werden. void SetTextLink(const OUString& rFileName, const OUString& rFilterName, rtl_TextEncoding eCharSet); void ReleaseTextLink(); - bool IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; } + bool IsLinkedText() const { return pPlusData!=nullptr && GetLinkUserData()!=nullptr; } bool ReloadLinkedText(bool bForceLoad = false); bool LoadText(const OUString& rFileName, const OUString& rFilterName, rtl_TextEncoding eCharSet); @@ -378,7 +378,7 @@ public: virtual bool HasText() const override; bool HasEditText() const; - bool IsTextEditActive() const { return (pEdtOutl != 0L); } + bool IsTextEditActive() const { return (pEdtOutl != nullptr); } /** returns the currently active text. */ virtual SdrText* getActiveText() const; @@ -411,7 +411,7 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, - Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; + Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; const GeoStat& GetGeoStat() const { return aGeo; } diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 84ccb3e3acd6..373eb6e37ee1 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -105,7 +105,7 @@ private: static void impChildInserted(SdrObject& rChild); public: TYPEINFO(); - SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewUpList=NULL); + SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewUpList=nullptr); virtual ~SdrObjList(); virtual SdrObjList* Clone() const; @@ -127,9 +127,9 @@ public: void RecalcObjOrdNums(); bool IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, - const SdrInsertReason* pReason=NULL); + const SdrInsertReason* pReason=nullptr); virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, - const SdrInsertReason* pReason=NULL); + const SdrInsertReason* pReason=nullptr); /// remove from list without delete virtual SdrObject* NbcRemoveObject(size_t nObjNum); virtual SdrObject* RemoveObject(size_t nObjNum); @@ -454,7 +454,7 @@ protected: // classes that needs access to the page objects must be deferred to lateInit. And it must // call lateInit() of its parent class. SdrPage(const SdrPage& rSrcPage); - void lateInit(const SdrPage& rSrcPage, SdrModel* pNewModel = 0); + void lateInit(const SdrPage& rSrcPage, SdrModel* pNewModel = nullptr); public: TYPEINFO_OVERRIDE(); @@ -495,7 +495,7 @@ public: virtual void SetModel(SdrModel* pNewModel) override; // New MasterPage interface - bool TRG_HasMasterPage() const { return (0L != mpMasterPageDescriptor); } + bool TRG_HasMasterPage() const { return (nullptr != mpMasterPageDescriptor); } void TRG_SetMasterPage(SdrPage& rNew); void TRG_ClearMasterPage(); SdrPage& TRG_GetMasterPage() const; diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 1665e0446a44..beaf794336d5 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -164,12 +164,12 @@ public: void PrePaint(); /// @param rReg refers to the OutDev and not to the Page - void CompleteRedraw( SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = NULL ); + void CompleteRedraw( SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr ); /// Write access to mpPreparedPageWindow void setPreparedPageWindow(SdrPageWindow* pKnownTarget); - void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget = 0, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L, + void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget = nullptr, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr, const Rectangle& rRect = Rectangle()); void DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor = Color( COL_BLACK ) ); diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 6d41b3847861..8dfcc6572e60 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -265,7 +265,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrPaintView(SdrModel* pModel1, OutputDevice* pOut = 0L); + SdrPaintView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrPaintView(); public: @@ -337,7 +337,7 @@ public: // Used internally for Draw/Impress/sch/chart2 - virtual void CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); + virtual void CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr); // #i72889# used from CompleteRedraw() implementation internally, added to be able to do a complete redraw in single steps @@ -350,7 +350,7 @@ public: // SdrPaintWindow again, if needed. // This means: the SdrPaintWindow is no longer safe after this closing call. virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut); - void DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); + void DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr); virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); @@ -501,7 +501,7 @@ public: /// Must be called by the App when scrolling etc. in order for /// an active FormularControl to be moved too - void VisAreaChanged(const OutputDevice* pOut=NULL); + void VisAreaChanged(const OutputDevice* pOut=nullptr); void VisAreaChanged(const SdrPageWindow& rWindow); bool IsPrintPreview() const { return mbPrintPreview; } diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx index f944240e8f19..450cc12a1abc 100644 --- a/include/svx/svdpoev.hxx +++ b/include/svx/svdpoev.hxx @@ -42,11 +42,11 @@ private: SVX_DLLPRIVATE void ImpCheckPolyPossibilities(); typedef void (*PPolyTrFunc)(Point&, Point*, Point*, const void*, const void*, const void*, const void*, const void*); - SVX_DLLPRIVATE void ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); + SVX_DLLPRIVATE void ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* p1=nullptr, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr, const void* p5=nullptr); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrPolyEditView(SdrModel* pModel1, OutputDevice* pOut = 0L); + SdrPolyEditView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrPolyEditView(); public: diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index 26b8d43061ca..ae1ff5d31d4a 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -32,7 +32,7 @@ class XFillAttrSetItem; class SVX_DLLPUBLIC SdrItemPool : public XOutdevItemPool { public: - SdrItemPool(SfxItemPool* pMaster = 0L, bool bLoadRefCounts = true); + SdrItemPool(SfxItemPool* pMaster = nullptr, bool bLoadRefCounts = true); SdrItemPool(const SdrItemPool& rPool); protected: virtual ~SdrItemPool(); @@ -43,7 +43,7 @@ public: SfxMapUnit ePresentationMetric, OUString& rText, const IntlWrapper * pIntlWrapper - = 0) const override; + = nullptr) const override; static void TakeItemName(sal_uInt16 nWhich, OUString& rItemName); }; diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 32a180bb4f00..6f39b104c31a 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -93,7 +93,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrSnapView(SdrModel* pModel1, OutputDevice* pOut = 0L); + SdrSnapView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrSnapView(); public: @@ -114,7 +114,7 @@ public: // RecalcLogicSnapMagnetic has to be called for every change of OutputDevices and every change of the MapMode! void RecalcLogicSnapMagnetic(const OutputDevice& rOut) { SetSnapMagnetic(rOut.PixelToLogic(Size(nMagnSizPix,nMagnSizPix))); } - void SetActualWin(const OutputDevice* pWin) { SdrPaintView::SetActualWin(pWin); if (pWin!=NULL) RecalcLogicSnapMagnetic(*pWin); } + void SetActualWin(const OutputDevice* pWin) { SdrPaintView::SetActualWin(pWin); if (pWin!=nullptr) RecalcLogicSnapMagnetic(*pWin); } // Coordinates referred to the view! // Returnvalues are SdrSnap::NOTSNAPPED,SdrSnap::XSNAPPED, @@ -150,7 +150,7 @@ public: void MovSetPageOrg(const Point& rPnt); bool EndSetPageOrg(); void BrkSetPageOrg(); - bool IsSetPageOrg() const { return (0L != mpPageOriginOverlay); } + bool IsSetPageOrg() const { return (nullptr != mpPageOriginOverlay); } // HitTest. If sal_True, in rnHelpLineNum is the number of the auxiliary line and in rpPv // the appendend PageView. @@ -167,7 +167,7 @@ public: void MovDragHelpLine(const Point& rPnt); bool EndDragHelpLine(); void BrkDragHelpLine(); - bool IsDragHelpLine() const { return (0L != mpHelpLineOverlay); } + bool IsDragHelpLine() const { return (nullptr != mpHelpLineOverlay); } // SnapAngle is for angles in circle, RotateDragging, ... // The snapping of an angle is beared down, if it is switched off diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx index 3aad68fec9cf..35c8bb8d851d 100644 --- a/include/svx/svdtext.hxx +++ b/include/svx/svdtext.hxx @@ -43,7 +43,7 @@ class SfxStyleSheet; class SVX_DLLPUBLIC SdrText : public tools::WeakBase< SdrText > { public: - SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject = 0 ); + SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject = nullptr ); virtual ~SdrText(); virtual void SetModel(SdrModel* pNewModel); diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 4534beb0120e..198a7c577b5b 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -167,7 +167,7 @@ protected: public: TYPEINFO_OVERRIDE(); - explicit SdrView(SdrModel* pModel1, OutputDevice* pOut = 0L); + explicit SdrView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrView(); // The default value for all dispatchers is activated. If the app for example diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx index 30e807b86e0d..2facccaf0a14 100644 --- a/include/svx/svdxcgv.hxx +++ b/include/svx/svdxcgv.hxx @@ -40,7 +40,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrExchangeView(SdrModel* pModel1, OutputDevice* pOut = 0L); + SdrExchangeView(SdrModel* pModel1, OutputDevice* pOut = nullptr); public: // Output all marked objects on the specified OutputDevice @@ -110,14 +110,14 @@ public: const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions, const OUString& rSrcShellID, const OUString& rDestShellID ); - bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=NULL, SdrInsertFlags nOptions=SdrInsertFlags::NONE); - bool Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, SdrInsertFlags nOptions=SdrInsertFlags::NONE); + bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=nullptr, SdrInsertFlags nOptions=SdrInsertFlags::NONE); + bool Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=nullptr, SdrInsertFlags nOptions=SdrInsertFlags::NONE); static bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT ); static bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT ); - static bool Paste( vcl::Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT ); + static bool Paste( vcl::Window* pWin = nullptr, sal_uIntPtr nFormat = SDR_ANYFORMAT ); }; #endif // INCLUDED_SVX_SVDXCGV_HXX diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index 0a336f440f09..5f1c8b7ada69 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -75,7 +75,7 @@ public: // use drawing::NormalsKind SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxBoolItem makeSvx3DNormalsInvertItem(bool bVal) { @@ -89,7 +89,7 @@ public: // use drawing::TextureProjectionMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; }; class SVX_DLLPUBLIC Svx3DTextureProjectionYItem : public SfxUInt16Item { @@ -99,7 +99,7 @@ public: // use drawing::TextureProjectionMode 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 = NULL) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxBoolItem makeSvx3DShadow3DItem(bool bVal) { @@ -125,7 +125,7 @@ public: // use drawing::TextureKind SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; }; class SVX_DLLPUBLIC Svx3DTextureModeItem : public SfxUInt16Item { @@ -135,7 +135,7 @@ public: // use drawing:TextureMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxBoolItem makeSvx3DTextureFilterItem(bool bVal) { @@ -150,7 +150,7 @@ public: // use drawing::ProjectionMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; }; inline SfxUInt32Item makeSvx3DDistanceItem(sal_uInt32 nVal) { @@ -276,7 +276,7 @@ public: // use drawing::ShadeMode SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; }; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 641fb9f9fad2..fc70dc2a3aad 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -279,7 +279,7 @@ public: virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, - SdrModel* pModel=0 ) = 0 ; + SdrModel* pModel=nullptr ) = 0 ; virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent, const SdrView* pView, @@ -391,7 +391,7 @@ public: bool bShadow) = 0 ; virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, - const SdrObject* pObj = NULL, + const SdrObject* pObj = nullptr, bool bHasObj = true )=0; virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, @@ -428,7 +428,7 @@ public: const sal_uInt16 _nInitiallySelectedEvent ) = 0; - virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL )=0; + virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = nullptr )=0; virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0; diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx index aae859647808..beebb7bf4194 100644 --- a/include/svx/svxgrahicitem.hxx +++ b/include/svx/svxgrahicitem.hxx @@ -37,7 +37,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; Graphic GetGraphic() const { return aGraphic; } diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index 36e512120134..f018c3e1cec9 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -35,14 +35,14 @@ public: TYPEINFO_OVERRIDE(); SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {} SdrCaptionEscDirItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONESCDIR,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 sal_uInt16 GetValueCount() const override; // { return 3; } SdrCaptionEscDir GetValue() const { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); } virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 0cd373cfc32b..82ea0c593daa 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -33,12 +33,12 @@ public: TYPEINFO_OVERRIDE(); SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {} SdrCaptionTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONTYPE,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 sal_uInt16 GetValueCount() const override; // { return 4; } SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); } virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 0c333798149d..eef809ff9e8f 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -37,14 +37,14 @@ public: TYPEINFO_OVERRIDE(); SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {} SdrEdgeKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_EDGEKIND,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 sal_uInt16 GetValueCount() const override; // { return 5; } SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); } 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 OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index 25b6f34bb057..d352c5860ff9 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -34,10 +34,10 @@ public: SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, SvStream& rIn); virtual bool operator==(const SfxPoolItem&) const override; - virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const override; + virtual SfxPoolItem* Clone(SfxItemPool *pPool=nullptr) const override; const Fraction& GetValue() const { return nValue; } void SetValue(const Fraction& rVal) { nValue = rVal; } }; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 7b52ce7bdf97..f1e9a8e9d24e 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -34,7 +34,7 @@ public: TYPEINFO_OVERRIDE(); SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextHPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,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 sal_uInt16 GetValueCount() const override; // { return 4; } SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); } @@ -43,7 +43,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; @@ -54,7 +54,7 @@ public: TYPEINFO_OVERRIDE(); SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,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 sal_uInt16 GetValueCount() const override; // { return 5; } SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); } @@ -63,7 +63,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index d880a3baffeb..a736124d66bd 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {} SdrMeasureUnitItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREUNIT,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 sal_uInt16 GetValueCount() const override; // { return 14; } FieldUnit GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); } @@ -40,7 +40,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index 23bbf56a3e2b..4b78bd0f23f6 100644 --- a/include/svx/sxsiitm.hxx +++ b/include/svx/sxsiitm.hxx @@ -27,9 +27,9 @@ public: SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {} SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} - virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const override; - virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const override; + virtual SfxPoolItem* Clone(SfxItemPool *pPool=nullptr) const override; }; #endif diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index b18111e2e93e..ebf855ec092f 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -96,7 +96,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception); - static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj = NULL, SvxDrawPage *pPage = NULL, OUString const & referer = OUString() ) throw (css::uno::RuntimeException); + static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj = nullptr, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException); // The following method is called if a SvxShape object is to be created. // Derived classes can create a derivation or an SvxShape aggregating object. diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 41e4e384de39..4df52ef5dabf 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -173,7 +173,7 @@ public: // Internals void ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet); - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ); /** takes the ownership of the SdrObject. When the shape is disposed, and it has the ownership of its associated SdrObject, then @@ -184,7 +184,7 @@ public: void ChangeModel( SdrModel* pNewModel ); - void InvalidateSdrObject() { mpObj.reset( NULL ); }; + void InvalidateSdrObject() { mpObj.reset( nullptr ); }; SdrObject* GetSdrObject() const {return mpObj.get();} void SetShapeType( const OUString& ShapeType ) { maShapeType = ShapeType; } css::uno::Any GetBitmap( bool bMetaFile = false ) const @@ -337,7 +337,7 @@ public: SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw (); virtual ~SvxShapeText() throw (); - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override; // XInterface virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -397,7 +397,7 @@ public: SvxShapeGroup( SdrObject* pObj,SvxDrawPage* pDrawPage ) throw (); virtual ~SvxShapeGroup() throw (); - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override; // XInterface virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -692,7 +692,7 @@ public: virtual ~Svx3DSceneObject() throw(); - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override; // XInterface virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -834,7 +834,7 @@ public: virtual ~SvxCustomShape() throw (); - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override; // XInterface virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index b786c820ae9f..f0daf24904b6 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -78,7 +78,7 @@ protected: public: TYPEINFO_OVERRIDE(); - E3dView(SdrModel* pModel, OutputDevice* pOut = 0L); + E3dView(SdrModel* pModel, OutputDevice* pOut = nullptr); virtual ~E3dView(); // Output all marked Objects on the given OutputDevice. @@ -86,7 +86,7 @@ public: // Access to the default attributes. E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; } - virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL) override; + virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut = nullptr, SdrHdl* pHdl = nullptr, short nMinMov = -3, SdrDragMethod* pForcedMeth = nullptr) override; virtual void CheckPossibilities() override; // Get/Set Event @@ -115,7 +115,7 @@ public: void Start3DCreation(); // Migration of overlay - bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); } + bool Is3DRotationCreationActive() const { return (nullptr != mpMirrorOverlay); } virtual void MovAction(const Point& rPnt) override; void End3DCreation(bool bUseDefaultValuesForMirrorAxes=false); @@ -128,8 +128,8 @@ public: bool IsBreak3DObjPossible() const; void Break3DObj(); - SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, bool bOnly3DAttr=false) const; - void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, bool bOnly3DAttr=false); + SfxItemSet Get3DAttributes(E3dScene* pInScene = nullptr, bool bOnly3DAttr=false) const; + void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = nullptr, bool bOnly3DAttr=false); }; #endif // INCLUDED_SVX_VIEW3D_HXX diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index b59a6406630e..02b91b2b243d 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -41,7 +41,7 @@ public: // "pure virtual Methoden" vom 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& rStrm, sal_uInt16 nVersion ) const override; // leer virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const override; // leer virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; // leer diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 21f9b04a5516..5d7930da0310 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -50,7 +50,7 @@ public: XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 ); 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& rIn, sal_uInt16 nVer ) const override; virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; @@ -61,7 +61,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; const GraphicObject& GetGraphicObject() const { return maGraphicObject;} void SetGraphicObject(const GraphicObject& rGraphicObject); diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 2345482ccea2..9ff93511668c 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -48,11 +48,11 @@ public: XColorItem(const XColorItem& rItem); 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& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; - const Color& GetColorValue(const XColorList* pTable = 0) const; + const Color& GetColorValue(const XColorList* pTable = nullptr) const; void SetColorValue(const Color& rNew) { aColor = rNew; Detach(); } }; diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 65097f4997e3..12f632bd09c7 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -38,7 +38,7 @@ public: XFillStyleItem(css::drawing::FillStyle = css::drawing::FillStyle_SOLID); XFillStyleItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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; @@ -47,7 +47,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; virtual sal_uInt16 GetValueCount() const override; css::drawing::FillStyle GetValue() const { return (css::drawing::FillStyle) SfxEnumItem::GetValue(); } diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index 6ac7405cded0..a3d7872f73df 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -38,13 +38,13 @@ public: SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE 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/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index 4d1f8aa95b69..ef5c2ffb9089 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -31,13 +31,13 @@ public: XFillBmpPosItem( RECT_POINT eRP = RP_MM ); SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; SVX_DLLPRIVATE RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); } diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index d4b2f9098b6c..a8e9182f5228 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -30,13 +30,13 @@ public: XFillBmpSizeLogItem( bool bLog = true ); SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE 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/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index 80d4adb17fb8..4286b205eda0 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -30,13 +30,13 @@ public: XFillBmpSizeXItem( long nSizeX = 0 ); SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; // This item records both metrical and percentage quotation (negative); // We have to consider that. SVX_DLLPRIVATE virtual bool HasMetrics() const override; @@ -49,13 +49,13 @@ public: XFillBmpSizeYItem( long nSizeY = 0 ); SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; // This item records both metrical and percentage quotation (negative); // We have to consider that. SVX_DLLPRIVATE virtual bool HasMetrics() const override; diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index caf3d39c7ada..df3bd498de04 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -30,13 +30,13 @@ public: XFillBmpTileItem( bool bTile = true ); XFillBmpTileItem( SvStream& 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 GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index 198b7d8553d6..61c01eb24b45 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -30,13 +30,13 @@ public: XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; }; class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item @@ -46,13 +46,13 @@ public: XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE 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/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 4a8c2dc9b654..3fd4bd34653a 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -30,13 +30,13 @@ public: XFillBmpStretchItem( bool bStretch = true ); XFillBmpStretchItem( SvStream& 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 GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index 4653590ea8b1..b83fd8614686 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -30,13 +30,13 @@ public: XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; }; class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item @@ -46,13 +46,13 @@ public: XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; SVX_DLLPRIVATE 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/svx/xflclit.hxx b/include/svx/xflclit.hxx index e08eeaab9584..7e8b948833a5 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -39,7 +39,7 @@ public: XFillColorItem(const OUString& rName, const Color& rTheColor); XFillColorItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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; @@ -48,7 +48,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; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 62a9b024062a..c7428ee87ad9 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -42,13 +42,13 @@ public: XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem ); virtual bool operator==( const SfxPoolItem& rItem ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 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 bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) const override; + SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = nullptr ) const override; bool IsEnabled() const { return bEnabled; } void SetEnabled( bool bEnable ) { bEnabled = bEnable; } diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index fe6d89b95ffa..f7cfaccfb1f3 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -44,7 +44,7 @@ public: XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0); 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& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; @@ -54,7 +54,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; const XGradient& GetGradientValue() const; // GetValue -> GetGradientValue void SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 7e9a8329f317..e594a56aa4be 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -42,7 +42,7 @@ public: XFillHatchItem(SvStream& rIn); 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& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const 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; virtual bool HasMetrics() const override; virtual bool ScaleMetrics(long nMul, long nDiv) override; diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index 972a02158b33..26abe70db3d8 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -35,12 +35,12 @@ public: TYPEINFO_OVERRIDE(); XFillTransparenceItem(sal_uInt16 nFillTransparence = 0); XFillTransparenceItem(SvStream& 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 GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx index c5de3b0a8ea1..19bd92c9cc15 100644 --- a/include/svx/xftadit.hxx +++ b/include/svx/xftadit.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER); XFormTextAdjustItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual sal_uInt16 GetValueCount() const override; XFormTextAdjust GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); } diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx index 4a79773d9fb4..62c95a829698 100644 --- a/include/svx/xftdiit.hxx +++ b/include/svx/xftdiit.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextDistanceItem(long nDist = 0); XFormTextDistanceItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; }; diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx index 5a74763242cf..b63ec7092a4f 100644 --- a/include/svx/xftmrit.hxx +++ b/include/svx/xftmrit.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextMirrorItem(bool bMirror = false); XFormTextMirrorItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; }; diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx index 804983999abf..cce332ecbe17 100644 --- a/include/svx/xftouit.hxx +++ b/include/svx/xftouit.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextOutlineItem(bool bOutline = false); XFormTextOutlineItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; }; diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx index 825345a79a23..2b07b54fa964 100644 --- a/include/svx/xftshcit.hxx +++ b/include/svx/xftshcit.hxx @@ -37,7 +37,7 @@ public: XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor); XFormTextShadowColorItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; }; diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx index 5daf0f1ffc00..2ee8e0eac04f 100644 --- a/include/svx/xftshit.hxx +++ b/include/svx/xftshit.hxx @@ -36,7 +36,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE); XFormTextShadowItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual sal_uInt16 GetValueCount() const override; XFormTextShadow GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); } diff --git a/include/svx/xftshtit.hxx b/include/svx/xftshtit.hxx index 48d68460ab48..f68c153659a7 100644 --- a/include/svx/xftshtit.hxx +++ b/include/svx/xftshtit.hxx @@ -34,7 +34,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); XFormTextShadowTranspItem(SvStream& 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; }; diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx index 7606d2d8fe61..88e277071d01 100644 --- a/include/svx/xftshxy.hxx +++ b/include/svx/xftshxy.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextShadowXValItem(long nVal = 0); XFormTextShadowXValItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; }; @@ -51,7 +51,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextShadowYValItem(long nVal = 0); XFormTextShadowYValItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; }; diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx index d7c3272daeda..d44cfe07d3f7 100644 --- a/include/svx/xftstit.hxx +++ b/include/svx/xftstit.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextStartItem(long nStart = 0); XFormTextStartItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; }; diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index f1cce004ea57..5b8c276ad830 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -35,12 +35,12 @@ public: TYPEINFO_OVERRIDE(); XGradientStepCountItem( sal_uInt16 nStepCount = 0 ); XGradientStepCountItem( SvStream& 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 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/svx/xit.hxx b/include/svx/xit.hxx index 89cf975184ac..174067107071 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -53,7 +53,7 @@ public: virtual ~NameOrIndex() {}; 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& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index f71fe97d6a19..21048c5eb495 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -34,7 +34,7 @@ public: TYPEINFO_OVERRIDE(); XLineStyleItem(css::drawing::LineStyle = css::drawing::LineStyle_SOLID); XLineStyleItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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; @@ -43,7 +43,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; virtual sal_uInt16 GetValueCount() const override; css::drawing::LineStyle GetValue() const { return (css::drawing::LineStyle) SfxEnumItem::GetValue(); } }; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 1026f8b17903..2065fb20c6f0 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -37,14 +37,14 @@ public: XLineJointItem( SvStream& rIn ); virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) 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; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) 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 sal_uInt16 GetValueCount() const override; css::drawing::LineJoint GetValue() const { return (css::drawing::LineJoint) SfxEnumItem::GetValue(); } diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 0e2c5add0a8e..2b3536440476 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -37,14 +37,14 @@ public: XLineCapItem(SvStream& rIn); virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) 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; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) 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 sal_uInt16 GetValueCount() const override; css::drawing::LineCap GetValue() const; diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index db57dc08f81b..22e2663da0a8 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -35,7 +35,7 @@ public: XLineColorItem(const OUString& rName, const Color& rTheColor); XLineColorItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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; @@ -44,7 +44,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; }; #endif diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 3ef685dd85f8..98e7e93f8d4c 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -43,7 +43,7 @@ public: XLineDashItem(SvStream& rIn); 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& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; @@ -53,7 +53,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; virtual bool HasMetrics() const override; virtual bool ScaleMetrics(long nMul, long nDiv) override; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 36ec83137479..3fee06bf1a51 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -32,7 +32,7 @@ public: TYPEINFO_OVERRIDE(); XLineEndCenterItem(bool bEndCenter = false); XLineEndCenterItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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; @@ -41,7 +41,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; }; #endif diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 886cc77c5f2e..760e4e3ddac3 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -42,7 +42,7 @@ public: XLineEndItem(SvStream& rIn); 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& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; @@ -52,7 +52,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; basegfx::B2DPolyPolygon GetLineEndValue() const { return maPolyPolygon;} void SetLineEndValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index fecb8716a9d3..e86074614327 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT); XLineEndWidthItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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; @@ -44,7 +44,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; }; #endif diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index ff05e382b2ca..dba0b29baf6b 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -32,7 +32,7 @@ public: TYPEINFO_OVERRIDE(); XLineStartCenterItem(bool bStartCenter = false); XLineStartCenterItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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; @@ -41,7 +41,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; }; #endif diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index c9c9ac45f884..1a142bd04b8a 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -42,7 +42,7 @@ public: XLineStartItem(SvStream& rIn); 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& rIn, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override; @@ -52,7 +52,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; basegfx::B2DPolyPolygon GetLineStartValue() const { return maPolyPolygon;} void SetLineStartValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index e6264737c2cb..02038de75c47 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -34,7 +34,7 @@ public: TYPEINFO_OVERRIDE(); XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT); XLineStartWidthItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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; @@ -43,7 +43,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; }; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index 00a357390962..3fa23537879e 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -35,12 +35,12 @@ public: TYPEINFO_OVERRIDE(); XLineTransparenceItem(sal_uInt16 nLineTransparence = 0); XLineTransparenceItem(SvStream& 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 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/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index 17172caf8f52..0a46ddc8cc08 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -32,7 +32,7 @@ public: TYPEINFO_OVERRIDE(); XLineWidthItem(long nWidth = 0); XLineWidthItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) 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; @@ -41,7 +41,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; }; #endif diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index 6cf1ee9fedb5..2879548be6e8 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -78,8 +78,8 @@ private: OUString& rContainerStorageName, OUString& rObjectStorageName, bool bInternalToExternal, - bool *pGraphicRepl=0, - bool *pOasisFormat=0 ) const; + bool *pGraphicRepl=nullptr, + bool *pOasisFormat=nullptr ) const; SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage > ImplGetContainerStorage( const OUString& rStorageName ); diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 6562a6fa31eb..37dfb307701c 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -55,18 +55,18 @@ public: static Animation MirrorAnimation( const Animation& rAnimation, bool bHMirr, bool bVMirr ); static sal_uInt16 WriteGraphic( const Graphic& rGraphic, OUString& rFileName, const OUString& rFilterName, const sal_uIntPtr nFlags = 0L, - const Size* pMtfSize_100TH_MM = NULL ); + const Size* pMtfSize_100TH_MM = nullptr ); static bool GraphicToBase64(const Graphic& rGraphic, OUString& rOUString); static sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, GraphicFilter& rFilter, const sal_uInt16 nFormat, - const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = NULL ); + const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = nullptr ); static Bitmap DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ); static tools::Polygon GetCountour( const Bitmap& rBmp, const sal_uIntPtr nContourFlags, const sal_uInt8 cEdgeDetectThreshold = 50, - const Rectangle* pWorkRect = NULL ); + const Rectangle* pWorkRect = nullptr ); }; SVX_DLLPUBLIC bool DitherBitmap( Bitmap& rBitmap ); diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx index 8ab46bcfcdd0..4fdbdbd6d76e 100644 --- a/include/svx/xpool.hxx +++ b/include/svx/xpool.hxx @@ -38,7 +38,7 @@ protected: public: XOutdevItemPool( - SfxItemPool* pMaster = 0L, + SfxItemPool* pMaster = nullptr, sal_uInt16 nAttrStart = XATTR_START, sal_uInt16 nAttrEnd = XATTR_END, bool bLoadRefCounts = true); diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 89d5eca1e9c1..86622f93ace5 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -33,13 +33,13 @@ public: XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor); SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx index 851a932cd014..8cd42a476517 100644 --- a/include/svx/xtextit0.hxx +++ b/include/svx/xtextit0.hxx @@ -36,7 +36,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextStyleItem(XFormTextStyle = XFT_NONE); XFormTextStyleItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual sal_uInt16 GetValueCount() const override; XFormTextStyle GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); } @@ -57,7 +57,7 @@ public: TYPEINFO_OVERRIDE(); XFormTextHideFormItem(bool bHide = false); XFormTextHideFormItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; }; diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index 1fa187de167a..48619f242bc0 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -46,7 +46,7 @@ public: // "pure virtual Methoden" vom 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& rStrm, sal_uInt16 nVersion ) const override; // leer virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const override; // leer virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; |