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 | |
| parent | 28f4bee7bd7378141d8569186162e1a3166eb012 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
515 files changed, 4021 insertions, 4021 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; diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index ce75e7fde5a6..f41257020d12 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -40,7 +40,7 @@ public: sal_Int32 mnLastAngle; E3dDragMethodUnit() - : mp3DObj(0), + : mp3DObj(nullptr), maWireframePoly(), maDisplayTransform(), maInvDisplayTransform(), diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 3eea5096555b..e1a9fca071da 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -170,9 +170,9 @@ public: sal_Int8 AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt ); sal_Int8 ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt ); - void StartDrag( vcl::Window* pWindow, const Point* pDragPoint = NULL ); - void TogglePreview( vcl::Window* pWindow, const Point* pPreviewPoint = NULL ); - void ShowContextMenu( vcl::Window* pWindow, const Point* pContextPoint = NULL ); + void StartDrag( vcl::Window* pWindow, const Point* pDragPoint = nullptr ); + void TogglePreview( vcl::Window* pWindow, const Point* pPreviewPoint = nullptr ); + void ShowContextMenu( vcl::Window* pWindow, const Point* pContextPoint = nullptr ); bool KeyInput( const KeyEvent& rEvt, vcl::Window* pWindow ); static css::uno::Reference< css::frame::XFrame > GetFrame(); diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 43b39c80f0d3..4a16c80fb890 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -60,7 +60,7 @@ namespace sdr void ImpPrepareBufferDevice(); void ImpRestoreBackground() const ; void ImpRestoreBackground(const vcl::Region& rRegionPixel) const; - void ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0L); + void ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = nullptr); OverlayManagerBuffered( OutputDevice& rOutputDevice, @@ -74,7 +74,7 @@ namespace sdr bool bRefreshWithPreRendering = false); // complete redraw - virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const override; + virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = nullptr) const override; // flush. Do buffered updates. virtual void flush() override; diff --git a/svx/inc/sdr/properties/attributeproperties.hxx b/svx/inc/sdr/properties/attributeproperties.hxx index 1eee80bcb6d5..8f2431717c39 100644 --- a/svx/inc/sdr/properties/attributeproperties.hxx +++ b/svx/inc/sdr/properties/attributeproperties.hxx @@ -46,7 +46,7 @@ namespace sdr virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& pPool) 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; // react on ItemSet changes virtual void ItemSetChanged(const SfxItemSet& rSet) override; @@ -71,7 +71,7 @@ namespace sdr virtual SfxStyleSheet* GetStyleSheet() const override; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) override; + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = nullptr) override; // Set new model. virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel) override; diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx index 141db8a5cb6c..62821a5d6e1e 100644 --- a/svx/inc/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/sdr/properties/customshapeproperties.hxx @@ -38,7 +38,7 @@ 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; // react on ItemSet changes virtual void ItemSetChanged(const SfxItemSet& rSet) override; diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx index 3aaf29ca6a05..732259522dca 100644 --- a/svx/inc/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx @@ -73,7 +73,7 @@ namespace sdr virtual SfxStyleSheet* GetStyleSheet() const override; // Move properties to a new ItemPool. Default implementation does nothing. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) override; + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = nullptr) override; // Special for scene: void SetSceneItemsFromCamera(); diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx index ae9e31e227ee..dc5126216b3b 100644 --- a/svx/inc/sdr/properties/emptyproperties.hxx +++ b/svx/inc/sdr/properties/emptyproperties.hxx @@ -38,10 +38,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/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx index 73ff23ec2b1f..22c1b2c86356 100644 --- a/svx/inc/sdr/properties/groupproperties.hxx +++ b/svx/inc/sdr/properties/groupproperties.hxx @@ -35,10 +35,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; @@ -105,7 +105,7 @@ namespace sdr virtual void ForceDefaultAttributes() override; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) override; + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = nullptr) override; // force all attributes which come from styles to hard attributes // to be able to live without the style. diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx index 67cd908f1d7d..c503d3bf8f84 100644 --- a/svx/inc/sdr/properties/pageproperties.hxx +++ b/svx/inc/sdr/properties/pageproperties.hxx @@ -35,7 +35,7 @@ namespace sdr virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& pPool) 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/svx/inc/sdr/properties/textproperties.hxx b/svx/inc/sdr/properties/textproperties.hxx index bda1268ddeeb..4bbcf5e81e41 100644 --- a/svx/inc/sdr/properties/textproperties.hxx +++ b/svx/inc/sdr/properties/textproperties.hxx @@ -40,7 +40,7 @@ namespace sdr virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) 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; // react on ItemSet changes virtual void ItemSetChanged(const SfxItemSet& rSet) override; diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index bc1a0fb3753d..e6a5fc249a6c 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -73,7 +73,7 @@ public: virtual ~_SdrItemBrowserControl(); virtual void dispose() override; void Clear(); - void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); + void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=nullptr); sal_uInt16 GetCurrentWhich() const; bool EndChangeEntry(); void BreakChangeEntry(); @@ -105,7 +105,7 @@ public: virtual void dispose() override; virtual void Resize() override; virtual void GetFocus() override; - void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse->SetAttributes(pAttr,p2ndSet); } + void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=nullptr) { aBrowse->SetAttributes(pAttr,p2ndSet); } _SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); } }; diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index 4b0102619ae8..2bbac7428575 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -32,7 +32,7 @@ public: TYPEINFO_OVERRIDE(); SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrCircKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CIRCKIND,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; } SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); } @@ -41,7 +41,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/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index e8a893cba950..b892e0cb8ee5 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -32,7 +32,7 @@ public: TYPEINFO_OVERRIDE(); SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrMeasureKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREKIND,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 2; } SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); } @@ -41,7 +41,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/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 7077f77eb321..03e6a2c1de31 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -128,10 +128,10 @@ AccessibleControlShape::AccessibleControlShape ( AccessibleControlShape::~AccessibleControlShape() { m_pChildManager->release(); - m_pChildManager = NULL; + m_pChildManager = nullptr; if ( m_xControlContextProxy.is() ) - m_xControlContextProxy->setDelegator( NULL ); + m_xControlContextProxy->setDelegator( nullptr ); m_xControlContextProxy.clear(); m_xControlContextTypeAccess.clear(); m_xControlContextComponent.clear(); @@ -903,7 +903,7 @@ AccessibleControlShape* SAL_CALL AccessibleControlShape::GetLabeledByControlShap } } } - return NULL; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 61f4c1fefdef..58ce8a299b06 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -87,7 +87,7 @@ namespace accessibility // SvxEditSource SvxTextForwarder* GetTextForwarder() override { return this; } SvxViewForwarder* GetViewForwarder() override { return this; } - SvxEditSource* Clone() const override { return NULL; } + SvxEditSource* Clone() const override { return nullptr; } void UpdateData() override {} SfxBroadcaster& GetBroadcaster() const override { return *(const_cast<AccessibleEmptyEditSource_Impl*>(this)); } @@ -110,14 +110,14 @@ namespace accessibility SfxItemState GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const override { return SfxItemState::UNKNOWN; } SfxItemState GetItemState( sal_Int32 /*nPara*/, sal_uInt16 /*nWhich*/ ) const override { return SfxItemState::UNKNOWN; } - SfxItemPool* GetPool() const override { return NULL; } + SfxItemPool* GetPool() const override { return nullptr; } void QuickInsertText( const OUString& /*rText*/, const ESelection& /*rSel*/ ) override {} void QuickInsertField( const SvxFieldItem& /*rFld*/, const ESelection& /*rSel*/ ) override {} void QuickSetAttribs( const SfxItemSet& /*rSet*/, const ESelection& /*rSel*/ ) override {} void QuickInsertLineBreak( const ESelection& /*rSel*/ ) override {} - const SfxItemSet * GetEmptyItemSetPtr() override { return 0; } + const SfxItemSet * GetEmptyItemSetPtr() override { return nullptr; } void AppendParagraph() override {} sal_Int32 AppendTextPortion( sal_Int32 /*nPara*/, const OUString & /*rText*/, const SfxItemSet & /*rSet*/ ) override { return 0; } @@ -140,7 +140,7 @@ namespace accessibility Rectangle GetCharBounds( sal_Int32, sal_Int32 ) const override { return Rectangle(); } Rectangle GetParaBounds( sal_Int32 ) const override { return Rectangle(); } MapMode GetMapMode() const override { return MapMode(); } - OutputDevice* GetRefDevice() const override { return NULL; } + OutputDevice* GetRefDevice() const override { return nullptr; } bool GetIndexAtPoint( const Point&, sal_Int32&, sal_Int32& ) const override { return false; } bool GetWordIndices( sal_Int32, sal_Int32, sal_Int32&, sal_Int32& ) const override { return false; } bool GetAttributeRun( sal_Int32&, sal_Int32&, sal_Int32, sal_Int32, bool ) const override { return false; } @@ -176,7 +176,7 @@ namespace accessibility AccessibleProxyEditSource_Impl::AccessibleProxyEditSource_Impl( SdrObject& rObj, SdrView& rView, const vcl::Window& rViewWindow ) : - maEditSource( rObj, 0, rView, rViewWindow ) + maEditSource( rObj, nullptr, rView, rViewWindow ) { } @@ -250,7 +250,7 @@ namespace accessibility SvxTextForwarder* AccessibleEmptyEditSource::GetTextForwarder() { if( !mpEditSource.get() ) - return NULL; + return nullptr; return mpEditSource->GetTextForwarder(); } @@ -258,7 +258,7 @@ namespace accessibility SvxViewForwarder* AccessibleEmptyEditSource::GetViewForwarder() { if( !mpEditSource.get() ) - return NULL; + return nullptr; return mpEditSource->GetViewForwarder(); } @@ -282,7 +282,7 @@ namespace accessibility SvxEditViewForwarder* AccessibleEmptyEditSource::GetEditViewForwarder( bool bCreate ) { if( !mpEditSource.get() ) - return NULL; + return nullptr; // switch edit source, if not yet done if( mbEditSourceEmpty && bCreate ) @@ -294,7 +294,7 @@ namespace accessibility SvxEditSource* AccessibleEmptyEditSource::Clone() const { if( !mpEditSource.get() ) - return NULL; + return nullptr; return mpEditSource->Clone(); } @@ -323,11 +323,11 @@ namespace accessibility if( mbEditSourceEmpty ) Switch2ProxyEditSource(); } - else if (pSdrHint && pSdrHint->GetObject()!=NULL) + else if (pSdrHint && pSdrHint->GetObject()!=nullptr) { // When the SdrObject just got a para outliner object then // switch the edit source. - if (pSdrHint->GetObject()->GetOutlinerParaObject() != NULL) + if (pSdrHint->GetObject()->GetOutlinerParaObject() != nullptr) Switch2ProxyEditSource(); } diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 9cc6b776bbef..3a85aa885a4d 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -549,7 +549,7 @@ void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId, void AccFrameSelector::Invalidate() { RemoveFrameSelEventListener(); - mpFrameSel = 0; + mpFrameSel = nullptr; EventObject aEvent; Reference < XAccessibleContext > xThis( this ); aEvent.Source = xThis; diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index f5675824ee7d..c75bad34685c 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -190,7 +190,7 @@ OUString AccessibleGraphicShape::CreateAccessibleDescription() sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole() throw (css::uno::RuntimeException, std::exception) { - if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL ) + if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != nullptr ) return AccessibleRole::IMAGE_MAP; else return AccessibleShape::getAccessibleRole(); diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 586521aa53f1..310ef4979533 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -102,12 +102,12 @@ AccessibleShape::AccessibleShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo) : AccessibleContextBase (rShapeInfo.mxParent,AccessibleRole::SHAPE), - mpChildrenManager(NULL), + mpChildrenManager(nullptr), mxShape (rShapeInfo.mxShape), maShapeTreeInfo (rShapeTreeInfo), mnIndex (rShapeInfo.mnIndex), m_nIndexInParent(-1), - mpText (NULL), + mpText (nullptr), mpParent (rShapeInfo.mpChildrenManager) { m_pShape = GetSdrObjectFromXShape(mxShape); @@ -135,7 +135,7 @@ void AccessibleShape::Init() if (xShapes.is() && xShapes->getCount() > 0) mpChildrenManager = new ChildrenManager ( this, xShapes, maShapeTreeInfo, *this); - if (mpChildrenManager != NULL) + if (mpChildrenManager != nullptr) mpChildrenManager->Update(); // Register at model as document::XEventListener. @@ -151,19 +151,19 @@ void AccessibleShape::Init() { SdrView* pView = maShapeTreeInfo.GetSdrView (); const vcl::Window* pWindow = maShapeTreeInfo.GetWindow (); - if (pView != NULL && pWindow != NULL && mxShape.is()) + if (pView != nullptr && pWindow != nullptr && mxShape.is()) { // #107948# Determine whether shape text is empty SdrObject* pSdrObject = GetSdrObjectFromXShape(mxShape); if( pSdrObject ) { SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>( pSdrObject ); - OutlinerParaObject* pOutlinerParaObject = NULL; + OutlinerParaObject* pOutlinerParaObject = nullptr; if( pTextObj ) pOutlinerParaObject = pTextObj->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active - bool bOwnParaObj = pOutlinerParaObject != NULL; + bool bOwnParaObj = pOutlinerParaObject != nullptr; if( !pOutlinerParaObject && pSdrObject ) pOutlinerParaObject = pSdrObject->GetOutlinerParaObject(); @@ -178,7 +178,7 @@ void AccessibleShape::Init() else { // non-empty text -> use full-fledged edit source right away - ::std::unique_ptr<SvxEditSource> pEditSource( new SvxTextEditSource ( *pSdrObject, 0, *pView, *pWindow) ); + ::std::unique_ptr<SvxEditSource> pEditSource( new SvxTextEditSource ( *pSdrObject, nullptr, *pView, *pWindow) ); mpText = new AccessibleTextHelper( std::move(pEditSource) ); } @@ -198,7 +198,7 @@ void AccessibleShape::UpdateStates() { ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); - if (pStateSet == NULL) + if (pStateSet == nullptr) return; // Set the opaque state for certain shape types when their fill style is @@ -262,7 +262,7 @@ bool AccessibleShape::SetState (sal_Int16 aState) { bool bStateHasChanged = false; - if (aState == AccessibleStateType::FOCUSED && mpText != NULL) + if (aState == AccessibleStateType::FOCUSED && mpText != nullptr) { // Offer FOCUSED state to edit engine and detect whether the state // changes. @@ -283,7 +283,7 @@ bool AccessibleShape::ResetState (sal_Int16 aState) { bool bStateHasChanged = false; - if (aState == AccessibleStateType::FOCUSED && mpText != NULL) + if (aState == AccessibleStateType::FOCUSED && mpText != nullptr) { // Try to remove FOCUSED state from the edit engine and detect // whether the state changes. @@ -302,7 +302,7 @@ bool AccessibleShape::ResetState (sal_Int16 aState) bool AccessibleShape::GetState (sal_Int16 aState) { - if (aState == AccessibleStateType::FOCUSED && mpText != NULL) + if (aState == AccessibleStateType::FOCUSED && mpText != nullptr) { // Just delegate the call to the edit engine. The state is not // merged into the state set. @@ -345,10 +345,10 @@ sal_Int32 SAL_CALL sal_Int32 nChildCount = 0; // Add the number of shapes that are children of this shape. - if (mpChildrenManager != NULL) + if (mpChildrenManager != nullptr) nChildCount += mpChildrenManager->GetChildCount (); // Add the number text paragraphs. - if (mpText != NULL) + if (mpText != nullptr) nChildCount += mpText->GetChildCount (); return nChildCount; @@ -370,15 +370,15 @@ uno::Reference<XAccessible> SAL_CALL // Depending on the index decide whether to delegate this call to the // children manager or the edit engine. - if ((mpChildrenManager != NULL) + if ((mpChildrenManager != nullptr) && (nIndex < mpChildrenManager->GetChildCount())) { xChild = mpChildrenManager->GetChild (nIndex); } - else if (mpText != NULL) + else if (mpText != nullptr) { sal_Int32 nI = nIndex; - if (mpChildrenManager != NULL) + if (mpChildrenManager != nullptr) nI -= mpChildrenManager->GetChildCount(); xChild = mpText->GetChild (nI); } @@ -395,7 +395,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); - if (mpParent == NULL) + if (mpParent == nullptr) return uno::Reference<XAccessibleRelationSet>(); ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper; @@ -423,7 +423,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ::osl::MutexGuard aGuard (maMutex); Reference<XAccessibleStateSet> xStateSet; - if (rBHelper.bDisposed || mpText == NULL) + if (rBHelper.bDisposed || mpText == nullptr) // Return a minimal state set that only contains the DEFUNC state. { xStateSet = AccessibleContextBase::getAccessibleStateSet (); @@ -461,10 +461,10 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); - if (pStateSet != NULL) + if (pStateSet != nullptr) { // Merge current FOCUSED state from edit engine. - if (mpText != NULL) + if (mpText != nullptr) { if (mpText->HaveFocus()) pStateSet->AddState (AccessibleStateType::FOCUSED); @@ -619,7 +619,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds() } // Transform coordinates from internal to pixel. - if (maShapeTreeInfo.GetViewForwarder() == NULL) + if (maShapeTreeInfo.GetViewForwarder() == nullptr) throw uno::RuntimeException (OUString ( "AccessibleShape has no valid view forwarder"), static_cast<uno::XWeak*>(this)); @@ -789,7 +789,7 @@ void SAL_CALL AccessibleShape::addAccessibleEventListener ( else { AccessibleContextBase::addAccessibleEventListener (rxListener); - if (mpText != NULL) + if (mpText != nullptr) mpText->AddEventListener (rxListener); } } @@ -802,7 +802,7 @@ void SAL_CALL AccessibleShape::removeAccessibleEventListener ( throw (uno::RuntimeException, std::exception) { AccessibleContextBase::removeAccessibleEventListener (rxListener); - if (mpText != NULL) + if (mpText != nullptr) mpText->RemoveEventListener (rxListener); } @@ -1042,7 +1042,7 @@ void SAL_CALL { // Remove reference to model broadcaster to allow it to pass // away. - maShapeTreeInfo.SetModelBroadcaster(NULL); + maShapeTreeInfo.SetModelBroadcaster(nullptr); } } @@ -1102,7 +1102,7 @@ AccessibleShape* throw() { uno::Reference< lang::XUnoTunnel > xTunnel( rxIFace, uno::UNO_QUERY ); - AccessibleShape* pReturn = NULL; + AccessibleShape* pReturn = nullptr; if( xTunnel.is() ) pReturn = reinterpret_cast< AccessibleShape* >( xTunnel->getSomething( getUnoTunnelImplementationId() ) ); @@ -1134,7 +1134,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, uno::Any()); // Tell children manager of the modified view forwarder. - if (mpChildrenManager != NULL) + if (mpChildrenManager != nullptr) mpChildrenManager->ViewForwarderChanged (aChangeType, pViewForwarder); // update our children that our screen position might have changed @@ -1273,7 +1273,7 @@ void AccessibleShape::disposing() // case that it has the focus. ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); - if (pStateSet != NULL) + if (pStateSet != nullptr) pStateSet->RemoveState (AccessibleStateType::FOCUSED); // Unregister from broadcasters. @@ -1287,21 +1287,21 @@ void AccessibleShape::disposing() static_cast<document::XEventListener*>(this)); // Release the child containers. - if (mpChildrenManager != NULL) + if (mpChildrenManager != nullptr) { delete mpChildrenManager; - mpChildrenManager = NULL; + mpChildrenManager = nullptr; } - if (mpText != NULL) + if (mpText != nullptr) { mpText->Dispose(); delete mpText; - mpText = NULL; + mpText = nullptr; } // Cleanup. Remove references to objects to allow them to be // destroyed. - mxShape = NULL; + mxShape = nullptr; maShapeTreeInfo = AccessibleShapeTreeInfo(); // Call base classes. @@ -1430,7 +1430,7 @@ throw (uno::RuntimeException, std::exception) SdrObject *pObj = GetSdrObjectFromXShape(mxShape); - if(pObj == NULL ) + if(pObj == nullptr ) { return aRet; } @@ -1462,7 +1462,7 @@ throw (uno::RuntimeException, std::exception) return aRet; } - SdrObjList *pGrpList = NULL; + SdrObjList *pGrpList = nullptr; if( pObj->GetUpGroup() ) pGrpList = pObj->GetUpGroup()->GetSubList(); else @@ -1510,7 +1510,7 @@ OUString AccessibleShape::getObjectLink( const uno::Any& ) OUString aRet; SdrObject *pObj = GetSdrObjectFromXShape(mxShape); - if(pObj == NULL ) + if(pObj == nullptr ) { return aRet; } diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index 8ecbdfd146c2..bc681c08324d 100644 --- a/svx/source/accessibility/AccessibleShapeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeInfo.cxx @@ -44,7 +44,7 @@ AccessibleShapeInfo::AccessibleShapeInfo ( sal_Int32 nIndex) : mxShape (rxShape), mxParent (rxParent), - mpChildrenManager (NULL), + mpChildrenManager (nullptr), mnIndex (nIndex) { // empty. diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index b141ce88d64a..1576ecf72c01 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -29,9 +29,9 @@ using ::com::sun::star::uno::Reference; namespace accessibility { AccessibleShapeTreeInfo::AccessibleShapeTreeInfo() - : mpView (NULL), - mpWindow (NULL), - mpViewForwarder (NULL) + : mpView (nullptr), + mpWindow (nullptr), + mpViewForwarder (nullptr) { // Empty. } diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 7464cf8426f9..d7e673079b6f 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -243,7 +243,7 @@ namespace accessibility }; AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() : - mxFrontEnd( NULL ), + mxFrontEnd( nullptr ), maLastSelection( EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND,EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND ), mnFirstVisibleChild( -1 ), mnLastVisibleChild( -2 ), @@ -1514,7 +1514,7 @@ namespace accessibility // clear references maEditSource.SetEditSource( ::std::unique_ptr< SvxEditSource >() ); - mxFrontEnd = NULL; + mxFrontEnd = nullptr; } void AccessibleTextHelper_Impl::FireEvent( const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue ) const @@ -1573,7 +1573,7 @@ namespace accessibility if( mxFrontEnd.is() ) return maParaManager.CreateChild( i, mxFrontEnd, GetEditSource(), mnFirstVisibleChild + i ).first; else - return NULL; + return nullptr; } void SAL_CALL AccessibleTextHelper_Impl::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) @@ -1640,7 +1640,7 @@ namespace accessibility } // found none - return NULL; + return nullptr; } diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 49f193e0f4c4..be9dae16dc8a 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -33,14 +33,14 @@ ChildrenManager::ChildrenManager ( const css::uno::Reference<drawing::XShapes>& rxShapeList, const AccessibleShapeTreeInfo& rShapeTreeInfo, AccessibleContextBase& rContext) - : mpImpl (NULL) + : mpImpl (nullptr) { mpImpl = new ChildrenManagerImpl (rxParent, rxShapeList, rShapeTreeInfo, rContext); - if (mpImpl != NULL) + if (mpImpl != nullptr) mpImpl->Init (); else throw uno::RuntimeException( - "ChildrenManager::ChildrenManager can't create implementation object", NULL); + "ChildrenManager::ChildrenManager can't create implementation object", nullptr); } @@ -48,7 +48,7 @@ ChildrenManager::ChildrenManager ( ChildrenManager::~ChildrenManager() { - if (mpImpl != NULL) + if (mpImpl != nullptr) mpImpl->dispose(); // emtpy @@ -57,7 +57,7 @@ ChildrenManager::~ChildrenManager() long ChildrenManager::GetChildCount() const throw () { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); return mpImpl->GetChildCount(); } @@ -65,14 +65,14 @@ css::uno::Reference<XAccessible> ChildrenManager::GetChild (long nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException) { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); return mpImpl->GetChild (nIndex); } Reference<XAccessible> ChildrenManager::GetChild (const Reference<drawing::XShape>& xShape) throw (css::uno::RuntimeException) { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); return mpImpl->GetChild (xShape); } @@ -80,55 +80,55 @@ css::uno::Reference<css::drawing::XShape> ChildrenManager::GetChildShape(long nI throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException) { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); return mpImpl->GetChildShape(nIndex); } void ChildrenManager::Update (bool bCreateNewObjectsOnDemand) { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); mpImpl->Update (bCreateNewObjectsOnDemand); } void ChildrenManager::SetShapeList (const css::uno::Reference<css::drawing::XShapes>& xShapeList) { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); mpImpl->SetShapeList (xShapeList); } void ChildrenManager::AddAccessibleShape (css::uno::Reference<css::accessibility::XAccessible> const & shape) { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); mpImpl->AddAccessibleShape (shape); } void ChildrenManager::ClearAccessibleShapeList() { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); mpImpl->ClearAccessibleShapeList (); } void ChildrenManager::SetInfo (AccessibleShapeTreeInfo& rShapeTreeInfo) { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); mpImpl->SetInfo (rShapeTreeInfo); } void ChildrenManager::UpdateSelection() { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); mpImpl->UpdateSelection (); } bool ChildrenManager::HasFocus() { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); return mpImpl->HasFocus (); } void ChildrenManager::RemoveFocus() { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); mpImpl->RemoveFocus (); } @@ -136,7 +136,7 @@ void ChildrenManager::RemoveFocus() void ChildrenManager::ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) { - assert(mpImpl != NULL); + assert(mpImpl != nullptr); mpImpl->ViewForwarderChanged (aChangeType, pViewForwarder); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 0a01bedeb7c7..7c1e4491b75d 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -66,7 +66,7 @@ ChildrenManagerImpl::ChildrenManagerImpl ( maShapeTreeInfo (rShapeTreeInfo), mrContext (rContext), mnNewNameIndex(1), - mpFocusedShape(NULL) + mpFocusedShape(nullptr) { } @@ -216,7 +216,7 @@ uno::Reference<XAccessible> */ void ChildrenManagerImpl::Update (bool bCreateNewObjectsOnDemand) { - if (maShapeTreeInfo.GetViewForwarder() == NULL) + if (maShapeTreeInfo.GetViewForwarder() == nullptr) return; Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea(); @@ -295,7 +295,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes ( { SolarMutexGuard g; - OSL_ASSERT (maShapeTreeInfo.GetViewForwarder() != NULL); + OSL_ASSERT (maShapeTreeInfo.GetViewForwarder() != nullptr); Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea(); @@ -376,7 +376,7 @@ void ChildrenManagerImpl::RemoveNonVisibleChildren ( { AccessibleShape* pAccessibleShape = I->GetAccessibleShape(); pAccessibleShape->ResetState (AccessibleStateType::VISIBLE); - I->mxAccessibleShape = NULL; + I->mxAccessibleShape = nullptr; } } } @@ -421,7 +421,7 @@ void ChildrenManagerImpl::SendVisibleAreaEvents ( // change of the view forwarder. (Actually we usually get here // as a result of a change of the view forwarder). AccessibleShape* pShape = I->GetAccessibleShape (); - if (pShape != NULL) + if (pShape != nullptr) pShape->ViewForwarderChanged ( IAccessibleViewForwarderListener::VISIBLE_AREA, maShapeTreeInfo.GetViewForwarder()); @@ -583,7 +583,7 @@ void ChildrenManagerImpl::ClearAccessibleShapeList() if ( I->mxAccessibleShape.is() && I->mxShape.is() ) { ::comphelper::disposeComponent(I->mxAccessibleShape); - I->mxAccessibleShape = NULL; + I->mxAccessibleShape = nullptr; } // Dispose all objects in the accessible shape list. @@ -593,7 +593,7 @@ void ChildrenManagerImpl::ClearAccessibleShapeList() { // Dispose the object. ::comphelper::disposeComponent(*J); - *J = NULL; + *J = nullptr; } } @@ -683,7 +683,7 @@ void SAL_CALL { // Clear the descriptor. I->disposeAccessibleObject (mrContext); - I->mxShape = NULL; + I->mxShape = nullptr; } } } @@ -744,7 +744,7 @@ void ChildrenManagerImpl::impl_dispose() catch( uno::RuntimeException&) {} - maShapeTreeInfo.SetController (NULL); + maShapeTreeInfo.SetController (nullptr); try { @@ -752,13 +752,13 @@ void ChildrenManagerImpl::impl_dispose() if (maShapeTreeInfo.GetModelBroadcaster().is()) maShapeTreeInfo.GetModelBroadcaster()->removeEventListener ( static_cast<document::XEventListener*>(this)); - maShapeTreeInfo.SetModelBroadcaster (NULL); + maShapeTreeInfo.SetModelBroadcaster (nullptr); } catch( uno::RuntimeException& ) {} ClearAccessibleShapeList (); - SetShapeList (NULL); + SetShapeList (nullptr); } @@ -781,7 +781,7 @@ void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType, for (I=maVisibleChildren.begin(); I != aEnd; ++I) { AccessibleShape* pShape = I->GetAccessibleShape(); - if (pShape != NULL) + if (pShape != nullptr) pShape->ViewForwarderChanged (aChangeType, pViewForwarder); } } @@ -855,7 +855,7 @@ AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::b return pCtlAccShape; } } - return NULL; + return nullptr; } uno::Reference<XAccessible> ChildrenManagerImpl::GetAccessibleCaption (const uno::Reference<drawing::XShape>& xShape) @@ -897,8 +897,8 @@ void ChildrenManagerImpl::UpdateSelection() } // Remember the current and new focused shape. - AccessibleShape* pCurrentlyFocusedShape = NULL; - AccessibleShape* pNewFocusedShape = NULL; + AccessibleShape* pCurrentlyFocusedShape = nullptr; + AccessibleShape* pNewFocusedShape = nullptr; typedef std::pair< AccessibleShape* , sal_Bool > PAIR_SHAPE;//sal_Bool Selected,UnSelected. typedef std::vector< PAIR_SHAPE > VEC_SHAPE; VEC_SHAPE vecSelect; @@ -909,7 +909,7 @@ void ChildrenManagerImpl::UpdateSelection() for (I=maVisibleChildren.begin(); I != aEnd; ++I) { AccessibleShape* pAccessibleShape = I->GetAccessibleShape(); - if (I->mxAccessibleShape.is() && I->mxShape.is() && pAccessibleShape!=NULL) + if (I->mxAccessibleShape.is() && I->mxShape.is() && pAccessibleShape!=nullptr) { short nRole = pAccessibleShape->getAccessibleRole(); bool bDrawShape = ( @@ -989,9 +989,9 @@ void ChildrenManagerImpl::UpdateSelection() // Move focus from current to newly focused shape. if (pCurrentlyFocusedShape != pNewFocusedShape) { - if (pCurrentlyFocusedShape != NULL) + if (pCurrentlyFocusedShape != nullptr) pCurrentlyFocusedShape->ResetState (AccessibleStateType::FOCUSED); - if (pNewFocusedShape != NULL && bShapeActive) + if (pNewFocusedShape != nullptr && bShapeActive) pNewFocusedShape->SetState (AccessibleStateType::FOCUSED); } @@ -1048,7 +1048,7 @@ void ChildrenManagerImpl::UpdateSelection() bool ChildrenManagerImpl::HasFocus() { - return mpFocusedShape != NULL; + return mpFocusedShape != nullptr; } @@ -1056,10 +1056,10 @@ bool ChildrenManagerImpl::HasFocus() void ChildrenManagerImpl::RemoveFocus() { - if (mpFocusedShape != NULL) + if (mpFocusedShape != nullptr) { mpFocusedShape->ResetState (AccessibleStateType::FOCUSED); - mpFocusedShape = NULL; + mpFocusedShape = nullptr; } } @@ -1089,7 +1089,7 @@ void ChildrenManagerImpl::UnregisterAsDisposeListener ( // AccessibleChildDescriptor ChildDescriptor::ChildDescriptor (const Reference<drawing::XShape>& xShape) : mxShape (xShape), - mxAccessibleShape (NULL), + mxAccessibleShape (nullptr), mbCreateEventPending (true) { // Empty. @@ -1099,7 +1099,7 @@ ChildDescriptor::ChildDescriptor (const Reference<drawing::XShape>& xShape) ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShape) - : mxShape (NULL), + : mxShape (nullptr), mxAccessibleShape (rxAccessibleShape), mbCreateEventPending (true) { @@ -1152,7 +1152,7 @@ void ChildDescriptor::disposeAccessibleObject (AccessibleContextBase& rParent) if (xComponent.is()) xComponent->dispose (); - mxAccessibleShape = NULL; + mxAccessibleShape = nullptr; } } diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 7bed55b7f3bf..0aa17dbce2df 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -70,27 +70,27 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( SvxGraphCtrlAccessibleContext_Base( m_aMutex ), mxParent( rxParent ), mpControl( &rRepr ), - mpModel (NULL), - mpPage (NULL), - mpView (NULL), + mpModel (nullptr), + mpPage (nullptr), + mpView (nullptr), mnClientId( 0 ), mbDisposed( false ) { if (mpControl != nullptr) { mpModel = mpControl->GetSdrModel(); - if (mpModel != NULL) + if (mpModel != nullptr) mpPage = mpModel->GetPage( 0 ); mpView = mpControl->GetSdrView(); - if( mpModel == NULL || mpPage == NULL || mpView == NULL ) + if( mpModel == nullptr || mpPage == nullptr || mpView == nullptr ) { mbDisposed = true; // Set all the pointers to NULL just in case they are used as // a disposed flag. - mpModel = NULL; - mpPage = NULL; - mpView = NULL; + mpModel = nullptr; + mpPage = nullptr; + mpView = nullptr; } } @@ -201,11 +201,11 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAt Point aPnt( rPoint.X, rPoint.Y ); mpControl->PixelToLogic( aPnt ); - SdrObject* pObj = 0; + SdrObject* pObj = nullptr; if(mpView && mpView->GetSdrPageView()) { - pObj = SdrObjListPrimitiveHit(*mpPage, aPnt, 1, *mpView->GetSdrPageView(), 0, false); + pObj = SdrObjListPrimitiveHit(*mpPage, aPnt, 1, *mpView->GetSdrPageView(), nullptr, false); } if( pObj ) @@ -265,7 +265,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() thro { ::SolarMutexGuard aGuard; - if( NULL == mpPage ) + if( nullptr == mpPage ) throw DisposedException(); return mpPage->GetObjCount(); @@ -279,7 +279,7 @@ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) { ::SolarMutexGuard aGuard; - if( NULL == mpPage ) + if( nullptr == mpPage ) throw DisposedException(); if( (nIndex < 0) || ( static_cast<size_t>(nIndex) >= mpPage->GetObjCount() ) ) @@ -535,7 +535,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI { ::SolarMutexGuard aGuard; - if( NULL == mpView ) + if( nullptr == mpView ) throw DisposedException(); SdrObject* pObj = getSdrObject( nIndex ); @@ -550,7 +550,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_ { ::SolarMutexGuard aGuard; - if( NULL == mpView ) + if( nullptr == mpView ) throw DisposedException(); return mpView->IsObjMarked( getSdrObject( nIndex ) ); @@ -562,7 +562,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R { ::SolarMutexGuard aGuard; - if( NULL == mpView ) + if( nullptr == mpView ) throw DisposedException(); mpView->UnmarkAllObj(); @@ -574,7 +574,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw { ::SolarMutexGuard aGuard; - if( NULL == mpView ) + if( nullptr == mpView ) throw DisposedException(); mpView->MarkAllObj(); @@ -586,7 +586,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun { ::SolarMutexGuard aGuard; - if( NULL == mpView ) + if( nullptr == mpView ) throw DisposedException(); const SdrMarkList& rList = mpView->GetMarkedObjectList(); @@ -661,19 +661,19 @@ void SvxGraphCtrlAccessibleContext::setModelAndView ( ::SolarMutexGuard aGuard; mpModel = pModel; - if (mpModel != NULL) + if (mpModel != nullptr) mpPage = mpModel->GetPage( 0 ); mpView = pView; - if (mpModel == NULL || mpPage == NULL || mpView == NULL) + if (mpModel == nullptr || mpPage == nullptr || mpView == nullptr) { mbDisposed = true; // Set all the pointers to NULL just in case they are used as // a disposed flag. - mpModel = NULL; - mpPage = NULL; - mpView = NULL; + mpModel = nullptr; + mpPage = nullptr; + mpView = nullptr; } maTreeInfo.SetSdrView (mpView); @@ -692,9 +692,9 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() mbDisposed = true; - mpControl = NULL; // object dies with representation - mpView = NULL; - mpPage = NULL; + mpControl = nullptr; // object dies with representation + mpView = nullptr; + mpPage = nullptr; { ShapesMapType::iterator I; @@ -746,13 +746,13 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox() throw( RuntimeExceptio Rectangle aBounds ( 0, 0, 0, 0 ); vcl::Window* pWindow = mpControl; - if (pWindow != NULL) + if (pWindow != nullptr) { - aBounds = pWindow->GetWindowExtentsRelative (NULL); + aBounds = pWindow->GetWindowExtentsRelative (nullptr); vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); - if (pParent != NULL) + if (pParent != nullptr) { - Rectangle aParentRect = pParent->GetWindowExtentsRelative (NULL); + Rectangle aParentRect = pParent->GetWindowExtentsRelative (nullptr); aBounds -= aParentRect.TopLeft(); } } @@ -830,7 +830,7 @@ Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const { if( mpControl ) { - Rectangle aBBox(mpControl->GetWindowExtentsRelative(NULL)); + Rectangle aBBox(mpControl->GetWindowExtentsRelative(nullptr)); return mpControl->LogicToPixel (rPoint) + aBBox.TopLeft(); } else diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index bacd47c1ad9a..c6e27664044d 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { // Pointer to the shape type handler singleton. -ShapeTypeHandler* ShapeTypeHandler::instance = NULL; +ShapeTypeHandler* ShapeTypeHandler::instance = nullptr; // Create an empty reference to an accessible object. @@ -48,7 +48,7 @@ AccessibleShape* const AccessibleShapeTreeInfo& /*rShapeTreeInfo*/, ShapeTypeId /*nId*/) { - return NULL; + return nullptr; } @@ -58,10 +58,10 @@ ShapeTypeHandler& ShapeTypeHandler::Instance() { // Using double check pattern to make sure that exactly one instance of // the shape type handler is instantiated. - if (instance == NULL) + if (instance == nullptr) { SolarMutexGuard aGuard; - if (instance == NULL) + if (instance == nullptr) { // Create the single instance of the shape type handler. instance = new ShapeTypeHandler; @@ -154,7 +154,7 @@ ShapeTypeHandler::~ShapeTypeHandler() // we reset the static variable instance, so that further calls to // getInstance do not return an undefined object but create a new // singleton. - instance = NULL; + instance = nullptr; } diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index 308950f2997d..250159891a20 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -80,7 +80,7 @@ AccessibleShape* CreateSvxAccessibleShape ( return new AccessibleTableShape( rShapeInfo, rShapeTreeInfo ); default: - return NULL; + return nullptr; } } diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index d2bed5cb1581..9be840d2f054 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -44,7 +44,7 @@ namespace svx SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock()) ,mpParent( pParent ) -,m_pTable(NULL) +,m_pTable(nullptr) { osl_atomic_increment(&m_refCount); { @@ -154,12 +154,12 @@ css::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds( ) throw (RuntimeEx vcl::Window* pWindow = mpParent; if ( pWindow ) { - Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL ); + Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr ); aBounds = AWTRectangle( aRect ); vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); if ( pParent ) { - Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL ); + Rectangle aParentRect = pParent->GetWindowExtentsRelative( nullptr ); css::awt::Point aParentScreenLoc = AWTPoint( aParentRect.TopLeft() ); aBounds.X -= aParentScreenLoc.X; aBounds.Y -= aParentScreenLoc.Y; @@ -221,7 +221,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing() OAccessibleContextHelper::disposing(); if ( m_pTable ) m_pTable->dispose(); - m_pTable = NULL; + m_pTable = nullptr; } @@ -231,7 +231,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing() SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ) : mrParent( rParent ) ,mnId( _nPos ) - ,m_pItem(NULL) + ,m_pItem(nullptr) ,m_pParent(_pParent) { } @@ -265,8 +265,8 @@ void SvxShowCharSetItem::ClearAccessible() { if ( m_xAcc.is() ) { - m_pItem = NULL; - m_xAcc = NULL; + m_pItem = nullptr; + m_xAcc = nullptr; } } @@ -302,7 +302,7 @@ void SAL_CALL SvxShowCharSetAcc::disposing() ::comphelper::disposeComponent(*aIter); m_aChildren.clear(); - m_pParent = NULL; + m_pParent = nullptr; } @@ -632,7 +632,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetItemAcc, OAccessibleComponentHel void SvxShowCharSetItemAcc::ParentDestroyed() { const ::osl::MutexGuard aGuard( GetMutex() ); - mpParent = NULL; + mpParent = nullptr; } diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index b5489af9f36e..62e9fd555ce6 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -259,7 +259,7 @@ awt::Point SvxPixelCtlAccessible::getLocation( ) throw (uno::RuntimeException, awt::Point SvxPixelCtlAccessible::getLocationOnScreen( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); - Rectangle rect = mrPixelCtl.GetWindowExtentsRelative(NULL); + Rectangle rect = mrPixelCtl.GetWindowExtentsRelative(nullptr); return awt::Point(rect.Left(),rect.Top() ); } @@ -433,7 +433,7 @@ void SvxPixelCtlAccessible::NotifyChild(long nIndex,bool bSelect ,bool bCheck) { DBG_ASSERT( !(!bSelect && !bCheck),"" );//non is false - SvxPixelCtlAccessibleChild *pChild= NULL; + SvxPixelCtlAccessibleChild *pChild= nullptr; if (m_xCurChild.is()) { @@ -597,8 +597,8 @@ awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeEx //Modified by lq, 09/26 //return AWTRectangle( GetBoundingBox() ); awt::Rectangle rect = AWTRectangle( GetBoundingBox() ); - rect.X = rect.X + mrParentWindow.GetClientWindowExtentsRelative(NULL).Left()-mrParentWindow.GetWindowExtentsRelative(NULL).Left(); - rect.Y = rect.Y + mrParentWindow.GetClientWindowExtentsRelative(NULL).Top()-mrParentWindow.GetWindowExtentsRelative(NULL).Top(); + rect.X = rect.X + mrParentWindow.GetClientWindowExtentsRelative(nullptr).Left()-mrParentWindow.GetWindowExtentsRelative(nullptr).Left(); + rect.Y = rect.Y + mrParentWindow.GetClientWindowExtentsRelative(nullptr).Top()-mrParentWindow.GetWindowExtentsRelative(nullptr).Top(); return rect; // End } diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 79ca4715d12e..b25774e763c4 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -140,7 +140,7 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext( SvxRectCtlAccessibleContext_Base( m_aMutex ), mxParent( rxParent ), mpRepr( &rRepr ), - mpChildren( NULL ), + mpChildren( nullptr ), mnClientId( 0 ), mnSelectedChild( NOCHILDSELECTED ), mbAngleMode( rRepr.GetNumOfChildren() == 8 ) @@ -166,7 +166,7 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext( SvxRectCtlChildAccessibleContext** p = mpChildren; for( int i = MAX_NUM_OF_CHILDREN ; i ; --i, ++p ) - *p = NULL; + *p = nullptr; } @@ -648,7 +648,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing() { { ::osl::MutexGuard aGuard( m_aMutex ); - mpRepr = NULL; // object dies with representation + mpRepr = nullptr; // object dies with representation SvxRectCtlChildAccessibleContext** p = mpChildren; for( int i = MAX_NUM_OF_CHILDREN ; i ; --i, ++p ) @@ -658,12 +658,12 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing() { pChild->dispose(); pChild->release(); - *p = NULL; + *p = nullptr; } } delete[] mpChildren; - mpChildren = NULL; + mpChildren = nullptr; } { diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index 6e6118e88553..d9b749328357 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -36,7 +36,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL svxcore_component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { - void * pRet = 0; + void * pRet = nullptr; if( pServiceManager ) { Reference< XSingleServiceFactory > xFactory; diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index 26ca13d110a8..3f9c22b45cef 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -171,8 +171,8 @@ void SdrExternalToolEdit::Notify(SfxBroadcaster & rBC, SfxHint const& rHint) || (pSdrHint->GetObject() == m_pObj && HINT_OBJREMOVED == pSdrHint->GetKind()))) { - m_pView = 0; - m_pObj = 0; + m_pView = nullptr; + m_pObj = nullptr; m_pChecker.reset(); // avoid modifying deleted object EndListening(rBC); } diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index c30f499ce7a4..cb4ba74454a1 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -536,7 +536,7 @@ bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle( const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomShapeGeometryItem& rGeometryItem ) { - const sal_Int32* pDefData = NULL; + const sal_Int32* pDefData = nullptr; const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType ); if ( pDefCustomShape ) pDefData = pDefCustomShape->pDefData; @@ -1967,7 +1967,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm } else { - SdrPathObj* pObj = 0; + SdrPathObj* pObj = nullptr; SfxItemSet aTempSet(*this); aTempSet.Put(makeSdrShadowItem(false)); @@ -2168,7 +2168,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) { sal_Int32 nCoordSize = seqCoordinates.getLength(); if ( !nCoordSize ) - return NULL; + return nullptr; sal_uInt16 nSrcPt = 0; sal_uInt16 nSegmentInd = 0; @@ -2184,7 +2184,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) nSubPathIndex ++; } - SdrObject* pRet = NULL; + SdrObject* pRet = nullptr; if ( !vObjectList.empty() ) { @@ -2308,7 +2308,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) SdrObject* EnhancedCustomShape2d::CreateObject( bool bLineGeometryNeededOnly ) { - SdrObject* pRet = NULL; + SdrObject* pRet = nullptr; if ( eSpType == mso_sptRectangle ) { diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 45b0cc58549a..7e2b45ee057a 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -254,11 +254,11 @@ bool EnhancedCustomShape3d::Transformation2D::IsParallel() const SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, const SdrObject* pCustomShape ) { - SdrObject* pRet = NULL; + SdrObject* pRet = nullptr; SdrModel* pModel = pCustomShape->GetModel(); const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); - double fMap, *pMap = NULL; + double fMap, *pMap = nullptr; if ( pModel ) { fMap = 1.0; @@ -653,14 +653,14 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con // light - double fAmbientIntensity = GetDouble( rGeometryItem, "Brightness", 22178.0 / 655.36, NULL ) / 100.0; + double fAmbientIntensity = GetDouble( rGeometryItem, "Brightness", 22178.0 / 655.36, nullptr ) / 100.0; drawing::Direction3D aFirstLightDirectionDefault( 50000, 0, 10000 ); drawing::Direction3D aFirstLightDirection( GetDirection3D( rGeometryItem, "FirstLightDirection", aFirstLightDirectionDefault ) ); if ( aFirstLightDirection.DirectionZ == 0.0 ) aFirstLightDirection.DirectionZ = 1.0; - double fLightIntensity = GetDouble( rGeometryItem, "FirstLightLevel", 43712.0 / 655.36, NULL ) / 100.0; + double fLightIntensity = GetDouble( rGeometryItem, "FirstLightLevel", 43712.0 / 655.36, nullptr ) / 100.0; /* sal_Bool bFirstLightHarsh = */ GetBool( rGeometryItem, "FirstLightHarsh", false ); @@ -669,7 +669,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con if ( aSecondLightDirection.DirectionZ == 0.0 ) aSecondLightDirection.DirectionZ = -1; - double fLight2Intensity = GetDouble( rGeometryItem, "SecondLightLevel", 43712.0 / 655.36, NULL ) / 100.0; + double fLight2Intensity = GetDouble( rGeometryItem, "SecondLightLevel", 43712.0 / 655.36, nullptr ) / 100.0; /* sal_Bool bLight2Harsh = */ GetBool( rGeometryItem, "SecondLightHarsh", false ); /* sal_Bool bLightFace = */ GetBool( rGeometryItem, "LightFace", false ); @@ -703,7 +703,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con pScene->GetProperties().SetObjectItem( makeSvx3DLightcolor3Item( aAmbientSpot3Color ) ); pScene->GetProperties().SetObjectItem( makeSvx3DLightDirection3Item( aSpotLight3 ) ); - double fSpecular = GetDouble( rGeometryItem, "Specularity", 0, NULL ) / 100; + double fSpecular = GetDouble( rGeometryItem, "Specularity", 0, nullptr ) / 100; bool bMetal = GetBool( rGeometryItem, "Metal", false ); Color aSpecularCol( 225,225,225 ); diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 8235db8530d5..5cb4076026ca 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -193,7 +193,7 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom { // #i37011# also create a text object and add at rPos + 1 SdrObject* pTextObj = SdrObjFactory::MakeNewObject( - pCustoObj->GetObjInventor(), OBJ_TEXT, 0L, pCustoObj->GetModel()); + pCustoObj->GetObjInventor(), OBJ_TEXT, nullptr, pCustoObj->GetModel()); // Copy text content OutlinerParaObject* pParaObj = pCustoObj->GetOutlinerParaObject(); @@ -439,7 +439,7 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom while ( aIter.IsMore() ) { - SdrObject* pNewObj = NULL; + SdrObject* pNewObj = nullptr; basegfx::B2DPolyPolygon aPP; const SdrObject* pNext = aIter.Next(); diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 85cffda5fe17..422952a7766b 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -268,7 +268,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F const SvxCharScaleWidthItem& rCharScaleWidthItem = static_cast<const SvxCharScaleWidthItem&>(pCustomShape->GetMergedItem( EE_CHAR_FONTWIDTH )); sal_uInt16 nCharScaleWidth = rCharScaleWidthItem.GetValue(); - long* pDXArry = NULL; + long* pDXArry = nullptr; sal_Int32 nWidth = 0; // VERTICAL @@ -791,7 +791,7 @@ void FitTextOutlinesToShapeOutlines( const tools::PolyPolygon& aOutlines2d, FWDa SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const SdrObject* pCustomShape ) { - SdrObject* pRet = NULL; + SdrObject* pRet = nullptr; basegfx::B2DPolyPolygon aPolyPoly; if ( !rFWData.vTextAreas.empty() ) { @@ -831,7 +831,7 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd return pRet; } -Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::mxBreakIterator = 0; +Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::mxBreakIterator = nullptr; Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::GetBreakIterator() { @@ -845,7 +845,7 @@ Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::GetBreakIterator SdrObject* EnhancedCustomShapeFontWork::CreateFontWork( const SdrObject* pShape2d, const SdrObject* pCustomShape ) { - SdrObject* pRet = NULL; + SdrObject* pRet = nullptr; tools::PolyPolygon aOutlines2d( GetOutlinesFromShape2d( pShape2d ) ); sal_uInt16 nOutlinesCount2d = aOutlines2d.Count(); diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 7300ea5ed1a5..5360a9ea067a 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -298,7 +298,7 @@ public: case ENUM_FUNC_PI : { ConstantValueExpression aConstantValue( getValue( mrCustoShape, meFunct ) ); - aRet = aConstantValue.fillNode( rEquations, NULL, nFlags ); + aRet = aConstantValue.fillNode( rEquations, nullptr, nFlags ); } break; case ENUM_FUNC_LEFT : aRet.Type = EnhancedCustomShapeParameterType::LEFT; break; @@ -371,7 +371,7 @@ public: { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 3; - FillEquationParameter( mpArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); + FillEquationParameter( mpArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -381,7 +381,7 @@ public: { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 13; - FillEquationParameter( mpArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); + FillEquationParameter( mpArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -392,11 +392,11 @@ public: EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 9; if ( pOptionalArg ) - FillEquationParameter( pOptionalArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); + FillEquationParameter( pOptionalArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); else aEquation.nPara[ 0 ] = 1; - EnhancedCustomShapeParameter aSource( mpArg->fillNode( rEquations, NULL, nFlags | EXPRESSION_FLAG_SUMANGLE_MODE ) ); + EnhancedCustomShapeParameter aSource( mpArg->fillNode( rEquations, nullptr, nFlags | EXPRESSION_FLAG_SUMANGLE_MODE ) ); if ( aSource.Type == EnhancedCustomShapeParameterType::NORMAL ) { // sumangle needed :-( EnhancedCustomShapeEquation _aEquation; @@ -417,11 +417,11 @@ public: EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 10; if ( pOptionalArg ) - FillEquationParameter( pOptionalArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); + FillEquationParameter( pOptionalArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); else aEquation.nPara[ 0 ] = 1; - EnhancedCustomShapeParameter aSource( mpArg->fillNode( rEquations, NULL, nFlags | EXPRESSION_FLAG_SUMANGLE_MODE ) ); + EnhancedCustomShapeParameter aSource( mpArg->fillNode( rEquations, nullptr, nFlags | EXPRESSION_FLAG_SUMANGLE_MODE ) ); if ( aSource.Type == EnhancedCustomShapeParameterType::NORMAL ) { // sumangle needed :-( EnhancedCustomShapeEquation aTmpEquation; @@ -442,11 +442,11 @@ public: EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 16; if ( pOptionalArg ) - FillEquationParameter( pOptionalArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); + FillEquationParameter( pOptionalArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); else aEquation.nPara[ 0 ] = 1; - EnhancedCustomShapeParameter aSource( mpArg->fillNode( rEquations, NULL, nFlags | EXPRESSION_FLAG_SUMANGLE_MODE ) ); + EnhancedCustomShapeParameter aSource( mpArg->fillNode( rEquations, nullptr, nFlags | EXPRESSION_FLAG_SUMANGLE_MODE ) ); if ( aSource.Type == EnhancedCustomShapeParameterType::NORMAL ) { // sumangle needed :-( EnhancedCustomShapeEquation aTmpEquation; @@ -474,7 +474,7 @@ public: aEquation.nOperation |= 1; aEquation.nPara[ 1 ] = -1; aEquation.nPara[ 2 ] = 1; - FillEquationParameter( mpArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); + FillEquationParameter( mpArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -546,8 +546,8 @@ public: { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 0xe; // sumangle - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags ), 1, aEquation ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags ), 1, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -556,8 +556,8 @@ public: { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 0xe; // sumangle - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags ), 1, aEquation ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags ), 1, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -566,14 +566,14 @@ public: { EnhancedCustomShapeEquation aSumangle1; aSumangle1.nOperation |= 0xe; // sumangle - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags &~EXPRESSION_FLAG_SUMANGLE_MODE ), 1, aSumangle1 ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags &~EXPRESSION_FLAG_SUMANGLE_MODE ), 1, aSumangle1 ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aSumangle1 ); EnhancedCustomShapeEquation aSumangle2; aSumangle2.nOperation |= 0xe; // sumangle - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags &~EXPRESSION_FLAG_SUMANGLE_MODE ), 1, aSumangle2 ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags &~EXPRESSION_FLAG_SUMANGLE_MODE ), 1, aSumangle2 ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aSumangle2 ); @@ -593,15 +593,15 @@ public: bool bSecondIsEmpty = mpSecondArg->isConstant() && ( (*mpSecondArg)() == 0 ); if ( bFirstIsEmpty ) - aRet = mpSecondArg->fillNode( rEquations, NULL, nFlags ); + aRet = mpSecondArg->fillNode( rEquations, nullptr, nFlags ); else if ( bSecondIsEmpty ) - aRet = mpFirstArg->fillNode( rEquations, NULL, nFlags ); + aRet = mpFirstArg->fillNode( rEquations, nullptr, nFlags ); else { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 0; - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags ), 1, aEquation ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags ), 1, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -613,8 +613,8 @@ public: { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 0; - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags ), 2, aEquation ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags ), 2, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -631,27 +631,27 @@ public: else { if ( mpFirstArg->isConstant() && (*mpFirstArg)() == 1 ) - aRet = mpSecondArg->fillNode( rEquations, NULL, nFlags ); + aRet = mpSecondArg->fillNode( rEquations, nullptr, nFlags ); else if ( mpSecondArg->isConstant() && (*mpSecondArg)() == 1 ) - aRet = mpFirstArg->fillNode( rEquations, NULL, nFlags ); + aRet = mpFirstArg->fillNode( rEquations, nullptr, nFlags ); else if ( ( mpFirstArg->getType() == BINARY_FUNC_DIV ) // don't care of (pi/180) && ( static_cast<BinaryFunctionExpression*>(mpFirstArg.get())->mpFirstArg.get()->getType() == ENUM_FUNC_PI ) && ( static_cast<BinaryFunctionExpression*>(mpFirstArg.get())->mpSecondArg.get()->getType() == FUNC_CONST ) ) { - aRet = mpSecondArg->fillNode( rEquations, NULL, nFlags ); + aRet = mpSecondArg->fillNode( rEquations, nullptr, nFlags ); } else if ( ( mpSecondArg->getType() == BINARY_FUNC_DIV ) // don't care of (pi/180) && ( static_cast<BinaryFunctionExpression*>(mpSecondArg.get())->mpFirstArg.get()->getType() == ENUM_FUNC_PI ) && ( static_cast<BinaryFunctionExpression*>(mpSecondArg.get())->mpSecondArg.get()->getType() == FUNC_CONST ) ) { - aRet = mpFirstArg->fillNode( rEquations, NULL, nFlags ); + aRet = mpFirstArg->fillNode( rEquations, nullptr, nFlags ); } else { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 1; - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags ), 1, aEquation ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags ), 1, aEquation ); aEquation.nPara[ 2 ] = 1; aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); @@ -664,9 +664,9 @@ public: { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 1; - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); aEquation.nPara[ 1 ] = 1; - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags ), 2, aEquation ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags ), 2, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -676,8 +676,8 @@ public: { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 4; - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags ), 1, aEquation ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags ), 1, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -687,8 +687,8 @@ public: { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 5; - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags ), 1, aEquation ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags ), 1, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -698,8 +698,8 @@ public: { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 8; - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags ), 1, aEquation ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags ), 1, aEquation ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; aRet.Value <<= (sal_Int32)rEquations.size(); rEquations.push_back( aEquation ); @@ -751,9 +751,9 @@ public: { EnhancedCustomShapeEquation aEquation; aEquation.nOperation |= 6; - FillEquationParameter( mpFirstArg->fillNode( rEquations, NULL, nFlags ), 0, aEquation ); - FillEquationParameter( mpSecondArg->fillNode( rEquations, NULL, nFlags ), 1, aEquation ); - FillEquationParameter( mpThirdArg->fillNode( rEquations, NULL, nFlags ), 2, aEquation ); + FillEquationParameter( mpFirstArg->fillNode( rEquations, nullptr, nFlags ), 0, aEquation ); + FillEquationParameter( mpSecondArg->fillNode( rEquations, nullptr, nFlags ), 1, aEquation ); + FillEquationParameter( mpThirdArg->fillNode( rEquations, nullptr, nFlags ), 2, aEquation ); rEquations.push_back( aEquation ); } return aRet; diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index d72b63a85adb..c2249e91e795 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -130,10 +130,10 @@ static const mso_CustomShape msoArc = const_cast<sal_uInt16*>(mso_sptArcSegm), sizeof( mso_sptArcSegm ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptArcCalc), SAL_N_ELEMENTS( mso_sptArcCalc ), const_cast<sal_Int32*>(mso_sptArcDefault), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptArcHandle), SAL_N_ELEMENTS( mso_sptArcHandle ) // handles }; @@ -144,14 +144,14 @@ static const SvxMSDffVertPair mso_sptTextSimpleVert[] = static const mso_CustomShape msoTextSimple = { const_cast<SvxMSDffVertPair*>(mso_sptTextSimpleVert), SAL_N_ELEMENTS( mso_sptTextSimpleVert ), - NULL, 0, - NULL, 0, - NULL, - NULL, 0, + nullptr, 0, + nullptr, 0, + nullptr, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, - NULL, 0 // handles + nullptr, 0, + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptRectangleVert[] = @@ -161,14 +161,14 @@ static const SvxMSDffVertPair mso_sptRectangleVert[] = static const mso_CustomShape msoRectangle = { const_cast<SvxMSDffVertPair*>(mso_sptRectangleVert), SAL_N_ELEMENTS( mso_sptRectangleVert ), - NULL, 0, - NULL, 0, - NULL, - NULL, 0, + nullptr, 0, + nullptr, 0, + nullptr, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, - NULL, 0 // handles + nullptr, 0, + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptRoundRectangleVert[] = // adj value 0 -> 10800 @@ -212,7 +212,7 @@ static const mso_CustomShape msoRoundRectangle = const_cast<SvxMSDffTextRectangles*>(mso_sptRoundRectangleTextRect), SAL_N_ELEMENTS( mso_sptRoundRectangleTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptRoundRectangleHandle), SAL_N_ELEMENTS( mso_sptRoundRectangleHandle ) // handles }; @@ -231,14 +231,14 @@ static const SvxMSDffVertPair mso_sptRightTriangleGluePoints[] = static const mso_CustomShape msoRightTriangle = { const_cast<SvxMSDffVertPair*>(mso_sptRightTriangleVert), SAL_N_ELEMENTS( mso_sptRightTriangleVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptRightTriangleTextRect), SAL_N_ELEMENTS( mso_sptRightTriangleTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptRightTriangleGluePoints), SAL_N_ELEMENTS( mso_sptRightTriangleGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptEllipseVert[] = @@ -261,13 +261,13 @@ static const mso_CustomShape msoEllipse = { const_cast<SvxMSDffVertPair*>(mso_sptEllipseVert), SAL_N_ELEMENTS( mso_sptEllipseVert ), const_cast<sal_uInt16*>(mso_sptEllipseSegm), sizeof( mso_sptEllipseSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptEllipseTextRect), SAL_N_ELEMENTS( mso_sptEllipseTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptParallelogramVert[] = // adjustment1 : 0 - 21600 @@ -332,14 +332,14 @@ static const SvxMSDffTextRectangles mso_sptDiamondTextRect[] = static const mso_CustomShape msoDiamond = { const_cast<SvxMSDffVertPair*>(mso_sptDiamondVert), SAL_N_ELEMENTS( mso_sptDiamondVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptDiamondTextRect), SAL_N_ELEMENTS( mso_sptDiamondTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptTrapezoidVert[] = // adjustment1 : 0 - 10800 @@ -579,14 +579,14 @@ static const SvxMSDffVertPair mso_sptPentagonGluePoints[] = static const mso_CustomShape msoPentagon = { const_cast<SvxMSDffVertPair*>(mso_sptPentagonVert), SAL_N_ELEMENTS( mso_sptPentagonVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptPentagonTextRect), SAL_N_ELEMENTS( mso_sptPentagonTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptPentagonGluePoints), SAL_N_ELEMENTS( mso_sptPentagonGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptPlusVert[] = // adjustment1 : 0 - 10800 @@ -614,7 +614,7 @@ static const SvxMSDffHandle mso_sptPlusHandle[] = static const mso_CustomShape msoPlus = { const_cast<SvxMSDffVertPair*>(mso_sptPlusVert), SAL_N_ELEMENTS( mso_sptPlusVert ), - NULL, 0, + nullptr, 0, const_cast<SvxMSDffCalculationData*>(mso_sptPlusCalc), SAL_N_ELEMENTS( mso_sptPlusCalc ), const_cast<sal_Int32*>(mso_sptDefault5400), const_cast<SvxMSDffTextRectangles*>(mso_sptPlusTextRect), SAL_N_ELEMENTS( mso_sptPlusTextRect ), @@ -719,7 +719,7 @@ static const mso_CustomShape msoArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptArrowTextRect), SAL_N_ELEMENTS( mso_sptArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptArrowHandle), SAL_N_ELEMENTS( mso_sptArrowHandle ) // handles }; @@ -754,7 +754,7 @@ static const mso_CustomShape msoLeftArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptLeftArrowTextRect), SAL_N_ELEMENTS( mso_sptLeftArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptLeftArrowHandle), SAL_N_ELEMENTS( mso_sptLeftArrowHandle ) // handles }; @@ -785,7 +785,7 @@ static const mso_CustomShape msoDownArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptDownArrowTextRect), SAL_N_ELEMENTS( mso_sptDownArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptDownArrowHandle), SAL_N_ELEMENTS( mso_sptDownArrowHandle ) // handles }; @@ -820,7 +820,7 @@ static const mso_CustomShape msoUpArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptUpArrowTextRect), SAL_N_ELEMENTS( mso_sptUpArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptUpArrowHandle), SAL_N_ELEMENTS( mso_sptUpArrowHandle ) // handles }; @@ -869,7 +869,7 @@ static const mso_CustomShape msoLeftRightArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptLeftRightArrowTextRect), SAL_N_ELEMENTS( mso_sptLeftRightArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptLeftRightArrowHandle), SAL_N_ELEMENTS( mso_sptLeftRightArrowHandle ) // handles }; @@ -905,7 +905,7 @@ static const mso_CustomShape msoUpDownArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptUpDownArrowTextRect), SAL_N_ELEMENTS( mso_sptUpDownArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptUpDownArrowHandle), SAL_N_ELEMENTS( mso_sptUpDownArrowHandle ) // handles }; @@ -955,7 +955,7 @@ static const mso_CustomShape msoQuadArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptQuadArrowTextRect), SAL_N_ELEMENTS( mso_sptQuadArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptQuadArrowHandle), SAL_N_ELEMENTS( mso_sptQuadArrowHandle ) // handles }; @@ -1004,7 +1004,7 @@ static const mso_CustomShape msoLeftRightUpArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptLeftRightUpArrowTextRect), SAL_N_ELEMENTS( mso_sptLeftRightUpArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptLeftRightUpArrowHandle), SAL_N_ELEMENTS( mso_sptLeftRightUpArrowHandle ) // handles }; @@ -1048,7 +1048,7 @@ static const mso_CustomShape msoBentArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptBentArrowTextRect), SAL_N_ELEMENTS( mso_sptBentArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptBentArrowHandle), SAL_N_ELEMENTS( mso_sptBentArrowHandle ) // handles }; @@ -1074,13 +1074,13 @@ static const mso_CustomShape msoUturnArrow = { const_cast<SvxMSDffVertPair*>(mso_sptUturnArrowVert), SAL_N_ELEMENTS( mso_sptUturnArrowVert ), const_cast<sal_uInt16*>(mso_sptUturnArrowSegm), sizeof( mso_sptUturnArrowSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptUturnArrowTextRect), SAL_N_ELEMENTS( mso_sptUturnArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, - NULL, 0 // handles + nullptr, 0, + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptLeftUpArrowVert[] = // adjustment1 : x 0 - 21600, adjustment2 : x 0 - 21600 @@ -1131,7 +1131,7 @@ static const mso_CustomShape msoLeftUpArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptLeftUpArrowTextRect), SAL_N_ELEMENTS( mso_sptLeftUpArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptLeftUpArrowHandle), SAL_N_ELEMENTS( mso_sptLeftUpArrowHandle ) // handles }; @@ -1184,7 +1184,7 @@ static const mso_CustomShape msoBentUpArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptBentUpArrowTextRect), SAL_N_ELEMENTS( mso_sptBentUpArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptBentUpArrowHandle), SAL_N_ELEMENTS( mso_sptBentUpArrowHandle ) }; @@ -1550,7 +1550,7 @@ static const mso_CustomShape msoStripedRightArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptStripedRightArrowTextRect), SAL_N_ELEMENTS( mso_sptStripedRightArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptStripedRightArrowHandle), SAL_N_ELEMENTS( mso_sptStripedRightArrowHandle ) }; @@ -1581,13 +1581,13 @@ static const SvxMSDffHandle mso_sptNotchedRightArrowHandle[] = static const mso_CustomShape msoNotchedRightArrow = { const_cast<SvxMSDffVertPair*>(mso_sptNotchedRightArrowVert), SAL_N_ELEMENTS( mso_sptNotchedRightArrowVert ), - NULL, 0, + nullptr, 0, const_cast<SvxMSDffCalculationData*>(mso_sptNotchedRightArrowCalc), SAL_N_ELEMENTS( mso_sptNotchedRightArrowCalc ), const_cast<sal_Int32*>(mso_sptDefault16200and5400), const_cast<SvxMSDffTextRectangles*>(mso_sptNotchedRightArrowTextRect), SAL_N_ELEMENTS( mso_sptNotchedRightArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptNotchedRightArrowHandle), SAL_N_ELEMENTS( mso_sptNotchedRightArrowHandle ) }; @@ -1626,7 +1626,7 @@ static const mso_CustomShape msoHomePlate = const_cast<SvxMSDffTextRectangles*>(mso_sptHomePlateTextRect), SAL_N_ELEMENTS( mso_sptHomePlateTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptHomePlateHandle), SAL_N_ELEMENTS( mso_sptHomePlateHandle ) }; @@ -1666,7 +1666,7 @@ static const mso_CustomShape msoChevron = const_cast<SvxMSDffTextRectangles*>(mso_sptChevronTextRect), SAL_N_ELEMENTS( mso_sptChevronTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptChevronHandle), SAL_N_ELEMENTS( mso_sptChevronHandle ) }; @@ -1715,7 +1715,7 @@ static const mso_CustomShape msoRightArrowCallout = const_cast<SvxMSDffTextRectangles*>(mso_sptRightArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptRightArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptRightArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptRightArrowCalloutHandle ) }; @@ -1764,7 +1764,7 @@ static const mso_CustomShape msoLeftArrowCallout = const_cast<SvxMSDffTextRectangles*>(mso_sptLeftArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptLeftArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptLeftArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptLeftArrowCalloutHandle ) }; @@ -1813,7 +1813,7 @@ static const mso_CustomShape msoUpArrowCallout = const_cast<SvxMSDffTextRectangles*>(mso_sptUpArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptUpArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptUpArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptUpArrowCalloutHandle ) }; @@ -1862,7 +1862,7 @@ static const mso_CustomShape msoDownArrowCallout = const_cast<SvxMSDffTextRectangles*>(mso_sptDownArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptDownArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptDownArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptDownArrowCalloutHandle ) }; @@ -1915,7 +1915,7 @@ static const mso_CustomShape msoLeftRightArrowCallout = const_cast<SvxMSDffTextRectangles*>(mso_sptLeftRightArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptLeftRightArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutHandle ) }; @@ -1968,7 +1968,7 @@ static const mso_CustomShape msoUpDownArrowCallout = const_cast<SvxMSDffTextRectangles*>(mso_sptUpDownArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptUpDownArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutHandle ) }; @@ -2024,7 +2024,7 @@ static const mso_CustomShape msoQuadArrowCallout = const_cast<SvxMSDffTextRectangles*>(mso_sptQuadArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptQuadArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptQuadArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptQuadArrowCalloutHandle ) }; @@ -2120,7 +2120,7 @@ static const mso_CustomShape msoCircularArrow = const_cast<SvxMSDffTextRectangles*>(mso_sptCircularArrowTextRect), SAL_N_ELEMENTS( mso_sptCircularArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCircularArrowHandle), SAL_N_ELEMENTS( mso_sptCircularArrowHandle ) // handles }; @@ -2219,7 +2219,7 @@ static const mso_CustomShape msoBevel = const_cast<SvxMSDffTextRectangles*>(mso_sptBevelTextRect), SAL_N_ELEMENTS( mso_sptBevelTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptBevelHandle), SAL_N_ELEMENTS( mso_sptBevelHandle ) }; @@ -2315,7 +2315,7 @@ static const mso_CustomShape msoActionButtonBlank = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonBlankTextRect), SAL_N_ELEMENTS( mso_sptActionButtonBlankTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -2403,7 +2403,7 @@ static const mso_CustomShape msoActionButtonHome = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -2513,7 +2513,7 @@ static const mso_CustomShape msoActionButtonHelp = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -2601,7 +2601,7 @@ static const mso_CustomShape msoActionButtonInformation = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -2654,7 +2654,7 @@ static const mso_CustomShape msoActionButtonBackPrevious = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -2677,7 +2677,7 @@ static const mso_CustomShape msoActionButtonForwardNext = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -2744,7 +2744,7 @@ static const mso_CustomShape msoActionButtonBeginning = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -2769,7 +2769,7 @@ static const mso_CustomShape msoActionButtonEnd = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -2858,7 +2858,7 @@ static const mso_CustomShape msoActionButtonReturn = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -2918,7 +2918,7 @@ static const mso_CustomShape msoActionButtonDocument = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -2994,7 +2994,7 @@ static const mso_CustomShape msoActionButtonSound = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -3079,7 +3079,7 @@ static const mso_CustomShape msoActionButtonMovie = const_cast<SvxMSDffTextRectangles*>(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; @@ -3243,10 +3243,10 @@ static const mso_CustomShape msoBlockArc = const_cast<sal_uInt16*>(mso_sptBlockArcSegm), sizeof( mso_sptBlockArcSegm ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptBlockArcCalc), SAL_N_ELEMENTS( mso_sptBlockArcCalc ), const_cast<sal_Int32*>(mso_sptBlockArcDefault), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptBlockArcHandle), SAL_N_ELEMENTS( mso_sptBlockArcHandle ) // handles }; @@ -3305,13 +3305,13 @@ static const mso_CustomShape msoHeart = { const_cast<SvxMSDffVertPair*>(mso_sptHeartVert), SAL_N_ELEMENTS( mso_sptHeartVert ), const_cast<sal_uInt16*>(mso_sptHeartSegm), sizeof( mso_sptHeartSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptHeartTextRect), SAL_N_ELEMENTS( mso_sptHeartTextRect ), 21615, 21602, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptHeartGluePoints), SAL_N_ELEMENTS( mso_sptHeartGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptLightningBoldVert[] = @@ -3332,14 +3332,14 @@ static const SvxMSDffVertPair mso_sptLightningBoldGluePoints[] = static const mso_CustomShape msoLightningBold = { const_cast<SvxMSDffVertPair*>(mso_sptLightningBoldVert), SAL_N_ELEMENTS( mso_sptLightningBoldVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptLightningBoldTextRect), SAL_N_ELEMENTS( mso_sptLightningBoldTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptLightningBoldGluePoints), SAL_N_ELEMENTS( mso_sptLightningBoldGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptSunVert[] = // adj value 2700 -> 10125 @@ -3823,14 +3823,14 @@ static const SvxMSDffVertPair mso_sptIrregularSeal1GluePoints[] = static const mso_CustomShape msoIrregularSeal1 = { const_cast<SvxMSDffVertPair*>(mso_sptIrregularSeal1Vert), SAL_N_ELEMENTS( mso_sptIrregularSeal1Vert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptIrregularSeal1TextRect), SAL_N_ELEMENTS( mso_sptIrregularSeal1TextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptIrregularSeal1GluePoints), SAL_N_ELEMENTS( mso_sptIrregularSeal1GluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptIrregularSeal2Vert[] = @@ -3855,14 +3855,14 @@ static const SvxMSDffVertPair mso_sptIrregularSeal2GluePoints[] = static const mso_CustomShape msoIrregularSeal2 = { const_cast<SvxMSDffVertPair*>(mso_sptIrregularSeal2Vert), SAL_N_ELEMENTS( mso_sptIrregularSeal2Vert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptIrregularSeal2TextRect), SAL_N_ELEMENTS( mso_sptIrregularSeal2TextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptIrregularSeal2GluePoints), SAL_N_ELEMENTS( mso_sptIrregularSeal2GluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptSeal4Vert[] = // adjustment1 : 0 - 10800 @@ -3891,13 +3891,13 @@ static const SvxMSDffHandle mso_sptSealHandle[] = static const mso_CustomShape msoSeal4 = { const_cast<SvxMSDffVertPair*>(mso_sptSeal4Vert), SAL_N_ELEMENTS( mso_sptSeal4Vert ), - NULL, 0, + nullptr, 0, const_cast<SvxMSDffCalculationData*>(mso_sptSeal4Calc), SAL_N_ELEMENTS( mso_sptSeal4Calc ), const_cast<sal_Int32*>(mso_sptDefault8100), const_cast<SvxMSDffTextRectangles*>(mso_sptSeal4TextRect), SAL_N_ELEMENTS( mso_sptSeal4TextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptSealHandle), SAL_N_ELEMENTS( mso_sptSealHandle ) // handles }; @@ -3914,14 +3914,14 @@ static const SvxMSDffTextRectangles mso_sptStarTextRect[] = static const mso_CustomShape msoStar = { const_cast<SvxMSDffVertPair*>(mso_sptStarVert), SAL_N_ELEMENTS( mso_sptStarVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptStarTextRect), SAL_N_ELEMENTS( mso_sptStarTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, - NULL, 0 // handles + nullptr, 0, + nullptr, 0 // handles }; static const SvxMSDffCalculationData mso_sptSeal24Calc[] = @@ -4043,13 +4043,13 @@ static const SvxMSDffTextRectangles mso_sptSealTextRect[] = static const mso_CustomShape msoSeal8 = { const_cast<SvxMSDffVertPair*>(mso_sptSeal8Vert), SAL_N_ELEMENTS( mso_sptSeal8Vert ), - NULL, 0, + nullptr, 0, const_cast<SvxMSDffCalculationData*>(mso_sptSeal24Calc), SAL_N_ELEMENTS( mso_sptSeal24Calc ), const_cast<sal_Int32*>(mso_sptDefault2500), const_cast<SvxMSDffTextRectangles*>(mso_sptSealTextRect), SAL_N_ELEMENTS( mso_sptSealTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptSealHandle), SAL_N_ELEMENTS( mso_sptSealHandle ) // handles }; static const SvxMSDffVertPair mso_sptSeal16Vert[] = // adj value 0 -> 10800 @@ -4139,13 +4139,13 @@ static const SvxMSDffCalculationData mso_sptSeal16Calc[] = static const mso_CustomShape msoSeal16 = { const_cast<SvxMSDffVertPair*>(mso_sptSeal16Vert), SAL_N_ELEMENTS( mso_sptSeal16Vert ), - NULL, 0, + nullptr, 0, const_cast<SvxMSDffCalculationData*>(mso_sptSeal16Calc), SAL_N_ELEMENTS( mso_sptSeal16Calc ), const_cast<sal_Int32*>(mso_sptDefault2500), const_cast<SvxMSDffTextRectangles*>(mso_sptSealTextRect), SAL_N_ELEMENTS( mso_sptSealTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptSealHandle), SAL_N_ELEMENTS( mso_sptSealHandle ) // handles }; static const SvxMSDffVertPair mso_sptSeal24Vert[] = @@ -4167,13 +4167,13 @@ static const SvxMSDffVertPair mso_sptSeal24Vert[] = static const mso_CustomShape msoSeal24 = { const_cast<SvxMSDffVertPair*>(mso_sptSeal24Vert), SAL_N_ELEMENTS( mso_sptSeal24Vert ), - NULL, 0, + nullptr, 0, const_cast<SvxMSDffCalculationData*>(mso_sptSeal24Calc), SAL_N_ELEMENTS( mso_sptSeal24Calc ), const_cast<sal_Int32*>(mso_sptDefault2500), const_cast<SvxMSDffTextRectangles*>(mso_sptSealTextRect), SAL_N_ELEMENTS( mso_sptSealTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptSealHandle), SAL_N_ELEMENTS( mso_sptSealHandle ) // handles }; static const SvxMSDffCalculationData mso_sptSeal32Calc[] = @@ -4335,13 +4335,13 @@ static const SvxMSDffVertPair mso_sptSeal32Vert[] = static const mso_CustomShape msoSeal32 = { const_cast<SvxMSDffVertPair*>(mso_sptSeal32Vert), SAL_N_ELEMENTS( mso_sptSeal32Vert ), - NULL, 0, + nullptr, 0, const_cast<SvxMSDffCalculationData*>(mso_sptSeal32Calc), SAL_N_ELEMENTS( mso_sptSeal32Calc ), const_cast<sal_Int32*>(mso_sptDefault2500), const_cast<SvxMSDffTextRectangles*>(mso_sptSealTextRect), SAL_N_ELEMENTS( mso_sptSealTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptSealHandle), SAL_N_ELEMENTS( mso_sptSealHandle ) }; @@ -4438,7 +4438,7 @@ static const mso_CustomShape msoRibbon2 = const_cast<SvxMSDffTextRectangles*>(mso_sptRibbon2TextRect), SAL_N_ELEMENTS( mso_sptRibbon2TextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptRibbon2Handle), SAL_N_ELEMENTS( mso_sptRibbon2Handle ) }; @@ -4664,7 +4664,7 @@ static const mso_CustomShape msosptEllipseRibbon = const_cast<SvxMSDffTextRectangles*>(mso_sptEllipseRibbonTextRect), sizeof( mso_sptEllipseRibbonTextRect ) / sizeof( SvxMSDffTextRectangles ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptEllipseRibbonHandle), sizeof( mso_sptEllipseRibbonHandle ) / sizeof( SvxMSDffHandle ) }; @@ -4804,7 +4804,7 @@ static const mso_CustomShape msosptEllipseRibbon2 = const_cast<SvxMSDffTextRectangles*>(mso_sptEllipseRibbon2TextRect), sizeof( mso_sptEllipseRibbon2TextRect ) / sizeof( SvxMSDffTextRectangles ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptEllipseRibbon2Handle), sizeof( mso_sptEllipseRibbon2Handle ) / sizeof( SvxMSDffHandle ) }; // End @@ -4870,7 +4870,7 @@ static const mso_CustomShape msoVerticalScroll = const_cast<SvxMSDffTextRectangles*>(mso_sptScrollTextRect), SAL_N_ELEMENTS( mso_sptScrollTextRect ), 21600, 21600, 11000, 10800, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptVerticalScrollHandle), SAL_N_ELEMENTS( mso_sptVerticalScrollHandle ) }; static const SvxMSDffVertPair mso_sptHorizontalScrollVert[] = // adjustment1 : 0 - 5400 @@ -4916,7 +4916,7 @@ static const mso_CustomShape msoHorizontalScroll = const_cast<SvxMSDffTextRectangles*>(mso_sptScrollTextRect), SAL_N_ELEMENTS( mso_sptScrollTextRect ), 21600, 21600, 10800, 11000, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptHorizontalScrollHandle), SAL_N_ELEMENTS( mso_sptHorizontalScrollHandle ) }; @@ -4927,14 +4927,14 @@ static const SvxMSDffVertPair mso_sptFlowChartProcessVert[] = static const mso_CustomShape msoFlowChartProcess = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartProcessVert), SAL_N_ELEMENTS( mso_sptFlowChartProcessVert ), - NULL, 0, - NULL, 0, - NULL, - NULL, 0, + nullptr, 0, + nullptr, 0, + nullptr, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartAlternateProcessVert[] = @@ -4966,12 +4966,12 @@ static const mso_CustomShape msoFlowChartAlternateProcess = const_cast<SvxMSDffVertPair*>(mso_sptFlowChartAlternateProcessVert), SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessVert ), const_cast<sal_uInt16*>(mso_sptFlowChartAlternateProcessSegm), sizeof( mso_sptFlowChartAlternateProcessSegm ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptFlowChartAlternateProcessCalc), SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessCalc ), - NULL, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartAlternateProcessTextRect), SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartDecisionVert[] = @@ -4985,14 +4985,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartDecisionTextRect[] = static const mso_CustomShape msoFlowChartDecision = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartDecisionVert), SAL_N_ELEMENTS( mso_sptFlowChartDecisionVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartDecisionTextRect), SAL_N_ELEMENTS( mso_sptFlowChartDecisionTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartInputOutputVert[] = @@ -5010,14 +5010,14 @@ static const SvxMSDffVertPair mso_sptFlowChartInputOutputGluePoints[] = static const mso_CustomShape msoFlowChartInputOutput = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartInputOutputVert), SAL_N_ELEMENTS( mso_sptFlowChartInputOutputVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartInputOutputTextRect), SAL_N_ELEMENTS( mso_sptFlowChartInputOutputTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartInputOutputGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartInputOutputGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartPredefinedProcessVert[] = @@ -5042,13 +5042,13 @@ static const mso_CustomShape msoFlowChartPredefinedProcess = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartPredefinedProcessVert), SAL_N_ELEMENTS( mso_sptFlowChartPredefinedProcessVert ), const_cast<sal_uInt16*>(mso_sptFlowChartPredefinedProcessSegm), sizeof( mso_sptFlowChartPredefinedProcessSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartPredefinedProcessTextRect), SAL_N_ELEMENTS( mso_sptFlowChartPredefinedProcessTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, - NULL, 0 // handles + nullptr, 0, + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartInternalStorageVert[] = @@ -5073,13 +5073,13 @@ static const mso_CustomShape msoFlowChartInternalStorage = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartInternalStorageVert), SAL_N_ELEMENTS( mso_sptFlowChartInternalStorageVert ), const_cast<sal_uInt16*>(mso_sptFlowChartInternalStorageSegm), sizeof( mso_sptFlowChartInternalStorageSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartInternalStorageTextRect), SAL_N_ELEMENTS( mso_sptFlowChartInternalStorageTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, - NULL, 0 // handles + nullptr, 0, + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartDocumentVert[] = @@ -5104,13 +5104,13 @@ static const mso_CustomShape msoFlowChartDocument = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartDocumentVert), SAL_N_ELEMENTS( mso_sptFlowChartDocumentVert ), const_cast<sal_uInt16*>(mso_sptFlowChartDocumentSegm), sizeof( mso_sptFlowChartDocumentSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartDocumentTextRect), SAL_N_ELEMENTS( mso_sptFlowChartDocumentTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartDocumentGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartDocumentGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartMultidocumentVert[] = @@ -5143,13 +5143,13 @@ static const mso_CustomShape msoFlowChartMultidocument = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartMultidocumentVert), SAL_N_ELEMENTS( mso_sptFlowChartMultidocumentVert ), const_cast<sal_uInt16*>(mso_sptFlowChartMultidocumentSegm), sizeof( mso_sptFlowChartMultidocumentSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartMultidocumentTextRect), SAL_N_ELEMENTS( mso_sptFlowChartMultidocumentTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartMultidocumentGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartMultidocumentGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartTerminatorVert[] = @@ -5169,13 +5169,13 @@ static const mso_CustomShape msoFlowChartTerminator = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartTerminatorVert), SAL_N_ELEMENTS( mso_sptFlowChartTerminatorVert ), const_cast<sal_uInt16*>(mso_sptFlowChartTerminatorSegm), sizeof( mso_sptFlowChartTerminatorSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartTerminatorTextRect), SAL_N_ELEMENTS( mso_sptFlowChartTerminatorTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartPreparationVert[] = @@ -5190,14 +5190,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartPreparationTextRect[] = static const mso_CustomShape msoFlowChartPreparation = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartPreparationVert), SAL_N_ELEMENTS( mso_sptFlowChartPreparationVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartPreparationTextRect), SAL_N_ELEMENTS( mso_sptFlowChartPreparationTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartManualInputVert[] = @@ -5215,14 +5215,14 @@ static const SvxMSDffVertPair mso_sptFlowChartManualInputGluePoints[] = static const mso_CustomShape msoFlowChartManualInput = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartManualInputVert), SAL_N_ELEMENTS( mso_sptFlowChartManualInputVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartManualInputTextRect), SAL_N_ELEMENTS( mso_sptFlowChartManualInputTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartManualInputGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartManualInputGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartManualOperationVert[] = @@ -5240,14 +5240,14 @@ static const SvxMSDffVertPair mso_sptFlowChartManualOperationGluePoints[] = static const mso_CustomShape msoFlowChartManualOperation = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartManualOperationVert), SAL_N_ELEMENTS( mso_sptFlowChartManualOperationVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartManualOperationTextRect), SAL_N_ELEMENTS( mso_sptFlowChartManualOperationTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartManualOperationGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartManualOperationGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartConnectorVert[] = @@ -5266,13 +5266,13 @@ static const mso_CustomShape msoFlowChartConnector = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartConnectorVert), SAL_N_ELEMENTS( mso_sptFlowChartConnectorVert ), const_cast<sal_uInt16*>(mso_sptFlowChartConnectorSegm), sizeof( mso_sptFlowChartConnectorSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartConnectorTextRect), SAL_N_ELEMENTS( mso_sptFlowChartConnectorTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartOffpageConnectorVert[] = @@ -5287,14 +5287,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartOffpageConnectorTextRect[] = static const mso_CustomShape msoFlowChartOffpageConnector = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartOffpageConnectorVert), SAL_N_ELEMENTS( mso_sptFlowChartOffpageConnectorVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartOffpageConnectorTextRect), SAL_N_ELEMENTS( mso_sptFlowChartOffpageConnectorTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartPunchedCardVert[] = @@ -5309,14 +5309,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartPunchedCardTextRect[] = static const mso_CustomShape msoFlowChartPunchedCard = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartPunchedCardVert), SAL_N_ELEMENTS( mso_sptFlowChartPunchedCardVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartPunchedCardTextRect), SAL_N_ELEMENTS( mso_sptFlowChartPunchedCardTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartPunchedTapeVert[] = @@ -5348,13 +5348,13 @@ static const mso_CustomShape msoFlowChartPunchedTape = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartPunchedTapeVert), SAL_N_ELEMENTS( mso_sptFlowChartPunchedTapeVert ), const_cast<sal_uInt16*>(mso_sptFlowChartPunchedTapeSegm), sizeof( mso_sptFlowChartPunchedTapeSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartPunchedTapeTextRect), SAL_N_ELEMENTS( mso_sptFlowChartPunchedTapeTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartPunchedTapeGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartPunchedTapeGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartSummingJunctionVert[] = @@ -5381,13 +5381,13 @@ static const mso_CustomShape msoFlowChartSummingJunction = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartSummingJunctionVert), SAL_N_ELEMENTS( mso_sptFlowChartSummingJunctionVert ), const_cast<sal_uInt16*>(mso_sptFlowChartSummingJunctionSegm), sizeof( mso_sptFlowChartSummingJunctionSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartSummingJunctionTextRect), SAL_N_ELEMENTS( mso_sptFlowChartSummingJunctionTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartOrVert[] = @@ -5412,13 +5412,13 @@ static const mso_CustomShape msoFlowChartOr = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartOrVert), SAL_N_ELEMENTS( mso_sptFlowChartOrVert ), const_cast<sal_uInt16*>(mso_sptFlowChartOrSegm), sizeof( mso_sptFlowChartOrSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartOrTextRect), SAL_N_ELEMENTS( mso_sptFlowChartOrTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartCollateVert[] = @@ -5436,14 +5436,14 @@ static const SvxMSDffVertPair mso_sptFlowChartCollateGluePoints[] = static const mso_CustomShape msoFlowChartCollate = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartCollateVert), SAL_N_ELEMENTS( mso_sptFlowChartCollateVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartCollateTextRect), SAL_N_ELEMENTS( mso_sptFlowChartCollateTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartCollateGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartCollateGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartSortVert[] = @@ -5465,13 +5465,13 @@ static const mso_CustomShape msoFlowChartSort = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartSortVert), SAL_N_ELEMENTS( mso_sptFlowChartSortVert ), const_cast<sal_uInt16*>(mso_sptFlowChartSortSegm), sizeof( mso_sptFlowChartSortSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartSortTextRect), SAL_N_ELEMENTS( mso_sptFlowChartSortTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, - NULL, 0 // handles + nullptr, 0, + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartExtractVert[] = @@ -5489,14 +5489,14 @@ static const SvxMSDffVertPair mso_sptFlowChartExtractGluePoints[] = static const mso_CustomShape msoFlowChartExtract = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartExtractVert), SAL_N_ELEMENTS( mso_sptFlowChartExtractVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartExtractTextRect), SAL_N_ELEMENTS( mso_sptFlowChartExtractTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartExtractGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartExtractGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartMergeVert[] = @@ -5510,14 +5510,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartMergeTextRect[] = static const mso_CustomShape msoFlowChartMerge = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartMergeVert), SAL_N_ELEMENTS( mso_sptFlowChartMergeVert ), - NULL, 0, - NULL, 0, - NULL, + nullptr, 0, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartMergeTextRect), SAL_N_ELEMENTS( mso_sptFlowChartMergeTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartExtractGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartExtractGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartOnlineStorageVert[] = @@ -5541,13 +5541,13 @@ static const mso_CustomShape msoFlowChartOnlineStorage = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartOnlineStorageVert), SAL_N_ELEMENTS( mso_sptFlowChartOnlineStorageVert ), const_cast<sal_uInt16*>(mso_sptFlowChartOnlineStorageSegm), sizeof( mso_sptFlowChartOnlineStorageSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartOnlineStorageTextRect), SAL_N_ELEMENTS( mso_sptFlowChartOnlineStorageTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartOnlineStorageGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartOnlineStorageGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartDelayVert[] = @@ -5567,13 +5567,13 @@ static const mso_CustomShape msoFlowChartDelay = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartDelayVert), SAL_N_ELEMENTS( mso_sptFlowChartDelayVert ), const_cast<sal_uInt16*>(mso_sptFlowChartDelaySegm), sizeof( mso_sptFlowChartDelaySegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartDelayTextRect), SAL_N_ELEMENTS( mso_sptFlowChartDelayTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartMagneticTapeVert[] = @@ -5596,13 +5596,13 @@ static const mso_CustomShape msoFlowChartMagneticTape = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartMagneticTapeVert), SAL_N_ELEMENTS( mso_sptFlowChartMagneticTapeVert ), const_cast<sal_uInt16*>(mso_sptFlowChartMagneticTapeSegm), sizeof( mso_sptFlowChartMagneticTapeSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartMagneticTapeTextRect), SAL_N_ELEMENTS( mso_sptFlowChartMagneticTapeTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartMagneticDiskVert[] = @@ -5629,13 +5629,13 @@ static const mso_CustomShape msoFlowChartMagneticDisk = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartMagneticDiskVert), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDiskVert ), const_cast<sal_uInt16*>(mso_sptFlowChartMagneticDiskSegm), sizeof( mso_sptFlowChartMagneticDiskSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartMagneticDiskTextRect), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDiskTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartMagneticDiskGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDiskGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartMagneticDrumVert[] = @@ -5662,13 +5662,13 @@ static const mso_CustomShape msoFlowChartMagneticDrum = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartMagneticDrumVert), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDrumVert ), const_cast<sal_uInt16*>(mso_sptFlowChartMagneticDrumSegm), sizeof( mso_sptFlowChartMagneticDrumSegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartMagneticDrumTextRect), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDrumTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptFlowChartMagneticDrumGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDrumGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptFlowChartDisplayVert[] = @@ -5688,13 +5688,13 @@ static const mso_CustomShape msoFlowChartDisplay = { const_cast<SvxMSDffVertPair*>(mso_sptFlowChartDisplayVert), SAL_N_ELEMENTS( mso_sptFlowChartDisplayVert ), const_cast<sal_uInt16*>(mso_sptFlowChartDisplaySegm), sizeof( mso_sptFlowChartDisplaySegm ) >> 1, - NULL, 0, - NULL, + nullptr, 0, + nullptr, const_cast<SvxMSDffTextRectangles*>(mso_sptFlowChartDisplayTextRect), SAL_N_ELEMENTS( mso_sptFlowChartDisplayTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, const_cast<SvxMSDffVertPair*>(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - NULL, 0 // handles + nullptr, 0 // handles }; static const SvxMSDffVertPair mso_sptWedgeRectCalloutVert[] = @@ -5780,7 +5780,7 @@ static const SvxMSDffHandle mso_sptCalloutHandle[] = static const mso_CustomShape msoWedgeRectCallout = { const_cast<SvxMSDffVertPair*>(mso_sptWedgeRectCalloutVert), SAL_N_ELEMENTS( mso_sptWedgeRectCalloutVert ), - NULL, 0, + nullptr, 0, const_cast<SvxMSDffCalculationData*>(mso_sptWedgeRectCalloutCalc), SAL_N_ELEMENTS( mso_sptWedgeRectCalloutCalc ), const_cast<sal_Int32*>(mso_sptWedgeRectCalloutDefault), const_cast<SvxMSDffTextRectangles*>(mso_sptWedgeRectCalloutTextRect), SAL_N_ELEMENTS( mso_sptWedgeRectCalloutTextRect ), @@ -5822,7 +5822,7 @@ static const mso_CustomShape msoWedgeRRectCallout = const_cast<SvxMSDffTextRectangles*>(mso_sptWedgeRRectCalloutTextRect), SAL_N_ELEMENTS( mso_sptWedgeRRectCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle), SAL_N_ELEMENTS( mso_sptCalloutHandle ) // handles }; static const SvxMSDffVertPair mso_sptBalloonVert[] = @@ -5861,7 +5861,7 @@ static const mso_CustomShape msoBalloon = const_cast<SvxMSDffTextRectangles*>(mso_sptBalloonTextRect), SAL_N_ELEMENTS( mso_sptBalloonTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptBalloonHandle), SAL_N_ELEMENTS( mso_sptBalloonHandle ) // handles }; static const SvxMSDffVertPair mso_sptWedgeEllipseCalloutVert[] = @@ -6025,7 +6025,7 @@ static const mso_CustomShape msoCloudCallout = const_cast<SvxMSDffTextRectangles*>(mso_sptCloudCalloutTextRect), SAL_N_ELEMENTS( mso_sptCloudCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle), SAL_N_ELEMENTS( mso_sptCalloutHandle ) // handles }; @@ -6300,7 +6300,7 @@ static const mso_CustomShape msoTextPlainText = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextPlainTextHandle), SAL_N_ELEMENTS( mso_sptTextPlainTextHandle ) }; @@ -6337,7 +6337,7 @@ static const mso_CustomShape msoTextStop = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextStopHandle), SAL_N_ELEMENTS( mso_sptTextStopHandle ) }; @@ -6368,7 +6368,7 @@ static const mso_CustomShape msoTextTriangle = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextTriangleHandle), SAL_N_ELEMENTS( mso_sptTextTriangleHandle ) }; static const SvxMSDffVertPair mso_sptTextTriangleInvertedVert[] = @@ -6389,7 +6389,7 @@ static const mso_CustomShape msoTextTriangleInverted = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextTriangleHandle), SAL_N_ELEMENTS( mso_sptTextTriangleHandle ) }; @@ -6421,7 +6421,7 @@ static const mso_CustomShape msoTextChevron = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextChevronHandle), SAL_N_ELEMENTS( mso_sptTextChevronHandle ) }; @@ -6453,7 +6453,7 @@ static const mso_CustomShape msoTextChevronInverted = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextChevronInvertedHandle), SAL_N_ELEMENTS( mso_sptTextChevronInvertedHandle ) }; //V 0 0 21600 ?f2 0 ?f0 21600 ?f0 @@ -6494,7 +6494,7 @@ static const mso_CustomShape msoTextRingInside = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextRingInsideHandle), sizeof( mso_sptTextRingInsideHandle ) / sizeof( SvxMSDffHandle ) }; //mso_sptTextRingOutside @@ -6532,7 +6532,7 @@ static const mso_CustomShape msoTextRingOutside = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextRingOutsideHandle), SAL_N_ELEMENTS( mso_sptTextRingOutsideHandle ) }; @@ -6564,7 +6564,7 @@ static const mso_CustomShape msoTextFadeRight = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextFadeRightHandle), SAL_N_ELEMENTS( mso_sptTextFadeRightHandle ) }; @@ -6586,7 +6586,7 @@ static const mso_CustomShape msoTextFadeLeft = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextFadeLeftHandle), SAL_N_ELEMENTS( mso_sptTextFadeLeftHandle ) }; @@ -6608,7 +6608,7 @@ static const mso_CustomShape msoTextFadeUp = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextFadeUpHandle), SAL_N_ELEMENTS( mso_sptTextFadeUpHandle ) }; @@ -6630,7 +6630,7 @@ static const mso_CustomShape msoTextFadeDown = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextFadeDownHandle), SAL_N_ELEMENTS( mso_sptTextFadeDownHandle ) }; @@ -6652,7 +6652,7 @@ static const mso_CustomShape msoTextSlantUp = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextSlantUpHandle), SAL_N_ELEMENTS( mso_sptTextSlantUpHandle ) }; @@ -6674,7 +6674,7 @@ static const mso_CustomShape msoTextSlantDown = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextSlantDownHandle), SAL_N_ELEMENTS( mso_sptTextSlantDownHandle ) }; @@ -6702,7 +6702,7 @@ static const mso_CustomShape msoTextCascadeUp = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextCascadeUpHandle), SAL_N_ELEMENTS( mso_sptTextCascadeUpHandle ) }; @@ -6724,7 +6724,7 @@ static const mso_CustomShape msoTextCascadeDown = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextCascadeDownHandle), SAL_N_ELEMENTS( mso_sptTextCascadeDownHandle ) }; @@ -6762,7 +6762,7 @@ static const mso_CustomShape msoTextArchUpCurve = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextArchUpCurveHandle), SAL_N_ELEMENTS( mso_sptTextArchUpCurveHandle ) }; @@ -6792,7 +6792,7 @@ static const mso_CustomShape msoTextArchDownCurve = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextArchDownCurveHandle), SAL_N_ELEMENTS( mso_sptTextArchDownCurveHandle ) }; @@ -6830,7 +6830,7 @@ static const mso_CustomShape msoTextCircleCurve = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextCircleCurveHandle), SAL_N_ELEMENTS( mso_sptTextCircleCurveHandle ) }; @@ -6873,7 +6873,7 @@ static const mso_CustomShape msoTextButtonCurve = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextButtonCurveHandle), SAL_N_ELEMENTS( mso_sptTextButtonCurveHandle ) }; @@ -6919,7 +6919,7 @@ static const mso_CustomShape msoTextArchUpPour = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextArchPourHandle), SAL_N_ELEMENTS( mso_sptTextArchPourHandle ) }; @@ -6945,7 +6945,7 @@ static const mso_CustomShape msoTextArchDownPour = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextArchPourHandle), SAL_N_ELEMENTS( mso_sptTextArchPourHandle ) }; @@ -6992,7 +6992,7 @@ static const mso_CustomShape msoTextCirclePour = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextCirclePourHandle), SAL_N_ELEMENTS( mso_sptTextCirclePourHandle ) }; @@ -7060,7 +7060,7 @@ static const mso_CustomShape msoTextButtonPour = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextButtonPourHandle), SAL_N_ELEMENTS( mso_sptTextButtonPourHandle ) }; @@ -7100,7 +7100,7 @@ static const mso_CustomShape msoTextCurveUp = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextCurveUpHandle), SAL_N_ELEMENTS( mso_sptTextCurveUpHandle ) }; @@ -7126,7 +7126,7 @@ static const mso_CustomShape msoTextCurveDown = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextCurveDownHandle), SAL_N_ELEMENTS( mso_sptTextCurveDownHandle ) }; @@ -7166,7 +7166,7 @@ static const mso_CustomShape msoTextCanUp = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextCanUpHandle), SAL_N_ELEMENTS( mso_sptTextCanUpHandle ) }; @@ -7199,7 +7199,7 @@ static const mso_CustomShape msoTextCanDown = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextCanDownHandle), SAL_N_ELEMENTS( mso_sptTextCanDownHandle ) }; @@ -7233,7 +7233,7 @@ static const mso_CustomShape msoTextInflate = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextInflateHandle), SAL_N_ELEMENTS( mso_sptTextInflateHandle ) }; @@ -7263,7 +7263,7 @@ static const mso_CustomShape msoTextDeflate = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextDeflateHandle), SAL_N_ELEMENTS( mso_sptTextDeflateHandle ) }; @@ -7302,7 +7302,7 @@ static const mso_CustomShape msoTextInflateBottom = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextInflateBottomHandle), SAL_N_ELEMENTS( mso_sptTextInflateBottomHandle ) }; @@ -7341,7 +7341,7 @@ static const mso_CustomShape msoTextDeflateBottom = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextDeflateBottomHandle), SAL_N_ELEMENTS( mso_sptTextDeflateBottomHandle ) }; @@ -7378,7 +7378,7 @@ static const mso_CustomShape msoTextInflateTop = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextInflateTopHandle), SAL_N_ELEMENTS( mso_sptTextInflateTopHandle ) }; @@ -7415,7 +7415,7 @@ static const mso_CustomShape msoTextDeflateTop = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextDeflateTopHandle), SAL_N_ELEMENTS( mso_sptTextDeflateTopHandle ) }; @@ -7461,7 +7461,7 @@ static const mso_CustomShape msoTextDeflateInflate = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextDeflateInflateHandle), SAL_N_ELEMENTS( mso_sptTextDeflateInflateHandle ) }; @@ -7515,7 +7515,7 @@ static const mso_CustomShape msoTextDeflateInflateDeflate = const_cast<SvxMSDffTextRectangles*>(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTextDeflateInflateDeflateHandle), SAL_N_ELEMENTS( mso_sptTextDeflateInflateDeflateHandle ) }; @@ -7761,10 +7761,10 @@ static const mso_CustomShape msoCallout90 = const_cast<sal_uInt16*>(mso_sptCalloutSegm1b), sizeof( mso_sptCalloutSegm1b ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault1), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoCallout1 = @@ -7773,10 +7773,10 @@ static const mso_CustomShape msoCallout1 = const_cast<sal_uInt16*>(mso_sptCalloutSegm1b), sizeof( mso_sptCalloutSegm1b ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault2), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoCallout2 = @@ -7785,10 +7785,10 @@ static const mso_CustomShape msoCallout2 = const_cast<sal_uInt16*>(mso_sptCallout2Segm1b), sizeof( mso_sptCallout2Segm1b ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault3), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle2), SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) }; static const mso_CustomShape msoCallout3 = @@ -7797,10 +7797,10 @@ static const mso_CustomShape msoCallout3 = const_cast<sal_uInt16*>(mso_sptCallout3Segm1b), sizeof( mso_sptCallout3Segm1b ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault4), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle3), SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) }; static const mso_CustomShape msoAccentCallout90 = @@ -7809,10 +7809,10 @@ static const mso_CustomShape msoAccentCallout90 = const_cast<sal_uInt16*>(mso_sptCalloutSegm1b), sizeof( mso_sptCalloutSegm1b ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault1), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoAccentCallout1 = @@ -7821,10 +7821,10 @@ static const mso_CustomShape msoAccentCallout1 = const_cast<sal_uInt16*>(mso_sptCallout1Segm1b), sizeof( mso_sptCallout1Segm1b ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault2), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoAccentCallout2 = @@ -7833,10 +7833,10 @@ static const mso_CustomShape msoAccentCallout2 = const_cast<sal_uInt16*>(mso_sptCallout2Segm1d), sizeof( mso_sptCallout2Segm1d ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault3), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle2), SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) }; static const mso_CustomShape msoAccentCallout3 = @@ -7845,10 +7845,10 @@ static const mso_CustomShape msoAccentCallout3 = const_cast<sal_uInt16*>(mso_sptCallout3Segm1d), sizeof( mso_sptCallout3Segm1d ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault4), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle3), SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) }; static const mso_CustomShape msoBorderCallout90 = @@ -7857,10 +7857,10 @@ static const mso_CustomShape msoBorderCallout90 = const_cast<sal_uInt16*>(mso_sptCalloutSegm1a), sizeof( mso_sptCalloutSegm1a ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault1), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoBorderCallout1 = @@ -7869,10 +7869,10 @@ static const mso_CustomShape msoBorderCallout1 = const_cast<sal_uInt16*>(mso_sptCalloutSegm1a), sizeof( mso_sptCalloutSegm1a ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault2), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoBorderCallout2 = @@ -7881,10 +7881,10 @@ static const mso_CustomShape msoBorderCallout2 = const_cast<sal_uInt16*>(mso_sptCallout2Segm1a), sizeof( mso_sptCallout2Segm1a ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault3), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle2), SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) }; static const mso_CustomShape msoBorderCallout3 = @@ -7893,10 +7893,10 @@ static const mso_CustomShape msoBorderCallout3 = const_cast<sal_uInt16*>(mso_sptCallout3Segm1a), sizeof( mso_sptCallout3Segm1a ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault4), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle3), SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) }; static const mso_CustomShape msoAccentBorderCallout90 = @@ -7905,10 +7905,10 @@ static const mso_CustomShape msoAccentBorderCallout90 = const_cast<sal_uInt16*>(mso_sptCalloutSegm1a), sizeof( mso_sptCalloutSegm1a ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault1), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoAccentBorderCallout1 = @@ -7917,10 +7917,10 @@ static const mso_CustomShape msoAccentBorderCallout1 = const_cast<sal_uInt16*>(mso_sptCallout1Segm1a), sizeof( mso_sptCallout1Segm1a ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault2), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoAccentBorderCallout2 = @@ -7929,10 +7929,10 @@ static const mso_CustomShape msoAccentBorderCallout2 = const_cast<sal_uInt16*>(mso_sptCallout2Segm1c), sizeof( mso_sptCallout2Segm1c ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault3), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle2), SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) }; static const mso_CustomShape msoAccentBorderCallout3 = @@ -7941,10 +7941,10 @@ static const mso_CustomShape msoAccentBorderCallout3 = const_cast<sal_uInt16*>(mso_sptCallout3Segm1c), sizeof( mso_sptCallout3Segm1c ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), const_cast<sal_Int32*>(mso_sptCalloutDefault4), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCalloutHandle3), SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) }; @@ -7962,10 +7962,10 @@ static const mso_CustomShape msoStraightConnector1 = const_cast<sal_uInt16*>(mso_sptStraightConnector1Segm), sizeof( mso_sptStraightConnector1Segm ) >> 1, nullptr, 0, nullptr, - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, nullptr, 0 }; @@ -7983,10 +7983,10 @@ static const mso_CustomShape msoBentConnector2 = const_cast<sal_uInt16*>(mso_sptBentConnector2Segm), sizeof( mso_sptBentConnector2Segm ) >> 1, nullptr, 0, nullptr, - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, nullptr, 0 }; @@ -8017,10 +8017,10 @@ static const mso_CustomShape msoBentConnector3 = const_cast<sal_uInt16*>(mso_sptBentConnector3Segm), sizeof( mso_sptBentConnector3Segm ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptBentConnector3Calc), SAL_N_ELEMENTS( mso_sptBentConnector3Calc ), const_cast<sal_Int32*>(mso_sptBentConnector3Default), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptBentConnector3Handle), SAL_N_ELEMENTS( mso_sptBentConnector3Handle ) }; @@ -8057,10 +8057,10 @@ static const mso_CustomShape msoBentConnector4 = const_cast<sal_uInt16*>(mso_sptBentConnector4Segm), sizeof( mso_sptBentConnector4Segm ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptBentConnector4Calc), SAL_N_ELEMENTS( mso_sptBentConnector4Calc ), const_cast<sal_Int32*>(mso_sptBentConnector4Default), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptBentConnector4Handle), SAL_N_ELEMENTS( mso_sptBentConnector4Handle ) }; @@ -8102,10 +8102,10 @@ static const mso_CustomShape msoBentConnector5 = const_cast<sal_uInt16*>(mso_sptBentConnector5Segm), sizeof( mso_sptBentConnector5Segm ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptBentConnector5Calc), SAL_N_ELEMENTS( mso_sptBentConnector5Calc ), const_cast<sal_Int32*>(mso_sptBentConnector5Default), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptBentConnector5Handle), SAL_N_ELEMENTS( mso_sptBentConnector5Handle ) }; @@ -8123,10 +8123,10 @@ static const mso_CustomShape msoCurvedConnector2 = const_cast<sal_uInt16*>(mso_sptCurvedConnector2Segm), sizeof( mso_sptCurvedConnector2Segm ) >> 1, nullptr, 0, nullptr, - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, nullptr, 0 }; @@ -8160,10 +8160,10 @@ static const mso_CustomShape msoCurvedConnector3 = const_cast<sal_uInt16*>(mso_sptCurvedConnector3Segm), sizeof( mso_sptCurvedConnector3Segm ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCurvedConnector3Calc), SAL_N_ELEMENTS( mso_sptCurvedConnector3Calc ), const_cast<sal_Int32*>(mso_sptCurvedConnector3Default), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCurvedConnector3Handle), SAL_N_ELEMENTS( mso_sptCurvedConnector3Handle ) }; @@ -8213,10 +8213,10 @@ static const mso_CustomShape msoCurvedConnector4 = const_cast<sal_uInt16*>(mso_sptCurvedConnector4Segm), sizeof( mso_sptCurvedConnector4Segm ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCurvedConnector4Calc), SAL_N_ELEMENTS( mso_sptCurvedConnector4Calc ), const_cast<sal_Int32*>(mso_sptCurvedConnector4Default), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCurvedConnector4Handle), SAL_N_ELEMENTS( mso_sptCurvedConnector4Handle ) }; @@ -8276,10 +8276,10 @@ static const mso_CustomShape msoCurvedConnector5 = const_cast<sal_uInt16*>(mso_sptCurvedConnector5Segm), sizeof( mso_sptCurvedConnector5Segm ) >> 1, const_cast<SvxMSDffCalculationData*>(mso_sptCurvedConnector5Calc), SAL_N_ELEMENTS( mso_sptCurvedConnector5Calc ), const_cast<sal_Int32*>(mso_sptCurvedConnector5Default), - NULL, 0, + nullptr, 0, 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptCurvedConnector5Handle), SAL_N_ELEMENTS( mso_sptCurvedConnector5Handle ) }; @@ -8340,14 +8340,14 @@ static const mso_CustomShape msoTearDrop = const_cast<SvxMSDffTextRectangles*>(mso_sptTearDropTextRect), sizeof( mso_sptTearDropTextRect ) / sizeof( SvxMSDffTextRectangles ), 21600, 21600, MIN_INT32, MIN_INT32, - NULL, 0, + nullptr, 0, const_cast<SvxMSDffHandle*>(mso_sptTearDropHandle), sizeof(mso_sptTearDropHandle)/sizeof(SvxMSDffHandle) // handles }; const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType ) { - const mso_CustomShape* pCustomShape = NULL; + const mso_CustomShape* pCustomShape = nullptr; switch( eSpType ) { case mso_sptArc : pCustomShape = &msoArc; break; diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index 15a6aa529ba0..9b20d35b4901 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -23,7 +23,7 @@ typedef std::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap; -static TypeNameHashMap* pHashMap = NULL; +static TypeNameHashMap* pHashMap = nullptr; static ::osl::Mutex& getHashMapMutex() { static osl::Mutex s_aHashMapProtection; @@ -308,7 +308,7 @@ OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType ) typedef std::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> TypeACCNameHashMap; -static TypeACCNameHashMap* pACCHashMap = NULL; +static TypeACCNameHashMap* pACCHashMap = nullptr; struct ACCNameTypeTable { const char* pS; diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 84be332dcf15..5433cbd035df 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -212,7 +212,7 @@ IMPL_LINK_TYPED( MaskData, CbxHdl, Button*, pButton, void ) // When a checkbox is checked, the pipette is enabled if ( pCbx->IsChecked() ) { - MaskSet* pSet = NULL; + MaskSet* pSet = nullptr; if (pCbx == pMask->m_pCbx1) pSet = pMask->m_pQSet1; @@ -477,7 +477,7 @@ void SvxBmpMask::dispose() m_pQSet4.disposeAndClear(); m_pCtlPipette.disposeAndClear(); delete pData; - pData = NULL; + pData = nullptr; m_pTbxPipette.clear(); m_pBtnExec.clear(); m_pCbx1.clear(); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 47a5556840bb..33cb2ccb8e24 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -80,7 +80,7 @@ SvxContourDlg::SvxContourDlg(SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::Window* _pParent) : SfxFloatingWindow(_pBindings, pCW, _pParent , "FloatingContour", "svx/ui/floatingcontour.ui") - , pSuperClass(NULL) + , pSuperClass(nullptr) { } @@ -211,8 +211,8 @@ void SvxContourDlg::Update( const Graphic& rGraphic, bool bGraphicLinked, SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window* _pParent) : SvxContourDlg ( _pBindings, pCW, _pParent ), - pUpdateEditingObject( NULL ), - pCheckObj ( NULL ), + pUpdateEditingObject( nullptr ), + pCheckObj ( nullptr ), aContourItem ( SID_CONTOUR_EXEC, *this, *_pBindings ), nGrfChanged ( 0UL ), bExecState ( false ), @@ -598,7 +598,7 @@ IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, CreateHdl, Idle *, void) const bool bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom(); EnterWait(); - SetPolyPolygon( CreateAutoContour( rGraphic, bValid ? &aWorkRect : NULL ) ); + SetPolyPolygon( CreateAutoContour( rGraphic, bValid ? &aWorkRect : nullptr ) ); LeaveWait(); } @@ -606,7 +606,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrView* pView = pWnd->GetSdrView(); - const bool bPolyEdit = ( pObj != NULL ) && dynamic_cast<const SdrPathObj*>( pObj) != nullptr; + const bool bPolyEdit = ( pObj != nullptr ) && dynamic_cast<const SdrPathObj*>( pObj) != nullptr; const bool bDrawEnabled = !(bPolyEdit && m_pTbx1->IsItemChecked(mnPolyEditId)); const bool bPipette = m_pTbx1->IsItemChecked(mnPipetteId); const bool bWorkplace = m_pTbx1->IsItemChecked(mnWorkSpaceId); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index d79fa3269f79..5c34df44a31a 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -202,7 +202,7 @@ void SvxShowCharSet::MouseMove( const MouseEvent& rMEvt ) void SvxShowCharSet::Command( const CommandEvent& rCEvt ) { - if( !HandleScrollCommand( rCEvt, 0, aVscrollSB.get() ) ) + if( !HandleScrollCommand( rCEvt, nullptr, aVscrollSB.get() ) ) Control::Command( rCEvt ); } @@ -734,8 +734,8 @@ void SvxShowCharSet::dispose() void SvxShowCharSet::ReleaseAccessible() { m_aItems.clear(); - m_pAccessible = NULL; - m_xAccessible = NULL; + m_pAccessible = nullptr; + m_xAccessible = nullptr; } css::uno::Reference< XAccessible > SvxShowCharSet::CreateAccessible() @@ -788,7 +788,7 @@ const Subset* SubsetMap::GetNextSubset( bool bFirst ) const if( bFirst ) maSubsetIterator = maSubsets.begin(); if( maSubsetIterator == maSubsets.end() ) - return NULL; + return nullptr; const Subset* s = &*(maSubsetIterator++); return s; } @@ -799,7 +799,7 @@ const Subset* SubsetMap::GetSubsetByUnicode( sal_UCS4 cChar ) const for( const Subset* s = GetNextSubset( true ); s; s = GetNextSubset( false ) ) if( (s->GetRangeMin() <= cChar) && (cChar <= s->GetRangeMax()) ) return s; - return NULL; + return nullptr; } inline Subset::Subset( sal_UCS4 nMin, sal_UCS4 nMax, int resId) diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 95dcb74030db..0faa72feb39e 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -66,7 +66,7 @@ void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uLong nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { - SvTreeListBox::InsertEntry( rStr, NULL, false, nPos, pUserData, + SvTreeListBox::InsertEntry( rStr, nullptr, false, nPos, pUserData, eButtonKind ); } @@ -147,7 +147,7 @@ bool SvxCheckListBox::IsChecked( sal_uLong nPos ) const void* SvxCheckListBox::SetEntryData ( sal_uLong nPos, void* pNewData ) { - void* pOld = NULL; + void* pOld = nullptr; if ( nPos < GetEntryCount() ) { @@ -164,7 +164,7 @@ void* SvxCheckListBox::GetEntryData( sal_uLong nPos ) const if ( nPos < GetEntryCount() ) return GetEntry( nPos )->GetUserData(); else - return NULL; + return nullptr; } diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index b57fb3290b26..3f65607b0157 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -53,7 +53,7 @@ CompressGraphicsDialog::CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj CompressGraphicsDialog::CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ) : ModalDialog ( pParent, "CompressGraphicDialog", "svx/ui/compressgraphicdialog.ui" ), - m_pGraphicObj ( NULL ), + m_pGraphicObj ( nullptr ), m_aGraphic ( rGraphic ), m_aViewSize100mm ( rViewSize100mm ), m_aCropRectangle ( rCropRectangle ), @@ -414,7 +414,7 @@ SdrGrafObj* CompressGraphicsDialog::GetCompressedSdrGrafObj() return pNewObject; } - return NULL; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index e0d8145b34a0..ff9e3bd8d3a3 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -38,9 +38,9 @@ SvxXConnectionPreview::SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle) - , pEdgeObj(NULL) - , pObjList(NULL) - , pView(NULL) + , pEdgeObj(nullptr) + , pObjList(nullptr) + , pView(nullptr) { SetMapMode( MAP_100TH_MM ); SetStyles(); @@ -181,7 +181,7 @@ void SvxXConnectionPreview::Construct() // not yet one. if(!pObjList) { - pObjList = new SdrObjList( pView->GetModel(), NULL ); + pObjList = new SdrObjList( pView->GetModel(), nullptr ); } if( pTmpObj1 ) @@ -228,7 +228,7 @@ void SvxXConnectionPreview::Paint(vcl::RenderContext& rRenderContext, const Rect aObjectVector.push_back(pObject); } - sdr::contact::ObjectContactOfObjListPainter aPainter(rRenderContext, aObjectVector, 0); + sdr::contact::ObjectContactOfObjListPainter aPainter(rRenderContext, aObjectVector, nullptr); sdr::contact::DisplayInfo aDisplayInfo; // do processing diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index a6deb0bc654e..ea565d049eca 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -117,8 +117,8 @@ public: bool IsRedoPossible() const; void UpdateGraphic( const Graphic& rGraphic, bool bGraphicLinked, - const tools::PolyPolygon* pPolyPoly = NULL, - void* pEditingObj = NULL ); + const tools::PolyPolygon* pPolyPoly = nullptr, + void* pEditingObj = nullptr ); }; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 6eedfa8e315c..c94d9450df35 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -39,7 +39,7 @@ RedlinData::RedlinData() : aDateTime(DateTime::EMPTY) { bDisabled=false; - pData=NULL; + pData=nullptr; } RedlinData::~RedlinData() @@ -103,7 +103,7 @@ SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits) , aDaTiLast( DateTime::EMPTY ) , aDaTiFilterFirst( DateTime::EMPTY ) , aDaTiFilterLast( DateTime::EMPTY ) - , pCommentSearcher(0) + , pCommentSearcher(nullptr) { SetNodeDefaultImages(); } @@ -116,7 +116,7 @@ SvxRedlinTable::~SvxRedlinTable() void SvxRedlinTable::dispose() { delete pCommentSearcher; - pCommentSearcher = NULL; + pCommentSearcher = nullptr; SvSimpleTable::dispose(); } @@ -138,7 +138,7 @@ sal_Int32 SvxRedlinTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRi RedlinData *pLeftData=static_cast<RedlinData *>(pLeft->GetUserData()); RedlinData *pRightData=static_cast<RedlinData *>(pRight->GetUserData()); - if(pLeftData!=NULL && pRightData!=NULL) + if(pLeftData!=nullptr && pRightData!=nullptr) { if(pLeftData->aDateTime < pRightData->aDateTime) { @@ -265,7 +265,7 @@ void SvxRedlinTable::SetFilterComment(bool bFlag) void SvxRedlinTable::SetCommentParams( const utl::SearchParam* pSearchPara ) { - if(pSearchPara!=NULL) + if(pSearchPara!=nullptr) { delete pCommentSearcher; @@ -536,7 +536,7 @@ IMPL_LINK_TYPED( SvxTPView, PbClickHdl, Button*, pButton, void ) SvxTPFilter::SvxTPFilter( vcl::Window * pParent) : TabPage(pParent, "RedlineFilterPage", "svx/ui/redlinefilterpage.ui") - , pRedlinTable(NULL) + , pRedlinTable(nullptr) , bModified(false) { get(m_pCbDate, "date"); @@ -945,7 +945,7 @@ IMPL_LINK_TYPED( SvxTPFilter, RowEnableHdl, Button*, pButton, void ) m_pEdComment->Invalidate(); } - if(pCB!=NULL) + if(pCB!=nullptr) bModified=true; } @@ -1063,7 +1063,7 @@ IMPL_LINK_TYPED( SvxTPFilter, ModifyDate, Edit&, rTF, void) IMPL_LINK_TYPED( SvxTPFilter, RefHandle, Button*, pRef, void ) { - if(pRef!=NULL) + if(pRef!=nullptr) { aRefLink.Call(this); } @@ -1114,7 +1114,7 @@ void SvxAcceptChgCtr::ShowViewPage() SvxRedlinTable* SvxAcceptChgCtr::GetViewTable() { - return pTPView ? pTPView->GetTableControl() : NULL; + return pTPView ? pTPView->GetTableControl() : nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 3fbe9d3249e1..aba6a600e1b9 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -38,7 +38,7 @@ namespace svx SvxAbstractDialogFactory* pDialogFactory = SvxAbstractDialogFactory::Create(); std::unique_ptr< SfxAbstractDialog > pDialog; if ( pDialogFactory ) - pDialog.reset( pDialogFactory->CreateSfxDialog( _parentWindow, aRegistrationItems, NULL, RID_SFXPAGE_DBREGISTER ) ); + pDialog.reset( pDialogFactory->CreateSfxDialog( _parentWindow, aRegistrationItems, nullptr, RID_SFXPAGE_DBREGISTER ) ); if ( pDialog.get() ) nResult = pDialog->Execute(); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index e0834a7d873f..18f6a5c002b7 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -223,7 +223,7 @@ DialControl::DialControl_Impl::DialControl_Impl ( vcl::Window& rParent ) : mxBmpEnabled(VclPtr<DialControlBmp>::Create(rParent)), mxBmpDisabled(VclPtr<DialControlBmp>::Create(rParent)), mxBmpBuffered(VclPtr<DialControlBmp>::Create(rParent)), - mpLinkField( 0 ), + mpLinkField( nullptr ), mnLinkedFieldValueMultiplyer( 0 ), mnAngle( 0 ), mnInitialAngle( 0 ), diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index b0d29ca48c57..e683a72fab3c 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -22,7 +22,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -static ResMgr* pResMgr=0; +static ResMgr* pResMgr=nullptr; ResMgr* DialogsResMgr::GetResMgr() { diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 36f08fb572df..2dbd53e6f72b 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -43,11 +43,11 @@ using namespace com::sun::star; Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle), - mpModel(0), - mpFmPage(0), - mp3DView(0), - mpScene(0), - mp3DObj(0), + mpModel(nullptr), + mpFmPage(nullptr), + mp3DView(nullptr), + mpScene(nullptr), + mp3DObj(nullptr), mnObjectType(SvxPreviewObjectType::SPHERE) { Construct(); @@ -197,7 +197,7 @@ void Svx3DPreviewControl::SetObjectType(SvxPreviewObjectType nType) aSet.Put(mp3DObj->GetMergedItemSet()); mpScene->Remove3DObj( mp3DObj ); delete mp3DObj; - mp3DObj = NULL; + mp3DObj = nullptr; } switch( nType ) @@ -255,9 +255,9 @@ Svx3DLightControl::Svx3DLightControl(vcl::Window* pParent, WinBits nStyle) maChangeCallback(), maSelectionChangeCallback(), maSelectedLight(NO_LIGHT_SELECTED), - mpExpansionObject(0), - mpLampBottomObject(0), - mpLampShaftObject(0), + mpExpansionObject(nullptr), + mpLampBottomObject(nullptr), + mpLampShaftObject(nullptr), maLightObjects(MAX_NUMBER_LIGHTS, nullptr), mfRotateX(-20.0), mfRotateY(45.0), @@ -376,7 +376,7 @@ void Svx3DLightControl::ConstructLightObjects() { mpScene->Remove3DObj(maLightObjects[a]); delete maLightObjects[a]; - maLightObjects[a] = 0; + maLightObjects[a] = nullptr; } if(GetLightOnOff(a)) @@ -473,7 +473,7 @@ void Svx3DLightControl::TrySelection(Point aPosPixel) { // exclude expansion object which will be part of // the hits. It's invisible, but for HitTest, it's included - const E3dCompoundObject* pResult = 0; + const E3dCompoundObject* pResult = nullptr; for(sal_uInt32 b(0); !pResult && b < aResult.size(); b++) { diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 2d78701bedb3..9ac39b334142 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -70,12 +70,12 @@ Bitmap& SvxRectCtl::GetRectBitmap() SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RECT_POINT eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle) : Control(pParent, WB_BORDER | WB_TABSTOP) - , pAccContext(NULL) + , pAccContext(nullptr) , nBorderWidth(nBorder) , nRadius(nCircle) , eDefRP(eRpt) , eCS(eStyle) - , pBitmap(NULL) + , pBitmap(nullptr) , m_nState(CTL_STATE::NONE) , mbCompleteDisable(false) , mbUpdateForeground(true) @@ -827,7 +827,7 @@ SvxPixelCtl::SvxPixelCtl(vcl::Window* pParent, sal_uInt16 nNumber) nSquares = nLines * nLines; pPixel = new sal_uInt16[ nSquares ]; memset(pPixel, 0, nSquares * sizeof(sal_uInt16)); - m_pAccess=NULL; + m_pAccess=nullptr; } void SvxPixelCtl::Resize() @@ -1122,7 +1122,7 @@ void SvxPixelCtl::Reset() SvxBitmapCtl::SvxBitmapCtl( vcl::Window* /*pParent*/, const Size& rSize ) : aSize(rSize) , nLines(0) - , pBmpArray(NULL) + , pBmpArray(nullptr) { } @@ -1189,7 +1189,7 @@ void ColorLB::Modify( const XColorEntry& rEntry, sal_Int32 nPos ) HatchingLB::HatchingLB( vcl::Window* pParent, WinBits nWinStyle) : ListBox( pParent, nWinStyle ), - mpList ( NULL ) + mpList ( nullptr ) { SetEdgeBlending(true); } @@ -1282,7 +1282,7 @@ void FillAttrLB::Fill( const XHatchListRef &pList ) GradientLB::GradientLB( vcl::Window* pParent, WinBits aWB) : ListBox( pParent, aWB ), - mpList(NULL) + mpList(nullptr) { SetEdgeBlending(true); } @@ -1398,7 +1398,7 @@ void FillAttrLB::Fill( const XGradientListRef &pList ) BitmapLB::BitmapLB( vcl::Window* pParent, WinBits aWB) : ListBox( pParent, aWB ), maBitmapEx(), - mpList(NULL) + mpList(nullptr) { SetEdgeBlending(true); } @@ -1947,10 +1947,10 @@ void SvxXLinePreview::Resize() SvxXLinePreview::SvxXLinePreview(vcl::Window* pParent) : SvxPreviewBase(pParent) - , mpLineObjA(NULL) - , mpLineObjB(NULL) - , mpLineObjC(NULL) - , mpGraphic(NULL) + , mpLineObjA(nullptr) + , mpLineObjB(nullptr) + , mpLineObjC(nullptr) + , mpGraphic(nullptr) , mbWithSymbol(false) { InitSettings( true, true ); @@ -2035,7 +2035,7 @@ void SvxXLinePreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& aObjectVector.push_back(mpLineObjB); aObjectVector.push_back(mpLineObjC); - sdr::contact::ObjectContactOfObjListPainter aPainter(getBufferDevice(), aObjectVector, 0); + sdr::contact::ObjectContactOfObjListPainter aPainter(getBufferDevice(), aObjectVector, nullptr); sdr::contact::DisplayInfo aDisplayInfo; // do processing @@ -2055,7 +2055,7 @@ void SvxXLinePreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& SvxXRectPreview::SvxXRectPreview(vcl::Window* pParent) : SvxPreviewBase(pParent) - , mpRectangleObject(0) + , mpRectangleObject(nullptr) { InitSettings(true, true); @@ -2106,7 +2106,7 @@ void SvxXRectPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& aObjectVector.push_back(mpRectangleObject); - sdr::contact::ObjectContactOfObjListPainter aPainter(getBufferDevice(), aObjectVector, 0); + sdr::contact::ObjectContactOfObjListPainter aPainter(getBufferDevice(), aObjectVector, nullptr); sdr::contact::DisplayInfo aDisplayInfo; aPainter.ProcessDisplay(aDisplayInfo); @@ -2116,8 +2116,8 @@ void SvxXRectPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& SvxXShadowPreview::SvxXShadowPreview( vcl::Window* pParent ) : SvxPreviewBase(pParent) - , mpRectangleObject(0) - , mpRectangleShadow(0) + , mpRectangleObject(nullptr) + , mpRectangleShadow(nullptr) { InitSettings(true, true); @@ -2187,7 +2187,7 @@ void SvxXShadowPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangl aObjectVector.push_back(mpRectangleShadow); aObjectVector.push_back(mpRectangleObject); - sdr::contact::ObjectContactOfObjListPainter aPainter(getBufferDevice(), aObjectVector, 0); + sdr::contact::ObjectContactOfObjListPainter aPainter(getBufferDevice(), aObjectVector, nullptr); sdr::contact::DisplayInfo aDisplayInfo; aPainter.ProcessDisplay(aDisplayInfo); diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index a159d80a22c5..330925d4938c 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -31,7 +31,7 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) { FieldUnit eUnit = FUNIT_INCH; - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; if ( SfxItemState::SET == rSet.GetItemState( SID_ATTR_METRIC, false, &pItem ) ) eUnit = (FieldUnit) static_cast<const SfxUInt16Item*>(pItem)->GetValue(); else @@ -45,14 +45,14 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) bool GetApplyCharUnit( const SfxItemSet& rSet ) { bool bUseCharUnit = false; - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; if ( SfxItemState::SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, false, &pItem ) ) bUseCharUnit = static_cast<const SfxBoolItem*>(pItem)->GetValue(); else { // FIXME - this might be wrong, cf. the DEV300 changes in GetModuleFieldUnit() SfxViewFrame* pFrame = SfxViewFrame::Current(); - SfxObjectShell* pSh = NULL; + SfxObjectShell* pSh = nullptr; if ( pFrame ) pSh = pFrame->GetObjectShell(); if ( pSh ) // the object shell is not always available during reload diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 736c957405b4..a81c3690dda6 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -66,7 +66,7 @@ using namespace ::osl; RecoveryCore::RecoveryCore(const css::uno::Reference< css::uno::XComponentContext >& rxContext, bool bUsedForSaving) : m_xContext ( rxContext ) - , m_pListener ( 0 ) + , m_pListener ( nullptr ) , m_bListenForSaving(bUsedForSaving) { impl_startListening(); @@ -725,7 +725,7 @@ short SaveProgressDialog::Execute() m_pCore->setUpdateListener(this); m_pCore->doEmergencySave(); short nRet = ModalDialog::Execute(); - m_pCore->setUpdateListener(0); + m_pCore->setUpdateListener(nullptr); return nRet; } @@ -767,8 +767,8 @@ RecovDocListEntry::RecovDocListEntry( SvTreeListEntry* pEntry, void RecovDocListEntry::Paint(const Point& aPos, SvTreeListBox& aDevice, vcl::RenderContext& rRenderContext, const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry) { - const Image* pImg = 0; - const OUString* pTxt = 0; + const Image* pImg = nullptr; + const OUString* pTxt = nullptr; RecovDocList* pList = static_cast<RecovDocList*>(&aDevice); TURLInfo* pInfo = static_cast<TURLInfo*>(rEntry.GetUserData()); @@ -797,14 +797,14 @@ void RecovDocListEntry::Paint(const Point& aPos, SvTreeListBox& aDevice, vcl::Re case E_RECOVERY_IS_IN_PROGRESS: { - pImg = 0; + pImg = nullptr; pTxt = &pList->m_aRecovInProgrStr; } break; case E_NOT_RECOVERED_YET: { - pImg = 0; + pImg = nullptr; pTxt = &pList->m_aNotRecovYetStr; } break; @@ -962,7 +962,7 @@ short RecoveryDialog::execute() while(m_bWaitForCore) Application::Yield(); - m_pCore->setUpdateListener(0); + m_pCore->setUpdateListener(nullptr); m_eRecoveryState = RecoveryDialog::E_RECOVERY_CORE_DONE; return execute(); } diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 161d94987716..8511dc0190c9 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -167,7 +167,7 @@ public: mpPrinter(nullptr), mbDelPrinter(false), mpColor(nullptr), - mpBackColor(0), + mpBackColor(nullptr), mnAscent(0), mcStartBracket(0), mcEndBracket(0), @@ -613,7 +613,7 @@ void SvxFontPrevWindow::SetColor(const Color &rColor) void SvxFontPrevWindow::ResetColor() { delete pImpl->mpColor; - pImpl->mpColor = 0; + pImpl->mpColor = nullptr; Invalidate(); } diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index c5bfb6d95f72..12c5c2fd81d1 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -35,7 +35,7 @@ SvLBoxFontString::SvLBoxFontString( const vcl::Font& rFont, const Color* pColor ) : SvLBoxString( pEntry, nFlags, rString ), maFont( rFont ), - mbUseColor( pColor != NULL ) + mbUseColor( pColor != nullptr ) { SetText(rString); if(pColor) @@ -82,7 +82,7 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEnt SvxFontListBox::SvxFontListBox(vcl::Window* pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) , maStdFont(GetFont()) - , mpEntryColor(NULL) + , mpEntryColor(nullptr) , mbUseFont(false) { maStdFont.SetTransparent(true); diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index c355e67648b5..89e90261189d 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -64,7 +64,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextStyleItem* pStateItem = dynamic_cast<const XFormTextStyleItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStyleItem expected"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextStyleItem expected"); rFontWorkDlg.SetStyle_Impl(pStateItem); break; } @@ -72,7 +72,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextAdjustItem* pStateItem = dynamic_cast<const XFormTextAdjustItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextAdjustItem expected"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextAdjustItem expected"); rFontWorkDlg.SetAdjust_Impl(pStateItem); break; } @@ -80,7 +80,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextDistanceItem* pStateItem = dynamic_cast<const XFormTextDistanceItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextDistanceItem erwartet"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextDistanceItem erwartet"); rFontWorkDlg.SetDistance_Impl(pStateItem); break; } @@ -88,7 +88,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextStartItem* pStateItem = dynamic_cast<const XFormTextStartItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStartItem expected"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextStartItem expected"); rFontWorkDlg.SetStart_Impl(pStateItem); break; } @@ -96,7 +96,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextMirrorItem* pStateItem = dynamic_cast<const XFormTextMirrorItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextMirrorItem expected"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextMirrorItem expected"); rFontWorkDlg.SetMirror_Impl(pStateItem); break; } @@ -104,7 +104,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextHideFormItem* pStateItem = dynamic_cast<const XFormTextHideFormItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextHideFormItem expected"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextHideFormItem expected"); rFontWorkDlg.SetShowForm_Impl(pStateItem); break; } @@ -112,7 +112,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextOutlineItem* pStateItem = dynamic_cast<const XFormTextOutlineItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextOutlineItem expected"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextOutlineItem expected"); rFontWorkDlg.SetOutline_Impl(pStateItem); break; } @@ -120,7 +120,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextShadowItem* pStateItem = dynamic_cast<const XFormTextShadowItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowItem expected"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextShadowItem expected"); rFontWorkDlg.SetShadow_Impl(pStateItem); break; } @@ -128,7 +128,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextShadowColorItem* pStateItem = dynamic_cast<const XFormTextShadowColorItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowColorItem expected"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextShadowColorItem expected"); rFontWorkDlg.SetShadowColor_Impl(pStateItem); break; } @@ -136,7 +136,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextShadowXValItem* pStateItem = dynamic_cast<const XFormTextShadowXValItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowXValItem expected"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextShadowXValItem expected"); rFontWorkDlg.SetShadowXVal_Impl(pStateItem); break; } @@ -144,7 +144,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState { const XFormTextShadowYValItem* pStateItem = dynamic_cast<const XFormTextShadowYValItem*>( pItem ); - DBG_ASSERT(pStateItem || pItem == 0, "XFormTextShadowYValItem expected"); + DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextShadowYValItem expected"); rFontWorkDlg.SetShadowYVal_Impl(pStateItem); break; } diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 72c8c20b655e..0c7583f8bf61 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -232,13 +232,13 @@ FrameSelectorImpl::FrameSelectorImpl( FrameSelector& rFrameSel ) : mbAutoSelect( true ), mbClicked( false ), mbHCMode( false ), - mpAccess( 0 ), - maChildVec( 8, static_cast< a11y::AccFrameSelector* >( 0 ) ), + mpAccess( nullptr ), + maChildVec( 8, static_cast< a11y::AccFrameSelector* >( nullptr ) ), mxChildVec( 8 ) { FreeResource(); - maAllBorders.resize( FRAMEBORDERTYPE_COUNT, 0 ); + maAllBorders.resize( FRAMEBORDERTYPE_COUNT, nullptr ); maAllBorders[ GetIndexFromFrameBorderType( FRAMEBORDER_LEFT ) ] = &maLeft; maAllBorders[ GetIndexFromFrameBorderType( FRAMEBORDER_RIGHT ) ] = &maRight; maAllBorders[ GetIndexFromFrameBorderType( FRAMEBORDER_TOP ) ] = &maTop; @@ -321,7 +321,7 @@ void FrameSelectorImpl::InitArrowImageList() GetRes( SVX_RES( RID_SVXSTR_BORDER_CONTROL ).SetRT( RSC_RESOURCE ) ); maILArrows.InsertFromHorizontalBitmap( - SVX_RES( BMP_FRMSEL_ARROWS ), 16, NULL, pColorAry1, pColorAry2, 3); + SVX_RES( BMP_FRMSEL_ARROWS ), 16, nullptr, pColorAry1, pColorAry2, 3); FreeResource(); DBG_ASSERT( maILArrows.GetImageSize().Height() == maILArrows.GetImageSize().Width(), "svx::FrameSelectorImpl::InitArrowImageList - images are not squarish" ); @@ -853,7 +853,7 @@ const SvxBorderLine* FrameSelector::GetFrameBorderStyle( FrameBorderType eBorder { const SvxBorderLine& rStyle = mxImpl->GetBorder( eBorder ).GetCoreStyle(); // rest of the world uses null pointer for invisible frame border - return rStyle.GetOutWidth() ? &rStyle : 0; + return rStyle.GetOutWidth() ? &rStyle : nullptr; } void FrameSelector::ShowBorder( FrameBorderType eBorder, const SvxBorderLine* pStyle ) diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 43735b05e332..cccbef8c476e 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -63,9 +63,9 @@ GraphCtrl::GraphCtrl( vcl::Window* pParent, WinBits nStyle ) : bEditMode ( false ), bSdrMode ( false ), bAnim ( false ), - mpAccContext ( NULL ), - pModel ( NULL ), - pView ( NULL ) + mpAccContext ( nullptr ), + pModel ( nullptr ), + pView ( nullptr ) { pUserCall = new GraphCtrlUserCall( *this ); aUpdateIdle.SetPriority( SchedulerPriority::LOWEST ); @@ -98,11 +98,11 @@ void GraphCtrl::dispose() mpAccContext->release(); } delete pView; - pView = NULL; + pView = nullptr; delete pModel; - pModel = NULL; + pModel = nullptr; delete pUserCall; - pUserCall = NULL; + pUserCall = nullptr; Control::dispose(); } @@ -117,10 +117,10 @@ void GraphCtrl::SetWinStyle( WinBits nWinBits ) SetMapMode( aMap100 ); delete pView; - pView = NULL; + pView = nullptr; delete pModel; - pModel = NULL; + pModel = nullptr; if ( bSdrMode ) InitSdrModel(); @@ -165,7 +165,7 @@ void GraphCtrl::InitSdrModel() pView->SetBufferedOverlayAllowed(true); // Tell the accessibility object about the changes. - if (mpAccContext != NULL) + if (mpAccContext != nullptr) mpAccContext->setModelAndView (pModel, pView); } @@ -453,7 +453,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) const SdrHdlList& rHdlList = pView->GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); - if(0L == pHdl) + if(nullptr == pHdl) { // restrict movement to WorkArea const Rectangle& rWorkArea = pView->GetWorkArea(); @@ -504,7 +504,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) const SdrDragStat& rDragStat = pView->GetDragStat(); // start dragging - pView->BegDragObj(aStartPoint, 0, pHdl, 0); + pView->BegDragObj(aStartPoint, nullptr, pHdl, 0); if(pView->IsDragObj()) { @@ -564,10 +564,10 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) pView->MarkPoint(*pHdl); } - if(0L == rHdlList.GetFocusHdl()) + if(nullptr == rHdlList.GetFocusHdl()) { // restore point with focus - SdrHdl* pNewOne = 0L; + SdrHdl* pNewOne = nullptr; for(size_t a = 0; !pNewOne && a < rHdlList.GetHdlCount(); ++a) { @@ -692,7 +692,7 @@ void GraphCtrl::MouseButtonUp(const MouseEvent& rMEvt) SdrObject* GraphCtrl::GetSelectedSdrObject() const { - SdrObject* pSdrObj = NULL; + SdrObject* pSdrObj = nullptr; if ( bSdrMode ) { @@ -752,7 +752,7 @@ IMPL_LINK_TYPED( GraphCtrl, UpdateHdl, Idle*, pTimer, void ) css::uno::Reference< css::accessibility::XAccessible > GraphCtrl::CreateAccessible() { - if( mpAccContext == NULL ) + if( mpAccContext == nullptr ) { vcl::Window* pParent = GetParent(); diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 88489955c4f2..25e82dea2b97 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -41,8 +41,8 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj if( rGraphic.GetType() == GRAPHIC_BITMAP ) { SfxViewFrame* pViewFrame = SfxViewFrame::Current(); - SfxObjectShell* pShell = pViewFrame ? pViewFrame->GetObjectShell() : NULL; - vcl::Window* pWindow = ( pViewFrame && pViewFrame->GetViewShell() ) ? pViewFrame->GetViewShell()->GetWindow() : NULL; + SfxObjectShell* pShell = pViewFrame ? pViewFrame->GetObjectShell() : nullptr; + vcl::Window* pWindow = ( pViewFrame && pViewFrame->GetViewShell() ) ? pViewFrame->GetViewShell()->GetWindow() : nullptr; Graphic aGraphic; switch( rReq.GetSlot() ) diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index b1e9c1b3a251..aca7ecdf70c8 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -149,7 +149,7 @@ SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : SfxTabPage(pParent, "HFFormatPage", "svx/ui/headfootformatpage.ui", &rSet), nId(nSetId), - pBBSet(NULL), + pBBSet(nullptr), // bitfield mbDisableQueryBox(false), mbEnableBackgroundSelector(true), @@ -384,7 +384,7 @@ void SvxHFPage::Reset( const SfxItemSet* rSet ) m_pCntSharedFirstBox->Show(!bIsCalc); // Evaluate header-/footer- attributes - const SvxSetItem* pSetItem = 0; + const SvxSetItem* pSetItem = nullptr; if ( SfxItemState::SET == rSet->GetItemState( GetWhich(nId), false, reinterpret_cast<const SfxPoolItem**>(&pSetItem) ) ) @@ -401,7 +401,7 @@ void SvxHFPage::Reset( const SfxItemSet* rSet ) static_cast<const SfxBoolItem&>(rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_DYNAMIC ) )); const SfxBoolItem& rShared = static_cast<const SfxBoolItem&>(rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_SHARED ) )); - const SfxBoolItem* pSharedFirst = 0; + const SfxBoolItem* pSharedFirst = nullptr; if (rHeaderSet.HasItem(GetWhich(SID_ATTR_PAGE_SHARED_FIRST))) pSharedFirst = static_cast<const SfxBoolItem*>(&rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_SHARED_FIRST ) )); const SvxSizeItem& rSize = @@ -439,7 +439,7 @@ void SvxHFPage::Reset( const SfxItemSet* rSet ) m_pCntSharedFirstBox->Hide(); } else - pSetItem = 0; + pSetItem = nullptr; } else { @@ -457,7 +457,7 @@ void SvxHFPage::Reset( const SfxItemSet* rSet ) m_pCntSharedFirstBox->Check(); } - TurnOnHdl(0); + TurnOnHdl(nullptr); m_pTurnOnBox->SaveValue(); m_pDistEdit->SaveValue(); @@ -468,11 +468,11 @@ void SvxHFPage::Reset( const SfxItemSet* rSet ) m_pCntSharedBox->SaveValue(); RangeHdl(); - const SfxPoolItem* pItem = 0; + const SfxPoolItem* pItem = nullptr; SfxObjectShell* pShell; if(SfxItemState::SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem) || - ( 0 != (pShell = SfxObjectShell::Current()) && - 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) + ( nullptr != (pShell = SfxObjectShell::Current()) && + nullptr != (pItem = pShell->GetItem(SID_HTML_MODE)))) { sal_uInt16 nHtmlMode = 0; nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); @@ -949,7 +949,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) } // Evaluate Header attribute - const SvxSetItem* pSetItem = 0; + const SvxSetItem* pSetItem = nullptr; if ( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ), false, @@ -976,7 +976,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) m_pBspWin->SetHeader( true ); } else - pSetItem = 0; + pSetItem = nullptr; } if ( !pSetItem ) @@ -989,7 +989,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) m_pCntSharedFirstBox->Disable(); } } - pSetItem = 0; + pSetItem = nullptr; if ( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ), false, @@ -1016,7 +1016,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) m_pBspWin->SetFooter( true ); } else - pSetItem = 0; + pSetItem = nullptr; } if ( !pSetItem ) @@ -1149,7 +1149,7 @@ void SvxHFPage::EnableDynamicSpacing() m_pHeightEdit, m_pHeightDynBtn, m_pBackgroundBtn, - 0 + nullptr }; sal_Int32 nOffset = m_pTurnOnBox->GetPosPixel().Y() - m_pCntSharedBox->GetPosPixel().Y(); sal_Int32 nIdx = 0; diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index 3667bd67f161..96952c601bdf 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -37,7 +37,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ), - mpDlg( NULL ) + mpDlg( nullptr ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -47,9 +47,9 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, SetWindow( mpDlg->GetWindow() ); SetVisible_Impl(false); - vcl::Window* pTopWindow = 0; + vcl::Window* pTopWindow = nullptr; if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 && - (0 != (pTopWindow = SfxGetpApp()->GetTopWindow()))) + (nullptr != (pTopWindow = SfxGetpApp()->GetTopWindow()))) { Size aParentSize( pTopWindow->GetSizePixel() ); Size aDlgSize ( GetSizePixel () ); diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 12ed1babc5ef..34b1dbd7d424 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -117,7 +117,7 @@ VCL_BUILDER_FACTORY(StatusBar) SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window* _pParent) : SfxModelessDialog(_pBindings, pCW, _pParent, "ImapDialog", "svx/ui/imapdialog.ui") - , pCheckObj(NULL) + , pCheckObj(nullptr) , aIMapItem(SID_IMAP_EXEC, *this, *_pBindings) { get(m_pTbxIMapDlg1, "toolbar"); @@ -758,7 +758,7 @@ IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrModel* pModel = pWnd->GetSdrModel(); const SdrView* pView = pWnd->GetSdrView(); - const bool bPolyEdit = ( pObj != NULL ) && dynamic_cast<const SdrPathObj*>( pObj) != nullptr; + const bool bPolyEdit = ( pObj != nullptr ) && dynamic_cast<const SdrPathObj*>( pObj) != nullptr; const bool bDrawEnabled = !( bPolyEdit && m_pTbxIMapDlg1->IsItemChecked( mnPolyEditId ) ); m_pTbxIMapDlg1->EnableItem( mnApplyId, pOwnData->bExecState && pWnd->IsChanged() ); @@ -811,10 +811,10 @@ IMPL_LINK_NOARG_TYPED(SvxIMapDlg, MiscHdl, LinkParamNone*, void) SvxIMapDlg* GetIMapDlg() { - SfxChildWindow* pWnd = NULL; + SfxChildWindow* pWnd = nullptr; if (SfxViewFrame::Current() && SfxViewFrame::Current()->HasChildWindow(SvxIMapDlgChildWindow::GetChildWindowId())) pWnd = SfxViewFrame::Current()->GetChildWindow(SvxIMapDlgChildWindow::GetChildWindowId()); - return pWnd ? static_cast<SvxIMapDlg*>(pWnd->GetWindow()) : NULL; + return pWnd ? static_cast<SvxIMapDlg*>(pWnd->GetWindow()) : nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx index 281be4d64cf2..4d5a1d744e7a 100644 --- a/svx/source/dialog/imapimp.hxx +++ b/svx/source/dialog/imapimp.hxx @@ -38,7 +38,7 @@ public: bool bExecState; IMapOwnData() - : pUpdateEditingObject(NULL) + : pUpdateEditingObject(nullptr) , bExecState(false) { } diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 90de6e96734e..a174415953a6 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -94,7 +94,7 @@ void IMapWindow::SetImageMap( const ImageMap& rImageMap ) void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, bool /*bScaleToGraphic*/ ) { - SdrPage* pPage = 0; + SdrPage* pPage = nullptr; aIMap = rImageMap; if(GetSdrModel()) @@ -135,7 +135,7 @@ bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) IMapObject* pIMapObj; bool bRet = false; - if ( pSdrObj && ( ( pIMapObj = GetIMapObj( pSdrObj ) ) != NULL ) ) + if ( pSdrObj && ( ( pIMapObj = GetIMapObj( pSdrObj ) ) != nullptr ) ) { pIMapObj->SetURL( rNewInfo.aMarkURL ); pIMapObj->SetAltText( rNewInfo.aMarkAltText ); @@ -190,7 +190,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) { Point aPoint; Rectangle aClipRect( aPoint, GetGraphicSize() ); - SdrObject* pSdrObj = NULL; + SdrObject* pSdrObj = nullptr; IMapObjectPtr pCloneIMapObj; switch( pIMapObj->GetType() ) @@ -429,7 +429,7 @@ void IMapWindow::MarkListHasChanged() SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const { - SdrObject* pObj = NULL; + SdrObject* pObj = nullptr; Point aPt = PixelToLogic( rPosPixel ); if ( Rectangle( Point(), GetGraphicSize() ).IsInside( aPt ) ) @@ -457,7 +457,7 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) { - IMapObject* pIMapObj = NULL; + IMapObject* pIMapObj = nullptr; if ( pSdrObj ) { @@ -523,7 +523,7 @@ void IMapWindow::Command(const CommandEvent& rCEvt) sal_Int8 IMapWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { - return( ( GetHitSdrObj( rEvt.maPosPixel ) != NULL ) ? rEvt.mnAction : DND_ACTION_NONE ); + return( ( GetHitSdrObj( rEvt.maPosPixel ) != nullptr ) ? rEvt.mnAction : DND_ACTION_NONE ); } sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) @@ -559,8 +559,8 @@ void IMapWindow::RequestHelp( const HelpEvent& rHEvt ) if ( Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled() ) { - SdrObject* pSdrObj = NULL; - SdrPageView* pPageView = NULL; + SdrObject* pSdrObj = nullptr; + SdrPageView* pPageView = nullptr; if ( pView->PickObj( aPos, pView->getHitTolLog(), pSdrObj, pPageView ) ) { const IMapObject* pIMapObj = GetIMapObj( pSdrObj ); @@ -615,7 +615,7 @@ void IMapWindow::UpdateInfo( bool bNewObj ) if ( aInfoLink.IsSet() ) { const SdrObject* pSdrObj = GetSelectedSdrObject(); - const IMapObject* pIMapObj = pSdrObj ? GetIMapObj( pSdrObj ) : NULL; + const IMapObject* pIMapObj = pSdrObj ? GetIMapObj( pSdrObj ) : nullptr; aInfo.bNewObj = bNewObj; @@ -781,7 +781,7 @@ void IMapWindow::CreateDefaultObject() aPagePos.Y() += (aPageSize.Height() / 2) - (nDefaultObjectSizeHeight / 2); Rectangle aNewObjectRectangle(aPagePos, Size(nDefaultObjectSizeWidth, nDefaultObjectSizeHeight)); - SdrObject* pObj = SdrObjFactory::MakeNewObject( pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier(), 0L, pModel); + SdrObject* pObj = SdrObjFactory::MakeNewObject( pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier(), nullptr, pModel); pObj->SetLogicRect(aNewObjectRectangle); switch( pObj->GetObjIdentifier() ) diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 1d9c1bd00fbb..533c9f82a377 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -130,7 +130,7 @@ VCL_BUILDER_DECL_FACTORY(SvxLanguageComboBox) } SvxLanguageBoxBase::SvxLanguageBoxBase( bool bCheck ) - : m_pSpellUsedLang(NULL) + : m_pSpellUsedLang(nullptr) , m_nLangList(SvxLanguageListFlags::EMPTY) , m_bHasLangNone(false) , m_bLangNoneIsLangAll(false) @@ -249,7 +249,7 @@ void SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags nLangList, else { nCount = SvtLanguageTable::GetLanguageEntryCount(); - pKnown = NULL; + pKnown = nullptr; } for ( sal_uInt32 i = 0; i < nCount; i++ ) { diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index d40d3b01de23..fb10253e2461 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -236,7 +236,7 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet ) void SvxGridTabPage::Reset( const SfxItemSet* rSet ) { - const SfxPoolItem* pAttr = 0; + const SfxPoolItem* pAttr = nullptr; if( SfxItemState::SET == rSet->GetItemState( SID_ATTR_GRID_OPTIONS , false, &pAttr )) @@ -263,7 +263,7 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet ) void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) { - const SfxPoolItem* pAttr = NULL; + const SfxPoolItem* pAttr = nullptr; if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , false, &pAttr )) { diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 2e73bef35180..65a31f216f5d 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -46,7 +46,7 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent) nRight(0), //UUUU - pBorder(0), + pBorder(nullptr), bResetBackground(false), bFrameDirection(false), nFrameDirection(0), @@ -56,13 +56,13 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent) nHdDist(0), nHdHeight(0), - pHdBorder(0), + pHdBorder(nullptr), nFtLeft(0), nFtRight(0), nFtDist(0), nFtHeight(0), - pFtBorder(0), + pFtBorder(nullptr), maHeaderFillAttributes(), maFooterFillAttributes(), @@ -387,7 +387,7 @@ void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext, if (aSequence.getLength()) { const drawinglayer::geometry::ViewInformation2D aViewInformation2D( - basegfx::B2DHomMatrix(), GetViewTransformation(), aPaintRange, 0, + basegfx::B2DHomMatrix(), GetViewTransformation(), aPaintRange, nullptr, 0.0, css::uno::Sequence<css::beans::PropertyValue >()); std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor; diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 9eeb0e5be632..35b0435209f2 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -48,7 +48,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, { // SfxItemState::DONTCARE => pState == -1 => PTR_CAST buff if ( eState != SfxItemState::DEFAULT ) - pState = 0; + pState = nullptr; switch(nSID) { diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index e1a7b9d8b8e6..6e308197ffa7 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -99,7 +99,7 @@ public: Reference<XModel> GetModel() { if (!xController.is()) - xModel = 0; + xModel = nullptr; else xModel = xController->getModel(); return xModel; @@ -181,7 +181,7 @@ void SvxRubyData_Impl::disposing(const EventObject&) throw (RuntimeException, st catch (const Exception&) { } - xController = 0; + xController = nullptr; } void SvxRubyData_Impl::AssertOneEntry() @@ -326,7 +326,7 @@ bool SvxRubyDialog::Close() void SvxRubyDialog::Activate() { SfxModelessDialog::Activate(); - SfxPoolItem* pState = 0; + SfxPoolItem* pState = nullptr; SfxItemState eState = pBindings->QueryState( SID_STYLE_DESIGNER, pState ); bool bEnable = (eState < SfxItemState::DEFAULT) || !pState || !static_cast<SfxBoolItem*>(pState)->GetValue(); delete pState; @@ -778,7 +778,7 @@ void SvxRubyDialog::EnableControls(bool bEnable) RubyPreview::RubyPreview(vcl::Window *pParent) : Window(pParent, WB_BORDER) - , m_pParentDlg(NULL) + , m_pParentDlg(nullptr) { SetBorderStyle(WindowBorderStyle::MONO); } diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index fefca16e7fa9..54ee17f290d8 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -122,7 +122,7 @@ struct SearchDlg_Impl SearchDlg_Impl() : bSaveToModule(true) , bFocusOnSearch(true) - , pRanges(NULL) + , pRanges(nullptr) { aCommand1URL.Complete = aCommand1URL.Main = "vnd.sun.search:SearchViaComponent1"; aCommand1URL.Protocol = "vnd.sun.search:"; @@ -250,7 +250,7 @@ void SearchAttrItemList::Remove(size_t nPos, size_t nLen) SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ) : SfxModelessDialog(&rBind, pChildWin, pParent, "FindReplaceDialog", "svx/ui/findreplacedialog.ui") - , mpDocWin(NULL) + , mpDocWin(nullptr) , mbSuccess(false) , rBindings(rBind) , bWriter(false) @@ -261,15 +261,15 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi , bReadOnly(false) , bConstruct(true) , nModifyFlag(0) - , pImpl(NULL) - , pSearchList(NULL) + , pImpl(nullptr) + , pSearchList(nullptr) , pReplaceList(new SearchAttrItemList) - , pSearchItem(NULL) - , pSearchController(NULL) - , pOptionsController(NULL) - , pFamilyController(NULL) - , pSearchSetController(NULL) - , pReplaceSetController(NULL) + , pSearchItem(nullptr) + , pSearchController(nullptr) + , pOptionsController(nullptr) + , pFamilyController(nullptr) + , pSearchSetController(nullptr) + , pReplaceSetController(nullptr) , nTransliterationFlags(0x00000000) { get(m_pSearchFrame, "searchframe"); @@ -439,18 +439,18 @@ void SvxSearchDialog::Construct_Impl() InitControls_Impl(); // Get attribute sets only once in construtor() - const SfxPoolItem* ppArgs[] = { pSearchItem, 0 }; + const SfxPoolItem* ppArgs[] = { pSearchItem, nullptr }; const SvxSetItem* pSrchSetItem = static_cast<const SvxSetItem*>( rBindings.GetDispatcher()->Execute( FID_SEARCH_SEARCHSET, SfxCallMode::SLOT, ppArgs ) ); if ( pSrchSetItem ) - InitAttrList_Impl( &pSrchSetItem->GetItemSet(), 0 ); + InitAttrList_Impl( &pSrchSetItem->GetItemSet(), nullptr ); const SvxSetItem* pReplSetItem = static_cast<const SvxSetItem*>( rBindings.GetDispatcher()->Execute( FID_SEARCH_REPLACESET, SfxCallMode::SLOT, ppArgs ) ); if ( pReplSetItem ) - InitAttrList_Impl( 0, &pReplSetItem->GetItemSet() ); + InitAttrList_Impl( nullptr, &pReplSetItem->GetItemSet() ); // Create controller and update at once rBindings.EnterRegistrations(); @@ -570,7 +570,7 @@ bool SvxSearchDialog::Close() aOpt.SetSearchFormatted ( m_pSearchFormattedCB->IsChecked() ); aOpt.Commit(); - const SfxPoolItem* ppArgs[] = { pSearchItem, 0 }; + const SfxPoolItem* ppArgs[] = { pSearchItem, nullptr }; rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SfxCallMode::SLOT, ppArgs ); rBindings.Execute( SID_SEARCH_DLG ); @@ -880,18 +880,18 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) if ( !pSearchList ) { // Get attribute sets, if it not has been done already - const SfxPoolItem* ppArgs[] = { pSearchItem, 0 }; + const SfxPoolItem* ppArgs[] = { pSearchItem, nullptr }; const SvxSetItem* pSrchSetItem = static_cast<const SvxSetItem*>(rBindings.GetDispatcher()->Execute( FID_SEARCH_SEARCHSET, SfxCallMode::SLOT, ppArgs )); if ( pSrchSetItem ) - InitAttrList_Impl( &pSrchSetItem->GetItemSet(), 0 ); + InitAttrList_Impl( &pSrchSetItem->GetItemSet(), nullptr ); const SvxSetItem* pReplSetItem = static_cast<const SvxSetItem*>( rBindings.GetDispatcher()->Execute( FID_SEARCH_REPLACESET, SfxCallMode::SLOT, ppArgs ) ); if ( pReplSetItem ) - InitAttrList_Impl( 0, &pReplSetItem->GetItemSet() ); + InitAttrList_Impl( nullptr, &pReplSetItem->GetItemSet() ); } } } @@ -1322,7 +1322,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) pReplaceList->Clear(); } nModifyFlag = 0; - const SfxPoolItem* ppArgs[] = { pSearchItem, 0 }; + const SfxPoolItem* ppArgs[] = { pSearchItem, nullptr }; rBindings.ExecuteSynchron( FID_SEARCH_NOW, ppArgs ); } else if ( pBtn == m_pCloseBtn ) @@ -2243,7 +2243,7 @@ void SvxSearchDialog::SaveToModule_Impl() pSearchItem->SetCommand( SvxSearchCmd::FIND ); nModifyFlag = 0; - const SfxPoolItem* ppArgs[] = { pSearchItem, 0 }; + const SfxPoolItem* ppArgs[] = { pSearchItem, nullptr }; rBindings.GetDispatcher()->Execute( SID_SEARCH_ITEM, SfxCallMode::SLOT, ppArgs ); } @@ -2305,14 +2305,14 @@ static vcl::Window* lcl_GetSearchLabelWindow() css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement("private:resource/toolbar/findbar"); if (!xUIElement.is()) - return 0; + return nullptr; css::uno::Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), css::uno::UNO_QUERY_THROW); VclPtr< ToolBox > pToolBox = static_cast<ToolBox*>( VCLUnoHelper::GetWindow(xWindow).get() ); for (size_t i = 0; pToolBox && i < pToolBox->GetItemCount(); ++i) if (pToolBox->GetItemCommand(i) == ".uno:SearchLabel") return pToolBox->GetItemWindow(i); - return 0; + return nullptr; } void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL) diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index d7be12c594d3..18884050b214 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -385,7 +385,7 @@ SvxNumValueSet::SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits) : ValueSet(pParent, nWinBits) , ePageType(NumberingPageType::BULLET) , bHTMLMode(false) - , pVDev(NULL) + , pVDev(nullptr) { } @@ -395,7 +395,7 @@ void SvxNumValueSet::init(NumberingPageType eType) { ePageType = eType; bHTMLMode = false; - pVDev = NULL; + pVDev = nullptr; SetColCount( 4 ); SetLineCount( 2 ); diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index d5f1a657be12..9f55e1b978a1 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -137,10 +137,10 @@ struct SvxRuler_Impl { bool bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent? SvxRuler_Impl() : - pPercBuf(0), pBlockBuf(0), nPercSize(0), nTotalDist(0), + pPercBuf(nullptr), pBlockBuf(nullptr), nPercSize(0), nTotalDist(0), lOldWinPos(0), lMaxLeftLogic(0), lMaxRightLogic(0), lLastLMargin(0), lLastRMargin(0), aProtectItem(SID_RULER_PROTECT), - pTextRTLItem(0), nControlerItems(0), nIdx(0), + pTextRTLItem(nullptr), nControlerItems(0), nIdx(0), nColLeftPix(0), nColRightPix(0), bIsTableRows(false), bIsTabsRelativeToIndent(true) @@ -150,7 +150,7 @@ struct SvxRuler_Impl { ~SvxRuler_Impl() { nPercSize = 0; nTotalDist = 0; - delete[] pPercBuf; delete[] pBlockBuf; pPercBuf = 0; + delete[] pPercBuf; delete[] pBlockBuf; pPercBuf = nullptr; delete pTextRTLItem; } void SetPercSize(sal_uInt16 nSize); @@ -632,7 +632,7 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt ) } case RULER_TYPE_BORDER: { - if (mxColumnItem.get() == NULL) + if (mxColumnItem.get() == nullptr) break; SvxColumnItem& aColumnItem = *mxColumnItem.get(); @@ -750,7 +750,7 @@ void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem) if(bActive && bHorz) { delete mxRulerImpl->pTextRTLItem; - mxRulerImpl->pTextRTLItem = 0; + mxRulerImpl->pTextRTLItem = nullptr; if(pItem) mxRulerImpl->pTextRTLItem = new SfxBoolItem(*pItem); SetTextRTL(mxRulerImpl->pTextRTLItem && mxRulerImpl->pTextRTLItem->GetValue()); @@ -2021,7 +2021,7 @@ void SvxRuler::DragObjectBorder() void SvxRuler::ApplyMargins() { /* Applying margins; changed by dragging. */ - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; sal_uInt16 nId = SID_ATTR_LONG_LRSPACE; if(bHorz) diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index 4677662f7539..35beab7b13be 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -71,7 +71,7 @@ sal_uInt16 E3dCubeObj::GetObjIdentifier() const SdrObject *E3dCubeObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { - return NULL; + return nullptr; } E3dCubeObj* E3dCubeObj::Clone() const diff --git a/svx/source/engine3d/e3dsceneupdater.cxx b/svx/source/engine3d/e3dsceneupdater.cxx index b059bf527ae2..e37e7a17b48d 100644 --- a/svx/source/engine3d/e3dsceneupdater.cxx +++ b/svx/source/engine3d/e3dsceneupdater.cxx @@ -26,8 +26,8 @@ E3DModifySceneSnapRectUpdater::E3DModifySceneSnapRectUpdater(const SdrObject* pObject) -: mpScene(0), - mpViewInformation3D(0) +: mpScene(nullptr), + mpViewInformation3D(nullptr) { // Secure old 3D transformation stack before modification if(pObject) @@ -47,7 +47,7 @@ E3DModifySceneSnapRectUpdater::E3DModifySceneSnapRectUpdater(const SdrObject* pO if(aAllContentRange.isEmpty()) { // no content, nothing to do - mpScene = 0; + mpScene = nullptr; } else { diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index cd4ed8da86f6..29136bbcbcf0 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -207,7 +207,7 @@ SdrAttrObj* E3dExtrudeObj::GetBreakObj() return pPathObj; } - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index d22ed7d48b42..10c780b61bfe 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -72,11 +72,11 @@ namespace { */ SfxDispatcher* LocalGetDispatcher (const SfxBindings* pBindings) { - SfxDispatcher* pDispatcher = NULL; + SfxDispatcher* pDispatcher = nullptr; - if (SfxViewFrame::Current() != NULL) + if (SfxViewFrame::Current() != nullptr) pDispatcher = SfxViewFrame::Current()->GetDispatcher(); - else if (pBindings != NULL) + else if (pBindings != nullptr) pDispatcher = pBindings->GetDispatcher(); return pDispatcher; @@ -90,16 +90,16 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p , aImgLightOff(SVX_RES(RID_SVXIMAGE_LIGHT_OFF)) , bUpdate(false) , eViewType(VIEWTYPE_GEO) - , pModel(NULL) - , pVDev(NULL) - , p3DView(NULL) + , pModel(nullptr) + , pVDev(nullptr) + , p3DView(nullptr) , pBindings(pInBindings) - , pControllerItem(0) - , pConvertTo3DItem(0) - , pConvertTo3DLatheItem(0) + , pControllerItem(nullptr) + , pConvertTo3DItem(nullptr) + , pConvertTo3DLatheItem(nullptr) , mpImpl(new Svx3DWinImpl()) , ePoolUnit(SFX_MAPUNIT_MM) - , mpRemember2DAttributes(NULL) + , mpRemember2DAttributes(nullptr) , bOnly3DChanged(false) { get(m_pBtnGeo, "geometry"); @@ -203,7 +203,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p get(m_pBtnLatheObject, "tolathe"); get(m_pBtnPerspective, "perspective"); - mpImpl->pPool = NULL; + mpImpl->pPool = nullptr; // Set Metric eFUnit = pInBindings->GetDispatcher()->GetModule()->GetFieldUnit(); @@ -306,7 +306,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p // Initiation of the initialization of the ColorLBs SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); - if (pDispatcher != NULL) + if (pDispatcher != nullptr) { SfxBoolItem aItem( SID_3D_INIT, true ); pDispatcher->Execute( @@ -368,7 +368,7 @@ void Svx3DWin::Reset() m_pMtrMatSpecularIntensity->SetValue( 50 ); m_pBtnLight1->Check(); - ClickUpdateHdl( NULL ); + ClickUpdateHdl( nullptr ); // Select nothing, to avoid errors when selecting the first m_pCtlLightPreview->GetSvx3DLightControl().SelectLight(0); @@ -2148,7 +2148,7 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickUpdateHdl, Button*, void) if( bUpdate ) { SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); - if (pDispatcher != NULL) + if (pDispatcher != nullptr) { SfxBoolItem aItem( SID_3D_STATE, true ); pDispatcher->Execute( @@ -2165,7 +2165,7 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickUpdateHdl, Button*, void) IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickAssignHdl, Button*, void) { SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); - if (pDispatcher != NULL) + if (pDispatcher != nullptr) { SfxBoolItem aItem( SID_3D_ASSIGN, true ); pDispatcher->Execute( @@ -2419,7 +2419,7 @@ IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void ) bUpdatePreview = true; } // Other (no groups) - else if( pBtn != NULL ) + else if( pBtn != nullptr ) { pBtn->Check( !pBtn->IsChecked() ); bUpdatePreview = true; @@ -2428,7 +2428,7 @@ IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void ) if( nSId > 0 ) { SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); - if (pDispatcher != NULL) + if (pDispatcher != nullptr) { SfxBoolItem aItem( nSId, true ); pDispatcher->Execute( @@ -2626,7 +2626,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn) IMPL_LINK_NOARG_TYPED(Svx3DWin, ChangeSelectionCallbackHdl, SvxLightCtl3D*, void) { const sal_uInt32 nLight(m_pCtlLightPreview->GetSvx3DLightControl().GetSelectedLight()); - PushButton* pBtn = 0; + PushButton* pBtn = nullptr; switch( nLight ) { @@ -2722,14 +2722,14 @@ bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) void Svx3DWin::UpdatePreview() { - if( pModel == NULL ) + if( pModel == nullptr ) pModel = new FmFormModel(); if(bOnly3DChanged) { // Execute slot SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); - if (pDispatcher != NULL) + if (pDispatcher != nullptr) { SfxBoolItem aItem( SID_3D_STATE, true ); pDispatcher->Execute( @@ -2753,7 +2753,7 @@ void Svx3DWin::UpdatePreview() void Svx3DWin::DocumentReload() { delete mpRemember2DAttributes; - mpRemember2DAttributes = 0L; + mpRemember2DAttributes = nullptr; } @@ -2794,7 +2794,7 @@ sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn ) { sal_uInt16 nLight = 8; - if( pBtn == NULL ) + if( pBtn == nullptr ) { if( m_pBtnLight1->IsChecked() ) nLight = 0; @@ -2838,9 +2838,9 @@ sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn ) ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn ) { - ColorLB* pLb = NULL; + ColorLB* pLb = nullptr; - if( pBtn == NULL ) + if( pBtn == nullptr ) { if( m_pBtnLight1->IsChecked() ) pLb = m_pLbLight1; @@ -2922,7 +2922,7 @@ void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, { bState = bNewState; SfxDispatcher* pDispatcher = LocalGetDispatcher(&GetBindings()); - if (pDispatcher != NULL) + if (pDispatcher != nullptr) { SfxBoolItem aItem( SID_3D_STATE, true ); pDispatcher->Execute( diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index 51a0d76bf68e..935a0906d6ca 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -105,7 +105,7 @@ E3dScene* fillViewInformation3DForCompoundObject(drawinglayer::geometry::ViewInf // root scene's own object transformation is part of the scene's ViewTransformation, o do not // add it. For more details, see ViewContactOfE3dScene::createViewInformation3D. E3dScene* pParentScene = dynamic_cast< E3dScene* >(rCandidate.GetParentObj()); - E3dScene* pRootScene = 0; + E3dScene* pRootScene = nullptr; basegfx::B3DHomMatrix aInBetweenSceneMatrix; while(pParentScene) diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 884b5f5f8d2d..1159bdd7dae9 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -117,7 +117,7 @@ E3dLatheObj* E3dLatheObj::Clone() const SdrObject *E3dLatheObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { - return NULL; + return nullptr; } // Set Local parameters set to re-create geometry diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 5181ac2c2a41..203455dcb7e3 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -228,7 +228,7 @@ bool E3dObject::IsBreakObjPossible() SdrAttrObj* E3dObject::GetBreakObj() { - return 0L; + return nullptr; } // SetRectsDirty must be done through the local SdrSubList @@ -503,7 +503,7 @@ void E3dObject::Remove3DObj(E3dObject* p3DObj) E3dObject* E3dObject::GetParentObj() const { - E3dObject* pRetval = NULL; + E3dObject* pRetval = nullptr; if(GetObjList() && GetObjList()->GetOwnerObj() @@ -518,7 +518,7 @@ E3dScene* E3dObject::GetScene() const { if(GetParentObj()) return GetParentObj()->GetScene(); - return NULL; + return nullptr; } // Calculate enclosed volume, including all child objects @@ -659,7 +659,7 @@ void E3dObject::SetTransform(const basegfx::B3DHomMatrix& rMatrix) NbcSetTransform(rMatrix); SetChanged(); BroadcastObjectChange(); - if (pUserCall != NULL) pUserCall->Changed(*this, SDRUSERCALL_RESIZE, Rectangle()); + if (pUserCall != nullptr) pUserCall->Changed(*this, SDRUSERCALL_RESIZE, Rectangle()); } } diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index 7329aa1df875..e2ab870a8add 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -220,7 +220,7 @@ void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyText SdrObject *E3dPolygonObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { - return NULL; + return nullptr; } E3dPolygonObj* E3dPolygonObj::Clone() const diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 38bba54bf8ef..880d5cd6acc2 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -187,7 +187,7 @@ TYPEINIT1(E3dScene, E3dObject); E3dScene::E3dScene() : E3dObject(), aCamera(basegfx::B3DPoint(0.0, 0.0, 4.0), basegfx::B3DPoint()), - mp3DDepthRemapper(0L), + mp3DDepthRemapper(nullptr), bDrawOnlySelected(false) { // Set defaults @@ -198,7 +198,7 @@ E3dScene::E3dScene() E3dScene::E3dScene(E3dDefaultAttributes& rDefault) : E3dObject(), aCamera(basegfx::B3DPoint(0.0, 0.0, 4.0), basegfx::B3DPoint()), - mp3DDepthRemapper(0L), + mp3DDepthRemapper(nullptr), bDrawOnlySelected(false) { // Set defaults @@ -256,7 +256,7 @@ void E3dScene::ImpCleanup3DDepthMapper() if(mp3DDepthRemapper) { delete mp3DDepthRemapper; - mp3DDepthRemapper = 0L; + mp3DDepthRemapper = nullptr; } } diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 1f9d5623e4b5..a83054a6beff 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -97,7 +97,7 @@ sal_uInt16 E3dSphereObj::GetObjIdentifier() const SdrObject *E3dSphereObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { - return NULL; + return nullptr; } E3dSphereObj* E3dSphereObj::Clone() const diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index eb5d1a60dea5..1d934264f95c 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -107,7 +107,7 @@ Impl3DMirrorConstructOverlay::Impl3DMirrorConstructOverlay(const E3dView& rView) : maObjects(), mrView(rView), mnCount(rView.GetMarkedObjectCount()), - mpPolygons(0), + mpPolygons(nullptr), maFullOverlay() { if(mnCount) @@ -241,7 +241,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const { // Does 3D objects exist which scenes are not selected? bool bSpecialHandling = false; - E3dScene *pScene = NULL; + E3dScene *pScene = nullptr; const size_t nCnt = GetMarkedObjectCount(); for(size_t nObjs = 0; nObjs < nCnt; ++nObjs) @@ -329,7 +329,7 @@ SdrModel* E3dView::GetMarkedObjModel() const // Does 3D objects exist which scenes are not selected? bool bSpecialHandling(false); const size_t nCount(GetMarkedObjectCount()); - E3dScene *pScene = 0; + E3dScene *pScene = nullptr; for(size_t nObjs = 0; nObjs < nCount; ++nObjs) { @@ -365,7 +365,7 @@ SdrModel* E3dView::GetMarkedObjModel() const return SdrView::GetMarkedObjModel(); } - SdrModel* pNewModel = 0; + SdrModel* pNewModel = nullptr; Rectangle aSelectedSnapRect; // set 3d selection flags at all directly selected objects @@ -745,7 +745,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo } // Create a new extrude object - E3dObject* p3DObj = NULL; + E3dObject* p3DObj = nullptr; if(bExtrude) { p3DObj = new E3dExtrudeObj(aDefault, pPath->GetPathPoly(), fDepth); @@ -1019,8 +1019,8 @@ struct E3dDepthNeighbour basegfx::B2DPolyPolygon maPreparedPolyPolygon; E3dDepthNeighbour() - : mpNext(0), - mpObj(0), + : mpNext(nullptr), + mpObj(nullptr), maPreparedPolyPolygon() { } @@ -1032,8 +1032,8 @@ struct E3dDepthLayer E3dDepthNeighbour* mpNext; E3dDepthLayer() - : mpDown(0), - mpNext(0) + : mpDown(nullptr), + mpNext(nullptr) { } @@ -1054,8 +1054,8 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) { SdrObjList* pSubList = pScene->GetSubList(); SdrObjListIter aIter(*pSubList, IM_FLAT); - E3dDepthLayer* pBaseLayer = NULL; - E3dDepthLayer* pLayer = NULL; + E3dDepthLayer* pBaseLayer = nullptr; + E3dDepthLayer* pLayer = nullptr; sal_Int32 nNumLayers = 0; while(aIter.IsMore()) @@ -1201,7 +1201,7 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, else { bool bOwnActionNecessary; - if (pHdl == NULL) + if (pHdl == nullptr) { bOwnActionNecessary = true; } @@ -1233,7 +1233,7 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, } if( bThereAre3DObjects ) { - meDragHdl = ( pHdl == NULL ? HDL_MOVE : pHdl->GetKind() ); + meDragHdl = ( pHdl == nullptr ? HDL_MOVE : pHdl->GetKind() ); switch ( meDragMode ) { case SDRDRAG_ROTATE: @@ -1302,8 +1302,8 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, E3dScene* E3dView::SetCurrent3DObj(E3dObject* p3DObj) { - DBG_ASSERT(p3DObj != NULL, "Who puts in a NULL-pointer here"); - E3dScene* pScene = NULL; + DBG_ASSERT(p3DObj != nullptr, "Who puts in a NULL-pointer here"); + E3dScene* pScene = nullptr; // get transformed BoundVolume of the object basegfx::B3DRange aVolume(p3DObj->GetBoundVolume()); @@ -1353,7 +1353,7 @@ void E3dView::Start3DCreation() OutputDevice* pOut = GetFirstOutputDevice(); // first determine representation boundaries - if (pOut != NULL) + if (pOut != nullptr) { nMinLen = pOut->PixelToLogic(Size(0,50)).Height(); nObjDst = pOut->PixelToLogic(Size(0,20)).Height(); @@ -1519,7 +1519,7 @@ void E3dView::ResetCreationActive () if(mpMirrorOverlay) { delete mpMirrorOverlay; - mpMirrorOverlay = 0L; + mpMirrorOverlay = nullptr; } } @@ -1540,7 +1540,7 @@ void E3dView::InitView () aDefaultLightColor = RGB_Color(COL_WHITE); aDefaultAmbientColor = RGB_Color(COL_BLACK); bDoubleSided = false; - mpMirrorOverlay = 0L; + mpMirrorOverlay = nullptr; } bool E3dView::IsBreak3DObjPossible() const diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index adac47020fe4..0a8c6fc5d18c 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -44,7 +44,7 @@ void E3dView::ConvertMarkedToPolyObj(bool bLineToArea) { - SdrObject* pNewObj = NULL; + SdrObject* pNewObj = nullptr; if (GetMarkedObjectCount() == 1) { diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index b4e22f72eb06..265f89498fdb 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -377,7 +377,7 @@ namespace svx ,const OUString& _rCommand ) { - construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,NULL,(CommandType::COMMAND == _nCommandType),_rCommand); + construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,nullptr,(CommandType::COMMAND == _nCommandType),_rCommand); } ODataAccessObjectTransferable::ODataAccessObjectTransferable( diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 707cf7a5f8f3..2de79055f8af 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -141,7 +141,7 @@ FmGridHeader::~FmGridHeader() void FmGridHeader::dispose() { delete m_pImpl; - m_pImpl = NULL; + m_pImpl = nullptr; svt::EditBrowserHeader::dispose(); } @@ -363,7 +363,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) m_pImpl->xDroppedStatement = xStatement; m_pImpl->xDroppedResultSet = xResultSet; - PostUserEvent(LINK(this, FmGridHeader, OnAsyncExecuteDrop), NULL, true); + PostUserEvent(LINK(this, FmGridHeader, OnAsyncExecuteDrop), nullptr, true); } catch (Exception&) { @@ -761,7 +761,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe // ask the bindings of the current view frame (which should be the one we're residing in) for the state if (pCurrentFrame) { - SfxPoolItem* pItem = NULL; + SfxPoolItem* pItem = nullptr; eState = pCurrentFrame->GetBindings().QueryState(SID_FM_CTL_PROPERTIES, pItem); if (eState >= SfxItemState::DEFAULT && pItem ) @@ -863,7 +863,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - std::unique_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(NULL)); + std::unique_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(nullptr)); DBG_ASSERT(pDlg, "Dialog creation failed!"); pDlg->SetColumns(xCols); pDlg->Execute(); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 3e5bf2895630..61366574fba6 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -478,7 +478,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >& // mbCreatingPeer is virtually the same as m_nPeerCreationLevel, but it's the base class' method // to prevent recursion. - vcl::Window* pParentWin = NULL; + vcl::Window* pParentWin = nullptr; if (rParentPeer.is()) { VCLXWindow* pParent = VCLXWindow::GetImplementation(rParentPeer); @@ -487,7 +487,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >& } FmXGridPeer* pPeer = imp_CreatePeer(pParentWin); - DBG_ASSERT(pPeer != NULL, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !"); + DBG_ASSERT(pPeer != nullptr, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !"); setPeer( pPeer ); // reading the properties from the model @@ -1046,9 +1046,9 @@ FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext) ,m_aMode( getDataModeIdentifier() ) ,m_nCursorListening(0) ,m_bInterceptingDispatch(false) - ,m_pStateCache(NULL) - ,m_pDispatchers(NULL) - ,m_pGridListener(NULL) + ,m_pStateCache(nullptr) + ,m_pDispatchers(nullptr) + ,m_pGridListener(nullptr) ,m_xContext(_rxContext) { // Create must be called after this constructure @@ -1065,7 +1065,7 @@ VclPtr<FmGridControl> FmXGridPeer::imp_CreateControl(vcl::Window* pParent, WinBi void FmXGridPeer::Create(vcl::Window* pParent, WinBits nStyle) { FmGridControl* pWin = imp_CreateControl(pParent, nStyle); - DBG_ASSERT(pWin != NULL, "FmXGridPeer::Create : imp_CreateControl didn't return a control !"); + DBG_ASSERT(pWin != nullptr, "FmXGridPeer::Create : imp_CreateControl didn't return a control !"); pWin->SetStateProvider(LINK(this, FmXGridPeer, OnQueryGridSlotState)); pWin->SetSlotExecutor(LINK(this, FmXGridPeer, OnExecuteGridSlot)); @@ -1102,7 +1102,7 @@ const Sequence< sal_Int8 >& FmXGridPeer::getUnoTunnelImplementationId() throw() FmXGridPeer* FmXGridPeer::getImplementation( const Reference< XInterface >& _rxIFace ) throw() { - FmXGridPeer* pReturn = NULL; + FmXGridPeer* pReturn = nullptr; Reference< XUnoTunnel > xTunnel(_rxIFace, UNO_QUERY); if (xTunnel.is()) pReturn = reinterpret_cast<FmXGridPeer*>(xTunnel->getSomething(getUnoTunnelImplementationId())); @@ -1145,7 +1145,7 @@ using namespace ::com::sun::star::util; if (xCursor.is()) { setRowSet( m_xCursor ); - m_xCursor = NULL; + m_xCursor = nullptr; bKnownSender = true; } @@ -1159,7 +1159,7 @@ using namespace ::com::sun::star::util; if ( m_pDispatchers[i] == e.Source ) { m_pDispatchers[i]->removeStatusListener( static_cast< css::frame::XStatusListener* >( this ), *pSupportedURLs ); - m_pDispatchers[i] = NULL; + m_pDispatchers[i] = nullptr; m_pStateCache[i] = false; bKnownSender = true; } @@ -1555,21 +1555,21 @@ void FmXGridPeer::loaded(const EventObject& /*rEvent*/) throw( RuntimeException, void FmXGridPeer::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) { - updateGrid( Reference< XRowSet > (NULL) ); + updateGrid( Reference< XRowSet > (nullptr) ); } void FmXGridPeer::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { // empty the grid - updateGrid( Reference< XRowSet > (NULL) ); + updateGrid( Reference< XRowSet > (nullptr) ); } void FmXGridPeer::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { // empty the grid - updateGrid( Reference< XRowSet > (NULL) ); + updateGrid( Reference< XRowSet > (nullptr) ); } @@ -2092,12 +2092,12 @@ void FmXGridPeer::dispose() throw( RuntimeException, std::exception ) while ( xInterceptor.is() ) { // tell the interceptor it has a new (means no) predecessor - xInterceptor->setMasterDispatchProvider( NULL ); + xInterceptor->setMasterDispatchProvider( nullptr ); // ask for it's successor Reference< XDispatchProvider > xSlave = xInterceptor->getSlaveDispatchProvider(); // and give it the new (means no) successoert - xInterceptor->setSlaveDispatchProvider( NULL ); + xInterceptor->setSlaveDispatchProvider( nullptr ); // start over with the next chain element xInterceptor.set(xSlave, css::uno::UNO_QUERY); @@ -2735,15 +2735,15 @@ void FmXGridPeer::UpdateDispatches() { delete[] m_pStateCache; delete[] m_pDispatchers; - m_pStateCache = NULL; - m_pDispatchers = NULL; + m_pStateCache = nullptr; + m_pDispatchers = nullptr; } } void FmXGridPeer::ConnectToDispatcher() { - DBG_ASSERT((m_pStateCache != NULL) == (m_pDispatchers != NULL), "FmXGridPeer::ConnectToDispatcher : inconsistent !"); + DBG_ASSERT((m_pStateCache != nullptr) == (m_pDispatchers != nullptr), "FmXGridPeer::ConnectToDispatcher : inconsistent !"); if (m_pStateCache) { // already connected -> just do an update UpdateDispatches(); @@ -2773,8 +2773,8 @@ void FmXGridPeer::ConnectToDispatcher() { delete[] m_pStateCache; delete[] m_pDispatchers; - m_pStateCache = NULL; - m_pDispatchers = NULL; + m_pStateCache = nullptr; + m_pDispatchers = nullptr; } } @@ -2795,8 +2795,8 @@ void FmXGridPeer::DisConnectFromDispatcher() delete[] m_pStateCache; delete[] m_pDispatchers; - m_pStateCache = NULL; - m_pDispatchers = NULL; + m_pStateCache = nullptr; + m_pDispatchers = nullptr; } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 1c05b027a468..20b8aca7eb10 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -179,7 +179,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< css::bea } } - DbCellControl* pCellControl = NULL; + DbCellControl* pCellControl = nullptr; if (m_rParent.IsFilterMode()) { pCellControl = new DbFilterField(m_rParent.getContext(),*this); @@ -318,11 +318,11 @@ void DbGridColumn::Clear() m_pCell->dispose(); m_pCell->release(); - m_pCell = NULL; + m_pCell = nullptr; } - m_xController = NULL; - m_xField = NULL; + m_xController = nullptr; + m_xField = nullptr; m_nFormatKey = 0; m_nFieldPos = -1; @@ -545,14 +545,14 @@ TYPEINIT1( DbFilterField, DbCellControl ) DbCellControl::DbCellControl( DbGridColumn& _rColumn, bool /*_bText*/ ) :OPropertyChangeListener(m_aMutex) - ,m_pModelChangeBroadcaster(NULL) - ,m_pFieldChangeBroadcaster(NULL) + ,m_pModelChangeBroadcaster(nullptr) + ,m_pFieldChangeBroadcaster(nullptr) ,m_bTransparent( false ) ,m_bAlignedController( true ) ,m_bAccessingValueProperty( false ) ,m_rColumn( _rColumn ) - ,m_pPainter( NULL ) - ,m_pWindow( NULL ) + ,m_pPainter( nullptr ) + ,m_pWindow( nullptr ) { Reference< XPropertySet > xColModelProps( _rColumn.getModel(), UNO_QUERY ); if ( xColModelProps.is() ) @@ -634,7 +634,7 @@ static void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBr { _pBroadcaster->dispose(); _pBroadcaster->release(); - _pBroadcaster = NULL; + _pBroadcaster = nullptr; // no delete, this is done implicitly } } @@ -1075,8 +1075,8 @@ void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) DbTextField::DbTextField(DbGridColumn& _rColumn) :DbLimitedLengthField(_rColumn) - ,m_pEdit( NULL ) - ,m_pPainterImplementation( NULL ) + ,m_pEdit( nullptr ) + ,m_pPainterImplementation( nullptr ) ,m_bIsSimpleEdit( true ) { } @@ -1335,7 +1335,7 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x } } - SvNumberFormatter* pFormatterUsed = NULL; + SvNumberFormatter* pFormatterUsed = nullptr; if (m_xSupplier.is()) { SvNumberFormatsSupplierObj* pImplmentation = SvNumberFormatsSupplierObj::getImplementation(m_xSupplier); @@ -1348,10 +1348,10 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x } // einen Standard-Formatter ... - if (pFormatterUsed == NULL) + if (pFormatterUsed == nullptr) { pFormatterUsed = static_cast<FormattedField*>(m_pWindow.get())->StandardFormatter(); - DBG_ASSERT(pFormatterUsed != NULL, "DbFormattedField::Init : no standard formatter given by the numeric field !"); + DBG_ASSERT(pFormatterUsed != nullptr, "DbFormattedField::Init : no standard formatter given by the numeric field !"); } // ... und einen Standard-Key if (nFormatKey == -1) @@ -1488,8 +1488,8 @@ void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) th OUString DbFormattedField::GetFormatText(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** ppColor) { // defaultmaessig keine Farb-Angabe - if (ppColor != NULL) - *ppColor = NULL; + if (ppColor != nullptr) + *ppColor = nullptr; // NULL-Wert -> leerer Text if (!_rxField.is()) @@ -1526,7 +1526,7 @@ OUString DbFormattedField::GetFormatText(const Reference< css::sdb::XColumn >& _ } aText = m_pPainter->GetText(); - if (ppColor != NULL) + if (ppColor != nullptr) *ppColor = static_cast<FormattedField*>(m_pPainter.get())->GetLastOutputColor(); return aText; @@ -1922,16 +1922,16 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe xForm.set( Reference< XInterface >(*m_rColumn.GetParent().getDataSource()), UNO_QUERY ); if ( xForm.is() ) xSupplier = getNumberFormats( getConnection( xForm ), true ); - SvNumberFormatter* pFormatterUsed = NULL; + SvNumberFormatter* pFormatterUsed = nullptr; if ( xSupplier.is() ) { SvNumberFormatsSupplierObj* pImplmentation = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); - pFormatterUsed = pImplmentation ? pImplmentation->GetNumberFormatter() : NULL; + pFormatterUsed = pImplmentation ? pImplmentation->GetNumberFormatter() : nullptr; } - if ( NULL == pFormatterUsed ) + if ( nullptr == pFormatterUsed ) { // der Cursor fuehrte nicht zum Erfolg -> Standard pFormatterUsed = static_cast< DoubleNumericField* >( m_pWindow.get() )->StandardFormatter(); - DBG_ASSERT( pFormatterUsed != NULL, "DbNumericField::implAdjustGenericFieldSetting: no standard formatter given by the numeric field !" ); + DBG_ASSERT( pFormatterUsed != nullptr, "DbNumericField::implAdjustGenericFieldSetting: no standard formatter given by the numeric field !" ); } static_cast< DoubleNumericField* >( m_pWindow.get() )->SetFormatter( pFormatterUsed ); static_cast< DoubleNumericField* >( m_pPainter.get() )->SetFormatter( pFormatterUsed ); @@ -3169,7 +3169,7 @@ vcl::Window* FmXGridCell::getEventWindow() const { if ( m_pCellControl ) return &m_pCellControl->GetWindow(); - return NULL; + return nullptr; } @@ -3228,7 +3228,7 @@ void FmXGridCell::disposing() m_aMouseMotionListeners.disposeAndClear( aEvent ); OComponentHelper::disposing(); - m_pColumn = NULL; + m_pColumn = nullptr; DELETEZ(m_pCellControl); } @@ -3240,7 +3240,7 @@ Any SAL_CALL FmXGridCell::queryAggregation( const css::uno::Type& _rType ) throw if ( !aReturn.hasValue() ) aReturn = FmXGridCell_Base::queryInterface( _rType ); - if ( !aReturn.hasValue() && ( m_pCellControl != NULL ) ) + if ( !aReturn.hasValue() && ( m_pCellControl != nullptr ) ) aReturn = FmXGridCell_WindowBase::queryInterface( _rType ); return aReturn; @@ -3569,9 +3569,9 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev, nStyle |= DrawTextFlags::Left; } - Color* pColor = NULL; + Color* pColor = nullptr; OUString aText = GetText(_rxField, xFormatter, &pColor); - if (pColor != NULL) + if (pColor != nullptr) { Color aOldTextColor( rDev.GetTextColor() ); rDev.SetTextColor( *pColor ); @@ -3586,7 +3586,7 @@ FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl ) :FmXTextCell( pColumn, _rControl ) ,m_aTextListeners(m_aMutex) ,m_aChangeListeners( m_aMutex ) - ,m_pEditImplementation( NULL ) + ,m_pEditImplementation( nullptr ) ,m_bOwnEditImplementation( false ) { @@ -3628,7 +3628,7 @@ void FmXEditCell::disposing() m_pEditImplementation->SetModifyHdl( Link<Edit&,void>() ); if ( m_bOwnEditImplementation ) delete m_pEditImplementation; - m_pEditImplementation = NULL; + m_pEditImplementation = nullptr; FmXDataCell::disposing(); } @@ -3872,7 +3872,7 @@ void FmXCheckBoxCell::disposing() m_aActionListeners.disposeAndClear(aEvt); static_cast< CheckBoxControl& >( m_pCellControl->GetWindow() ).SetClickHdl(Link<VclPtr<CheckBox>,void>()); - m_pBox = NULL; + m_pBox = nullptr; FmXDataCell::disposing(); } @@ -4049,7 +4049,7 @@ void FmXListBoxCell::disposing() m_pBox->SetSelectHdl( Link<ListBox&,void>() ); m_pBox->SetDoubleClickHdl( Link<ListBox&,void>() ); - m_pBox = NULL; + m_pBox = nullptr; FmXTextCell::disposing(); } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 107baac9f1c0..aaba9fdfc616 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -149,7 +149,7 @@ public: GridFieldValueListener::GridFieldValueListener(DbGridControl& _rParent, const Reference< XPropertySet >& _rField, sal_uInt16 _nId) :OPropertyChangeListener(m_aMutex) ,m_rParent(_rParent) - ,m_pRealListener(NULL) + ,m_pRealListener(nullptr) ,m_nId(_nId) ,m_nSuspended(0) ,m_bDisposed(false) @@ -178,7 +178,7 @@ void GridFieldValueListener::dispose() { if (m_bDisposed) { - DBG_ASSERT(m_pRealListener == NULL, "GridFieldValueListener::dispose : inconsistent !"); + DBG_ASSERT(m_pRealListener == nullptr, "GridFieldValueListener::dispose : inconsistent !"); return; } @@ -186,7 +186,7 @@ void GridFieldValueListener::dispose() { m_pRealListener->dispose(); m_pRealListener->release(); - m_pRealListener = NULL; + m_pRealListener = nullptr; } m_bDisposed = true; @@ -209,7 +209,7 @@ public: DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject, sal_Int16 _rId) :FmXDisposeListener(m_aMutex) ,m_rParent(_rParent) - ,m_pRealListener(NULL) + ,m_pRealListener(nullptr) { if (_rxObject.is()) @@ -225,7 +225,7 @@ DisposeListenerGridBridge::~DisposeListenerGridBridge() { m_pRealListener->dispose(); m_pRealListener->release(); - m_pRealListener = NULL; + m_pRealListener = nullptr; } } @@ -623,7 +623,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) { bool bAvailable = GetState(nWhich); DbGridControl* pParent = static_cast<DbGridControl*>(GetParent()); - vcl::Window* pWnd = NULL; + vcl::Window* pWnd = nullptr; switch (nWhich) { case NavigationBar::RECORD_FIRST: @@ -891,20 +891,20 @@ DbGridControl::DbGridControl( :DbGridControl_Base(pParent, EditBrowseBoxFlags::NONE, nBits, DEFAULT_BROWSE_MODE ) ,m_xContext(_rxContext) ,m_aBar(VclPtr<DbGridControl::NavigationBar>::Create(this)) - ,m_nAsynAdjustEvent(0) - ,m_pDataSourcePropMultiplexer(NULL) - ,m_pDataSourcePropListener(NULL) - ,m_pFieldListeners(NULL) - ,m_pCursorDisposeListener(NULL) - ,m_pGridListener(NULL) - ,m_pDataCursor(NULL) - ,m_pSeekCursor(NULL) + ,m_nAsynAdjustEvent(nullptr) + ,m_pDataSourcePropMultiplexer(nullptr) + ,m_pDataSourcePropListener(nullptr) + ,m_pFieldListeners(nullptr) + ,m_pCursorDisposeListener(nullptr) + ,m_pGridListener(nullptr) + ,m_pDataCursor(nullptr) + ,m_pSeekCursor(nullptr) ,m_nSeekPos(-1) ,m_nTotalCount(-1) ,m_aNullDate(::dbtools::DBTypeConversion::getStandardDate()) ,m_nMode(DEFAULT_BROWSE_MODE) ,m_nCurrentPos(-1) - ,m_nDeleteEvent(0) + ,m_nDeleteEvent(nullptr) ,m_nOptions(OPT_READONLY) ,m_nOptionMask(OPT_INSERT | OPT_UPDATE | OPT_DELETE) ,m_nLastColId((sal_uInt16)-1) @@ -969,7 +969,7 @@ void DbGridControl::dispose() if (m_pCursorDisposeListener) { delete m_pCursorDisposeListener; - m_pCursorDisposeListener = NULL; + m_pCursorDisposeListener = nullptr; } } @@ -981,15 +981,15 @@ void DbGridControl::dispose() m_pDataSourcePropMultiplexer->dispose(); m_pDataSourcePropMultiplexer->release(); // this should delete the multiplexer delete m_pDataSourcePropListener; - m_pDataSourcePropMultiplexer = NULL; - m_pDataSourcePropListener = NULL; + m_pDataSourcePropMultiplexer = nullptr; + m_pDataSourcePropListener = nullptr; } m_xRowSetListener.clear(); delete m_pDataCursor; - m_pDataCursor = NULL; + m_pDataCursor = nullptr; delete m_pSeekCursor; - m_pSeekCursor = NULL; + m_pSeekCursor = nullptr; m_aBar.disposeAndClear(); @@ -1109,7 +1109,7 @@ void DbGridControl::RemoveRows(bool bNewCursor) if (!bNewCursor) { DELETEZ(m_pSeekCursor); - m_xPaintRow = m_xDataRow = m_xEmptyRow = m_xCurrentRow = m_xSeekRow = NULL; + m_xPaintRow = m_xDataRow = m_xEmptyRow = m_xCurrentRow = m_xSeekRow = nullptr; m_nCurrentPos = m_nSeekPos = -1; m_nOptions = OPT_READONLY; @@ -1136,7 +1136,7 @@ void DbGridControl::RemoveRows() DELETEZ(m_pSeekCursor); DELETEZ(m_pDataCursor); - m_xPaintRow = m_xDataRow = m_xEmptyRow = m_xCurrentRow = m_xSeekRow = NULL; + m_xPaintRow = m_xDataRow = m_xEmptyRow = m_xCurrentRow = m_xSeekRow = nullptr; m_nCurrentPos = m_nSeekPos = m_nTotalCount = -1; m_nOptions = OPT_READONLY; @@ -1301,7 +1301,7 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt) } else { // the insert option is to be reset - m_xEmptyRow = NULL; + m_xEmptyRow = nullptr; if ((GetCurRow() == GetRowCount() - 1) && (GetCurRow() > 0)) GoToRowColumnId(GetCurRow() - 1, GetCurColumnId()); RowRemoved(GetRowCount()); @@ -1377,8 +1377,8 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt m_pDataSourcePropMultiplexer->dispose(); m_pDataSourcePropMultiplexer->release(); // this should delete the multiplexer delete m_pDataSourcePropListener; - m_pDataSourcePropMultiplexer = NULL; - m_pDataSourcePropListener = NULL; + m_pDataSourcePropMultiplexer = nullptr; + m_pDataSourcePropListener = nullptr; } m_xRowSetListener.clear(); @@ -1406,12 +1406,12 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt { // the adjust was thought to work with the old cursor which we don't have anymore RemoveUserEvent(m_nAsynAdjustEvent); - m_nAsynAdjustEvent = 0; + m_nAsynAdjustEvent = nullptr; } } // get a new formatter and data cursor - m_xFormatter = NULL; + m_xFormatter = nullptr; Reference< css::util::XNumberFormatsSupplier > xSupplier = getNumberFormats(getConnection(_xCursor), true); if (xSupplier.is()) { @@ -1999,7 +1999,7 @@ void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uI return; size_t Location = GetModelColumnPos(nColumnId); - DbGridColumn* pColumn = (Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; + DbGridColumn* pColumn = (Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; if (pColumn) { Rectangle aArea(rRect); @@ -2173,7 +2173,7 @@ void DbGridControl::AdjustDataSource(bool bFull) // If the current row is recalculated at the moment, do not adjust if (bFull) - m_xCurrentRow = NULL; + m_xCurrentRow = nullptr; // if we are on the same row only repaint // but this is only possible for rows which are not inserted, in that case the comparison result // may not be correct @@ -2624,7 +2624,7 @@ void DbGridControl::SetFilterMode(bool bMode) OUString DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const { size_t Location = GetModelColumnPos( _nColId ); - DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; OUString sRet; if ( const_cast<DbGridControl*>(this)->SeekRow(_nRow) ) sRet = GetCurrentRowCellText(pColumn, m_xPaintRow); @@ -2645,7 +2645,7 @@ sal_uInt32 DbGridControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId) if (SeekRow(nRow)) { size_t Location = GetModelColumnPos( nColId ); - DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; return GetDataWindow().GetTextWidth(GetCurrentRowCellText(pColumn,m_xPaintRow)); } else @@ -2679,7 +2679,7 @@ void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const PopupMe // delete asynchronously if (m_nDeleteEvent) Application::RemoveUserEvent(m_nDeleteEvent); - m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete), NULL, true); + m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete), nullptr, true); break; case SID_FM_RECORD_UNDO: Undo(); @@ -2757,7 +2757,7 @@ void DbGridControl::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel ) GetDataWindow().ReleaseMouse(); size_t Location = GetModelColumnPos( nColId ); - DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; OStringTransferable* pTransferable = new OStringTransferable(GetCurrentRowCellText(pColumn,m_xPaintRow)); Reference< XTransferable > xEnsureDelete(pTransferable); pTransferable->StartDrag(this, DND_ACTION_COPY); @@ -2850,7 +2850,7 @@ void DbGridControl::Command(const CommandEvent& rEvt) IMPL_LINK_NOARG_TYPED(DbGridControl, OnDelete, void*, void) { - m_nDeleteEvent = 0; + m_nDeleteEvent = nullptr; DeleteSelectedRows(); } @@ -2865,14 +2865,14 @@ void DbGridControl::DeleteSelectedRows() CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId) { if (!IsValid(m_xCurrentRow) || !IsEnabled()) - return NULL; + return nullptr; size_t Location = GetModelColumnPos(nColumnId); - DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; if (!pColumn) - return NULL; + return nullptr; - CellController* pReturn = NULL; + CellController* pReturn = nullptr; if (IsFilterMode()) pReturn = &pColumn->GetController(); else @@ -2880,7 +2880,7 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId if (::comphelper::hasProperty(FM_PROP_ENABLED, pColumn->getModel())) { if (!::comphelper::getBOOL(pColumn->getModel()->getPropertyValue(FM_PROP_ENABLED))) - return NULL; + return nullptr; } bool bInsert = (m_xCurrentRow->IsNew() && (m_nOptions & OPT_INSERT)); @@ -2896,7 +2896,7 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId // controller could not be set to read-only in forceROController if (!bInsert && !bUpdate) // better use no controller than one without read-only - pReturn = NULL; + pReturn = nullptr; } } } @@ -2913,7 +2913,7 @@ void DbGridControl::CellModified() { SAL_INFO("svx.fmcomp", "forcing a synchron call to " << (m_bPendingAdjustRows ? "AdjustRows" : "AdustDataSource")); RemoveUserEvent(m_nAsynAdjustEvent); - m_nAsynAdjustEvent = 0; + m_nAsynAdjustEvent = nullptr; // force the call : this should be no problem as we're probably running in the solar thread here // (cell modified is triggered by user actions) @@ -3103,7 +3103,7 @@ bool DbGridControl::SaveModified() return true; size_t Location = GetModelColumnPos( GetCurColumnId() ); - DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; bool bOK = pColumn && pColumn->Commit(); DBG_ASSERT( Controller().Is(), "DbGridControl::SaveModified: was modified, by have no controller?!" ); if ( !Controller().Is() ) @@ -3257,7 +3257,7 @@ bool DbGridControl::PreNotify(NotifyEvent& rEvt) // delete asynchronously if (m_nDeleteEvent) Application::RemoveUserEvent(m_nDeleteEvent); - m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete), NULL, true); + m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete), nullptr, true); return true; } } @@ -3289,7 +3289,7 @@ void DbGridControl::KeyInput( const KeyEvent& rEvt ) if (nRow >= 0 && nRow < GetRowCount() && nColId < ColCount()) { size_t Location = GetModelColumnPos( nColId ); - DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; OStringTransfer::CopyString( GetCurrentRowCellText( pColumn, m_xCurrentRow ), this ); return; } @@ -3313,7 +3313,7 @@ void DbGridControl::HideColumn(sal_uInt16 nId) // update my model size_t Location = GetModelColumnPos( nId ); - DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; DBG_ASSERT(pColumn, "DbGridControl::HideColumn : somebody did hide a nonexistent column !"); if (pColumn) { @@ -3461,7 +3461,7 @@ void DbGridControl::implAdjustInSolarThread(bool _bRows) IMPL_LINK_TYPED(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat, void) { - m_nAsynAdjustEvent = 0; + m_nAsynAdjustEvent = nullptr; AdjustRows(); // see implAdjustInSolarThread for a comment why we do this every time @@ -3551,7 +3551,7 @@ void DbGridControl::DisconnectFromFields() } delete pListeners; - m_pFieldListeners = NULL; + m_pFieldListeners = nullptr; } void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent& /*_evt*/) @@ -3563,7 +3563,7 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent return; size_t Location = GetModelColumnPos( _nId ); - DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; if (pColumn) { std::unique_ptr<vcl::SolarMutexTryAndBuyGuard> pGuard; @@ -3609,11 +3609,11 @@ void DbGridControl::disposing(sal_uInt16 _nId, const EventObject& /*_rEvt*/) if (_nId == 0) { // the seek cursor is being disposed ::osl::MutexGuard aGuard(m_aAdjustSafety); - setDataSource(NULL,0); // our clone was disposed so we set our datasource to null to avoid later access to it + setDataSource(nullptr,0); // our clone was disposed so we set our datasource to null to avoid later access to it if (m_nAsynAdjustEvent) { RemoveUserEvent(m_nAsynAdjustEvent); - m_nAsynAdjustEvent = 0; + m_nAsynAdjustEvent = nullptr; } } } @@ -3639,7 +3639,7 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s { sal_uInt16 nColumnId = GetColumnId( _nColumnPos ); size_t Location = GetModelColumnPos(nColumnId); - DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; + DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr; if ( pColumn ) { Reference< css::awt::XControl> xInt(pColumn->GetCell()); diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 310ed7d18053..56e68c269f8e 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -161,9 +161,9 @@ namespace return s_nCounter; } - OSystemParseContext* getSharedContext(OSystemParseContext* _pContext = NULL,bool _bSet = false) + OSystemParseContext* getSharedContext(OSystemParseContext* _pContext = nullptr,bool _bSet = false) { - static OSystemParseContext* s_pSharedContext = NULL; + static OSystemParseContext* s_pSharedContext = nullptr; if ( _pContext && !s_pSharedContext ) { s_pSharedContext = _pContext; @@ -195,7 +195,7 @@ OParseContextClient::~OParseContextClient() { ::osl::MutexGuard aGuard( getSafteyMutex() ); if ( 0 == osl_atomic_decrement( &getCounter() ) ) - delete getSharedContext(NULL,true); + delete getSharedContext(nullptr,true); } } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 4de50cfad24b..e28f9bf3814e 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -130,7 +130,7 @@ namespace svxform DataTreeListBox::DataTreeListBox(vcl::Window* pParent, WinBits nBits) : SvTreeListBox(pParent, nBits) - , m_pXFormsPage(NULL) + , m_pXFormsPage(nullptr) , m_eGroup(DGTUnknown) , m_nAddId(0) , m_nAddElementId(0) @@ -197,7 +197,7 @@ namespace svxform DBG_ASSERT( pSelected && !GetParent( pSelected ), "DataTreeListBox::StartDrag: what kind of entry *is* this?" ); // on the submission page, we have only top-level entries (the submission themself) // plus direct children of those (facets of a submission) - pItemNode = pSelected ? static_cast< ItemNode* >( pSelected->GetUserData() ) : NULL; + pItemNode = pSelected ? static_cast< ItemNode* >( pSelected->GetUserData() ) : nullptr; if ( !pItemNode ) return; } @@ -397,7 +397,7 @@ namespace svxform IMPL_LINK_NOARG_TYPED(XFormsPage, ItemSelectHdl, SvTreeListBox*, void) { - EnableMenuItems( NULL ); + EnableMenuItems( nullptr ); } void XFormsPage::AddChildren( @@ -506,7 +506,7 @@ namespace svxform { DataItemType eType = DITElement; SvTreeListEntry* pEntry = m_pItemList->FirstSelected(); - ItemNode* pNode = NULL; + ItemNode* pNode = nullptr; Reference< css::xml::dom::XNode > xParentNode; Reference< XPropertySet > xNewBinding; sal_uInt16 nResId = 0; @@ -780,7 +780,7 @@ namespace svxform } m_pNaviWin->DisableNotify( false ); - EnableMenuItems( NULL ); + EnableMenuItems( nullptr ); if ( bIsDocModified ) svxform::DataNavigatorWindow::SetDocModified(); return bHandled; @@ -810,7 +810,7 @@ namespace svxform SvTreeListEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) { - SvTreeListEntry* pEntry = NULL; + SvTreeListEntry* pEntry = nullptr; const ImageList& rImageList = m_pNaviWin->GetItemImageList(); Image aImage = rImageList.GetImage( IID_ELEMENT ); @@ -823,7 +823,7 @@ namespace svxform { // ID _rEntry->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp; - pEntry = m_pItemList->InsertEntry( sTemp, aImage, aImage, NULL, false, TREELIST_APPEND, pNode ); + pEntry = m_pItemList->InsertEntry( sTemp, aImage, aImage, nullptr, false, TREELIST_APPEND, pNode ); // Action _rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp; OUString sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION ); @@ -867,7 +867,7 @@ namespace svxform _rEntry->getPropertyValue( PN_BINDING_EXPR ) >>= sTemp; sName += sTemp; pEntry = m_pItemList->InsertEntry( - sName, aImage, aImage, NULL, false, TREELIST_APPEND, pNode ); + sName, aImage, aImage, nullptr, false, TREELIST_APPEND, pNode ); } catch ( Exception& ) { @@ -892,7 +892,7 @@ namespace svxform // #i36262# may be called for submission entry *or* for // submission children. If we don't have any children, we // assume the latter case and use the parent - if( m_pItemList->GetEntry( pEntry, 0 ) == NULL ) + if( m_pItemList->GetEntry( pEntry, 0 ) == nullptr ) { pEntry = m_pItemList->GetModel()->GetParent( pEntry ); } @@ -1181,7 +1181,7 @@ namespace svxform ItemNode* pNode = new ItemNode( xPropSet ); m_pItemList->InsertEntry( - sEntry, aImage1, aImage2, NULL, false, TREELIST_APPEND, pNode ); + sEntry, aImage1, aImage2, nullptr, false, TREELIST_APPEND, pNode ); } } } @@ -1198,7 +1198,7 @@ namespace svxform break; } - EnableMenuItems( NULL ); + EnableMenuItems( nullptr ); return sRet; } @@ -1240,7 +1240,7 @@ namespace svxform if ( sNodeName.isEmpty() ) sNodeName = xRoot->getNodeName(); if ( xRoot->hasChildNodes() ) - AddChildren( NULL, _rImgLst, xRoot ); + AddChildren( nullptr, _rImgLst, xRoot ); } catch ( Exception& ) { @@ -1358,9 +1358,9 @@ namespace svxform DataNavigatorWindow::DataNavigatorWindow(vcl::Window* pParent, SfxBindings* pBindings) : Window(pParent) - , m_pInstPage(NULL) - , m_pSubmissionPage(NULL) - , m_pBindingPage(NULL) + , m_pInstPage(nullptr) + , m_pSubmissionPage(nullptr) + , m_pBindingPage(nullptr) , m_nLastSelectedPos(LISTBOX_ENTRY_NOTFOUND) , m_bShowDetails(false) , m_bIsNotifyDisabled(false) @@ -1404,7 +1404,7 @@ namespace svxform ActivatePageHdl(m_pTabCtrl); // get our frame - DBG_ASSERT( pBindings != NULL, + DBG_ASSERT( pBindings != nullptr, "DataNavigatorWindow::LoadModels(): no SfxBindings; can't get frame" ); m_xFrame.set( pBindings->GetDispatcher()->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY ); @@ -1465,7 +1465,7 @@ namespace svxform if ( nPos != m_nLastSelectedPos || !pBox ) { m_nLastSelectedPos = nPos; - ClearAllPageModels( pBox != NULL ); + ClearAllPageModels( pBox != nullptr ); InitPages(); SetPageModel(); } @@ -1649,7 +1649,7 @@ namespace svxform { SAL_WARN( "svx.form", "DataNavigatorWindow::MenuSelectHdl(): exception caught" ); } - ModelSelectHdl( NULL ); + ModelSelectHdl( nullptr ); m_pTabCtrl->SetCurPageId( nInst ); XFormsPage* pPage = GetCurrentPage( nInst ); pPage->SetInstanceName(sName); @@ -1739,7 +1739,7 @@ namespace svxform } m_pTabCtrl->RemovePage( nId ); m_pTabCtrl->SetCurPageId(m_pTabCtrl->GetPageId("instance")); - ModelSelectHdl( NULL ); + ModelSelectHdl( nullptr ); bIsDocModified = true; } } @@ -1811,13 +1811,13 @@ namespace svxform IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, UpdateHdl, Timer *, void) { - ModelSelectHdl( NULL ); + ModelSelectHdl( nullptr ); } XFormsPage* DataNavigatorWindow::GetCurrentPage( sal_uInt16& rCurId ) { rCurId = m_pTabCtrl->GetCurPageId(); - XFormsPage* pPage = NULL; + XFormsPage* pPage = nullptr; OString sName(m_pTabCtrl->GetPageName(rCurId)); if (sName == "submissions") { @@ -2290,7 +2290,7 @@ namespace svxform InitDialog(); InitFromNode(); InitDataTypeBox(); - CheckHdl( NULL ); + CheckHdl( nullptr ); } @@ -2949,7 +2949,7 @@ namespace svxform IMPL_LINK_NOARG_TYPED( NamespaceItemDialog, SelectHdl, SvTreeListBox *, void) { - bool bEnable = ( m_pNamespacesList->FirstSelected() != NULL ); + bool bEnable = ( m_pNamespacesList->FirstSelected() != nullptr ); m_pEditNamespaceBtn->Enable( bEnable ); m_pDeleteNamespaceBtn->Enable( bEnable ); } diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index a61ba0beb1fb..57845711a496 100644 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx @@ -25,7 +25,7 @@ namespace svxform void DelayedEvent::Call() { CancelPendingCall(); - SAL_WARN_IF( m_nEventId != 0, "svx.form", "DelayedEvent::Call: CancelPendingCall did not work!" ); + SAL_WARN_IF( m_nEventId != nullptr, "svx.form", "DelayedEvent::Call: CancelPendingCall did not work!" ); m_nEventId = Application::PostUserEvent( LINK( this, DelayedEvent, OnCall ) ); } @@ -34,12 +34,12 @@ namespace svxform { if ( m_nEventId ) Application::RemoveUserEvent( m_nEventId ); - m_nEventId = 0; + m_nEventId = nullptr; } IMPL_LINK_TYPED( DelayedEvent, OnCall, void*, _pArg, void ) { - m_nEventId = 0; + m_nEventId = nullptr; m_aHandler.Call( _pArg ); } } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 2f2310d935e3..4626178567ea 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -107,7 +107,7 @@ namespace svxform OFilterItemExchange::OFilterItemExchange() - : m_pFormItem(NULL) + : m_pFormItem(nullptr) { } @@ -175,7 +175,7 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co if ( _nFilterComponentIndex == rCondition.GetComponentIndex() ) return &rCondition; } - return NULL; + return nullptr; } @@ -503,10 +503,10 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) TYPEINIT1(FmFilterModel, FmParentData); FmFilterModel::FmFilterModel() - :FmParentData(NULL, OUString()) + :FmParentData(nullptr, OUString()) ,OSQLParserClient(comphelper::getProcessComponentContext()) - ,m_pAdapter(NULL) - ,m_pCurrentItems(NULL) + ,m_pAdapter(nullptr) + ,m_pCurrentItems(nullptr) { } @@ -528,12 +528,12 @@ void FmFilterModel::Clear() { m_pAdapter->dispose(); m_pAdapter->release(); - m_pAdapter= NULL; + m_pAdapter= nullptr; } - m_pCurrentItems = NULL; - m_xController = NULL; - m_xControllers = NULL; + m_pCurrentItems = nullptr; + m_xController = nullptr; + m_xControllers = nullptr; for (::std::vector<FmFilterData*>::const_iterator i = m_aChildren.begin(); i != m_aChildren.end(); ++i) @@ -662,7 +662,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons } } } - return NULL; + return nullptr; } @@ -684,7 +684,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons } } } - return NULL; + return nullptr; } @@ -942,10 +942,10 @@ void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent) m_pCurrentItems = pCurrent; } else - m_pCurrentItems = NULL; + m_pCurrentItems = nullptr; } else - m_pCurrentItems = NULL; + m_pCurrentItems = nullptr; // UI benachrichtigen @@ -1100,8 +1100,8 @@ void FmFilterString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderCo FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HASBUTTONSATROOT ) - ,m_pModel( NULL ) - ,m_pEditingCurrently( NULL ) + ,m_pModel( nullptr ) + ,m_pEditingCurrently( nullptr ) ,m_aControlExchange( this ) ,m_aTimerCounter( 0 ) ,m_aDropActionType( DA_SCROLLUP ) @@ -1181,7 +1181,7 @@ bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelec bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!"); - m_pEditingCurrently = NULL; + m_pEditingCurrently = nullptr; if (EditingCanceled()) return true; @@ -1327,7 +1327,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt ) return DND_ACTION_NONE; FmFilterData* pData = static_cast<FmFilterData*>(pDropTarget->GetUserData()); - FmFormItem* pForm = NULL; + FmFormItem* pForm = nullptr; if (dynamic_cast<const FmFilterItem*>(pData) != nullptr) { pForm = dynamic_cast<FmFormItem*>( pData->GetParent()->GetParent() ); @@ -1414,7 +1414,7 @@ bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, bool bSelect ) { if (bSelect) { - FmFormItem* pFormItem = NULL; + FmFormItem* pFormItem = nullptr; if ( dynamic_cast<const FmFilterItem*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr) pFormItem = static_cast<FmFormItem*>(static_cast<FmFilterItem*>(pEntry->GetUserData())->GetParent()->GetParent()); else if (dynamic_cast<const FmFilterItems*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr) @@ -1462,7 +1462,7 @@ void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) else if( dynamic_cast<const FmFilterCurrentChangedHint*>(&rHint) ) { // invalidate the entries - for (SvTreeListEntry* pEntry = First(); pEntry != NULL; + for (SvTreeListEntry* pEntry = First(); pEntry != nullptr; pEntry = Next(pEntry)) GetModel()->InvalidateEntry( pEntry ); } @@ -1470,10 +1470,10 @@ void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) SvTreeListEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const { - SvTreeListEntry* pEntry = NULL; + SvTreeListEntry* pEntry = nullptr; if (pItem) { - for (pEntry = First(); pEntry != NULL; pEntry = Next( pEntry )) + for (pEntry = First(); pEntry != nullptr; pEntry = Next( pEntry )) { FmFilterData* pEntryItem = static_cast<FmFilterData*>(pEntry->GetUserData()); if (pEntryItem == pItem) @@ -1512,12 +1512,12 @@ void FmFilterNavigator::Remove(FmFilterData* pItem) FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem*>& _rItemList) { // be sure that the data is only used within only one form! - FmFormItem* pFirstItem = NULL; + FmFormItem* pFirstItem = nullptr; bool bHandled = true; bool bFoundSomething = false; for (SvTreeListEntry* pEntry = FirstSelected(); - bHandled && pEntry != NULL; + bHandled && pEntry != nullptr; pEntry = NextSelected(pEntry)) { FmFilterItem* pFilter = dynamic_cast<FmFilterItem*>( static_cast<FmFilterData*>(pEntry->GetUserData()) ); @@ -1539,7 +1539,7 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem } } if ( !bHandled || !bFoundSomething ) - pFirstItem = NULL; + pFirstItem = nullptr; return pFirstItem; } @@ -1600,12 +1600,12 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) { // die Stelle, an der geklickt wurde Point aWhere; - SvTreeListEntry* pClicked = NULL; + SvTreeListEntry* pClicked = nullptr; if (rEvt.IsMouseEvent()) { aWhere = rEvt.GetMousePosPixel(); pClicked = GetEntry(aWhere); - if (pClicked == NULL) + if (pClicked == nullptr) break; if (!IsSelected(pClicked)) @@ -1625,7 +1625,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) ::std::vector<FmFilterData*> aSelectList; for (SvTreeListEntry* pEntry = FirstSelected(); - pEntry != NULL; + pEntry != nullptr; pEntry = NextSelected(pEntry)) { // don't delete forms @@ -1648,7 +1648,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) aContextMenu.EnableItem( SID_FM_DELETE, !aSelectList.empty() ); - bool bEdit = dynamic_cast<FmFilterItem*>( static_cast<FmFilterData*>(pClicked->GetUserData()) ) != NULL && + bool bEdit = dynamic_cast<FmFilterItem*>( static_cast<FmFilterData*>(pClicked->GetUserData()) ) != nullptr && IsSelected(pClicked) && GetSelectionCount() == 1; aContextMenu.EnableItem( SID_FM_FILTER_EDIT, @@ -1715,7 +1715,7 @@ SvTreeListEntry* FmFilterNavigator::getPrevEntry(SvTreeListEntry* _pStartWith) pEntry = Prev(pEntry); // if the entry is still no leaf return if ( pEntry && GetChildCount( pEntry ) != 0 ) - pEntry = NULL; + pEntry = nullptr; } return pEntry; } @@ -1740,7 +1740,7 @@ void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt) if ( rKeyCode.GetCode() == KEY_UP ) getter = ::std::mem_fun(&FmFilterNavigator::getPrevEntry); - SvTreeListEntry* pTarget = getter( this, NULL ); + SvTreeListEntry* pTarget = getter( this, nullptr ); if ( !pTarget ) break; @@ -1810,7 +1810,7 @@ void FmFilterNavigator::DeleteSelection() // the deletion of its child, I have to shrink the selecton list ::std::vector<SvTreeListEntry*> aEntryList; for (SvTreeListEntry* pEntry = FirstSelected(); - pEntry != NULL; + pEntry != nullptr; pEntry = NextSelected(pEntry)) { FmFilterItem* pFilterItem = dynamic_cast<FmFilterItem*>( static_cast<FmFilterData*>(pEntry->GetUserData()) ); @@ -1866,7 +1866,7 @@ void FmFilterNavigatorWin::UpdateContent(FmFormShell* pFormShell) return; if (!pFormShell) - m_pNavigator->UpdateContent( NULL, NULL ); + m_pNavigator->UpdateContent( nullptr, nullptr ); else { Reference< XFormController > xController(pFormShell->GetImpl()->getActiveInternalController()); @@ -1898,7 +1898,7 @@ void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, c UpdateContent( pShell ); } else - UpdateContent( NULL ); + UpdateContent( nullptr ); } @@ -1911,7 +1911,7 @@ bool FmFilterNavigatorWin::Close() // the EndEditing was vetoed (perhaps of an syntax error or such) return false; - UpdateContent( NULL ); + UpdateContent( nullptr ); return SfxDockingWindow::Close(); } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 8caf6c64d98a..8fb2af8dd263 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -314,7 +314,7 @@ void FmPropBrw::implDetachController() { try { - m_xMeAsFrame->setComponent(NULL, NULL); + m_xMeAsFrame->setComponent(nullptr, nullptr); } catch( const Exception& ) { @@ -324,7 +324,7 @@ void FmPropBrw::implDetachController() // we attached a frame to the controller manually, so we need to manually tell it that it's detached, too if ( m_xBrowserController.is() ) - m_xBrowserController->attachFrame( NULL ); + m_xBrowserController->attachFrame( nullptr ); m_xBrowserController.clear(); m_xInspectorModel.clear(); @@ -535,7 +535,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) // the mapping from control models to control shapes Reference< XMap > xControlMap; - FmFormPage* pFormPage = _pFormShell ? _pFormShell->GetCurPage() : NULL; + FmFormPage* pFormPage = _pFormShell ? _pFormShell->GetCurPage() : nullptr; if ( pFormPage ) xControlMap = pFormPage->GetImpl().getControlToShapeMap(); @@ -592,7 +592,7 @@ void FmPropBrw::impl_ensurePropertyBrowser_nothrow( FmFormShell* _pFormShell ) { // the document in which we live Reference< XInterface > xDocument; - SfxObjectShell* pObjectShell = _pFormShell ? _pFormShell->GetObjectShell() : NULL; + SfxObjectShell* pObjectShell = _pFormShell ? _pFormShell->GetObjectShell() : nullptr; if ( pObjectShell ) xDocument = pObjectShell->GetModel(); if ( ( xDocument == m_xLastKnownDocument ) && m_xBrowserController.is() ) @@ -603,7 +603,7 @@ void FmPropBrw::impl_ensurePropertyBrowser_nothrow( FmFormShell* _pFormShell ) { // clean up any previous instances of the object inspector if ( m_xMeAsFrame.is() ) - m_xMeAsFrame->setComponent( NULL, NULL ); + m_xMeAsFrame->setComponent( nullptr, nullptr ); else ::comphelper::disposeComponent( m_xBrowserController ); m_xBrowserController.clear(); @@ -645,7 +645,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool if ( m_bInitialStateChange ) { // if we're just newly created, we want to have the focus - PostUserEvent( LINK( this, FmPropBrw, OnAsyncGetFocus ), NULL, true ); + PostUserEvent( LINK( this, FmPropBrw, OnAsyncGetFocus ), nullptr, true ); // and additionally, we want to show the page which was active during // our previous incarnation diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index c937685c9cd3..a61abcfb923d 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -98,7 +98,7 @@ namespace svxform { "com.sun.star.sdb.FormDesign", eDatabaseForm }, { "com.sun.star.sdb.TextReportDesign", eDatabaseReport }, { "com.sun.star.text.GlobalDocument", eTextDocument }, - { NULL, eUnknownDocumentType } + { nullptr, eUnknownDocumentType } }; return aModuleInfo; } diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index b4fcca3c956b..58428a6ced0a 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -63,7 +63,7 @@ namespace svxform { Reference< clipboard::XClipboard > xClipBoard( getOwnClipboard() ); if ( xClipBoard.is() ) - xClipBoard->setContents( NULL, NULL ); + xClipBoard->setContents( nullptr, nullptr ); } catch( const Exception& ) { @@ -115,13 +115,13 @@ namespace svxform } OControlTransferData::OControlTransferData( ) - :m_pFocusEntry( NULL ) + :m_pFocusEntry( nullptr ) { } OControlTransferData::OControlTransferData( const Reference< XTransferable >& _rxTransferable ) - :m_pFocusEntry( NULL ) + :m_pFocusEntry( nullptr ) { TransferableDataHelper aExchangedData( _rxTransferable ); @@ -235,7 +235,7 @@ namespace svxform { aCurrentPath.push_back(pLoop->GetChildListPos()); pLoop = pTreeBox->GetParent(pLoop); - DBG_ASSERT((pLoop != NULL) || (pRoot == 0), "OControlTransferData::buildPathFormat: invalid root or entry !"); + DBG_ASSERT((pLoop != nullptr) || (pRoot == nullptr), "OControlTransferData::buildPathFormat: invalid root or entry !"); // pLoop == NULL heisst, dass ich am oberen Ende angelangt bin, dann sollte das Ganze abbrechen, was nur bei pRoot == NULL der Fall sein wird } @@ -360,7 +360,7 @@ namespace svxform OLocalExchangeHelper::OLocalExchangeHelper(vcl::Window* _pDragSource) :m_pDragSource(_pDragSource) - ,m_pTransferable(NULL) + ,m_pTransferable(nullptr) { } @@ -391,7 +391,7 @@ namespace svxform { m_pTransferable->setClipboardListener( Link<OLocalExchange&,void>() ); m_pTransferable->release(); - m_pTransferable = NULL; + m_pTransferable = nullptr; } } diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 6bdc2d70bdb0..67b033b54a5a 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -542,7 +542,7 @@ namespace svxform UpdateContent( pShell ); } else - UpdateContent( NULL ); + UpdateContent( nullptr ); } @@ -557,7 +557,7 @@ namespace svxform bool NavigatorFrame::Close() { - UpdateContent( NULL ); + UpdateContent( nullptr ); return SfxDockingWindow::Close(); } diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index 0fff0a493447..03ae492e69b3 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -45,7 +45,7 @@ struct FmFormModelImplData aControlsUseRefDevice; FmFormModelImplData() - :pUndoEnv( NULL ) + :pUndoEnv( nullptr ) ,bOpenInDesignIsDefaulted( true ) ,bMovingPage( false ) ,aControlsUseRefDevice() @@ -55,8 +55,8 @@ struct FmFormModelImplData FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) : SdrModel(pPool, pPers, false, LOADREFCOUNTS) - , m_pImpl(NULL) - , m_pObjShell(0) + , m_pImpl(nullptr) + , m_pObjShell(nullptr) , m_bOpenInDesignMode(false) , m_bAutoControlFocus(false) { @@ -67,8 +67,8 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers) : SdrModel(rPath, pPool, pPers, false, LOADREFCOUNTS) - , m_pImpl(NULL) - , m_pObjShell(0) + , m_pImpl(nullptr) + , m_pObjShell(nullptr) , m_bOpenInDesignMode(false) , m_bAutoControlFocus(false) { @@ -80,8 +80,8 @@ FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShe FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable) : SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) - , m_pImpl(NULL) - , m_pObjShell(0) + , m_pImpl(nullptr) + , m_pObjShell(nullptr) , m_bOpenInDesignMode(false) , m_bAutoControlFocus(false) { @@ -93,7 +93,7 @@ FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShe FmFormModel::~FmFormModel() { if (m_pObjShell && m_pImpl->pUndoEnv->IsListening(*m_pObjShell)) - SetObjectShell(NULL); + SetObjectShell(nullptr); ClearUndoBuffer(); // minimale grenze fuer undos diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 6b4a14b797de..5d93ce213f27 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -60,7 +60,7 @@ TYPEINIT1(FmFormObj, SdrUnoObj); FmFormObj::FmFormObj(const OUString& rModelName) :SdrUnoObj ( rModelName ) ,m_nPos ( -1 ) - ,m_pLastKnownRefDevice ( NULL ) + ,m_pLastKnownRefDevice ( nullptr ) { // normally, this is done in SetUnoControlModel, but if the call happened in the base class ctor, @@ -72,7 +72,7 @@ FmFormObj::FmFormObj(const OUString& rModelName) FmFormObj::FmFormObj() :SdrUnoObj ( "" ) ,m_nPos ( -1 ) - ,m_pLastKnownRefDevice ( NULL ) + ,m_pLastKnownRefDevice ( nullptr ) { } @@ -83,7 +83,7 @@ FmFormObj::~FmFormObj() if (m_xEnvironmentHistory.is()) m_xEnvironmentHistory->dispose(); - m_xEnvironmentHistory = NULL; + m_xEnvironmentHistory = nullptr; m_aEventsHistory.realloc(0); } @@ -111,7 +111,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force ) if ( !pFormModel || !pFormModel->ControlsUseRefDevice() ) return; - OutputDevice* pCurrentRefDevice = pFormModel ? pFormModel->GetRefDevice() : NULL; + OutputDevice* pCurrentRefDevice = pFormModel ? pFormModel->GetRefDevice() : nullptr; if ( ( m_pLastKnownRefDevice.get() == pCurrentRefDevice ) && !_force ) return; @@ -316,7 +316,7 @@ void FmFormObj::SetPage(SdrPage* _pNewPage) if (m_xEnvironmentHistory.is()) m_xEnvironmentHistory->dispose(); - m_xEnvironmentHistory = NULL; + m_xEnvironmentHistory = nullptr; m_aEventsHistory.realloc(0); if ( pNewFormPage ) @@ -338,11 +338,11 @@ sal_uInt16 FmFormObj::GetObjIdentifier() const void FmFormObj::clonedFrom(const FmFormObj* _pSource) { - DBG_ASSERT(_pSource != NULL, "FmFormObj::clonedFrom : invalid source !"); + DBG_ASSERT(_pSource != nullptr, "FmFormObj::clonedFrom : invalid source !"); if (m_xEnvironmentHistory.is()) m_xEnvironmentHistory->dispose(); - m_xEnvironmentHistory = NULL; + m_xEnvironmentHistory = nullptr; m_aEventsHistory.realloc(0); Reference< XChild > xSourceAsChild(_pSource->GetUnoControlModel(), UNO_QUERY); @@ -362,7 +362,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource) FmFormObj* FmFormObj::Clone() const { FmFormObj* pFormObject = CloneHelper< FmFormObj >(); - DBG_ASSERT(pFormObject != NULL, "FmFormObj::Clone : invalid clone !"); + DBG_ASSERT(pFormObject != nullptr, "FmFormObj::Clone : invalid clone !"); if (pFormObject) pFormObject->clonedFrom(this); @@ -665,7 +665,7 @@ bool FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) } FmFormView* pView( dynamic_cast< FmFormView* >( rStat.GetView() ) ); - FmXFormView* pViewImpl = pView ? pView->GetImpl() : NULL; + FmXFormView* pViewImpl = pView ? pView->GetImpl() : nullptr; OSL_ENSURE( pViewImpl, "FmFormObj::EndCreate: no view!?" ); if ( pViewImpl ) pViewImpl->onCreatedFormObject( *this ); @@ -680,7 +680,7 @@ void FmFormObj::BrkCreate( SdrDragStat& rStat ) impl_isolateControlModel_nothrow(); FmFormView* pView( dynamic_cast< FmFormView* >( rStat.GetView() ) ); - FmXFormView* pViewImpl = pView ? pView->GetImpl() : NULL; + FmXFormView* pViewImpl = pView ? pView->GetImpl() : nullptr; OSL_ENSURE( pViewImpl, "FmFormObj::EndCreate: no view!?" ); if ( pViewImpl ) pViewImpl->breakCreateFormObject(); diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index f0721b4e2687..34ed152f8500 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -119,13 +119,13 @@ void FmFormPage::SetModel(SdrModel* pNewModel) SdrPage* FmFormPage::Clone() const { - return Clone(0); + return Clone(nullptr); } SdrPage* FmFormPage::Clone(SdrModel* const pNewModel) const { FmFormPage* const pNewPage = new FmFormPage(*this); - FmFormModel* pFormModel = 0; + FmFormModel* pFormModel = nullptr; if (pNewModel) { pFormModel = dynamic_cast<FmFormModel*>(pNewModel); @@ -167,8 +167,8 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, aPos = pWindow->ScreenToOutputPixel( aPos ); aPos = pWindow->PixelToLogic( aPos ); - SdrObject* pObj = NULL; - SdrPageView* pPV = NULL; + SdrObject* pObj = nullptr; + SdrPageView* pPV = nullptr; if ( !pView->PickObj( aPos, 0, pObj, pPV, SdrSearchOptions::DEEP ) ) return false; diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index b125490cf75f..a403d0834a4c 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -322,7 +322,7 @@ const Reference< css::form::XForms >& FmFormPageImpl::getForms( bool _bForceCrea FmFormModel* pFormsModel = dynamic_cast<FmFormModel*>( m_rPage.GetModel() ); // give the newly created collection a place in the universe - SfxObjectShell* pObjShell = pFormsModel ? pFormsModel->GetObjectShell() : NULL; + SfxObjectShell* pObjShell = pFormsModel ? pFormsModel->GetObjectShell() : nullptr; if ( pObjShell ) m_xForms->setParent( pObjShell->GetModel() ); @@ -336,7 +336,7 @@ const Reference< css::form::XForms >& FmFormPageImpl::getForms( bool _bForceCrea FmFormPageImpl::~FmFormPageImpl() { - xCurrentForm = NULL; + xCurrentForm = nullptr; ::comphelper::disposeComponent( m_xForms ); } @@ -452,7 +452,7 @@ Reference< css::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy { // if the control already is child of a form, don't do anything if (!rContent.is() || rContent->getParent().is()) - return NULL; + return nullptr; Reference< XForm > xForm; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index ba7c924d621c..f12265025ff6 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -736,7 +736,7 @@ namespace svxform if ( !impl_allowAsynchronousCall_nothrow( _rEvent.ListenerType.getTypeName(), _rEvent.MethodName ) ) { - impl_doFireScriptEvent_nothrow( aGuard, _rEvent, NULL ); + impl_doFireScriptEvent_nothrow( aGuard, _rEvent, nullptr ); return; } @@ -766,14 +766,14 @@ namespace svxform void SAL_CALL FormScriptListener::dispose() { ::osl::MutexGuard aGuard( m_aMutex ); - m_pScriptExecutor = NULL; + m_pScriptExecutor = nullptr; } IMPL_LINK_TYPED( FormScriptListener, OnAsyncScriptEvent, void*, p, void ) { ScriptEvent* _pEvent = static_cast<ScriptEvent*>(p); - OSL_PRECOND( _pEvent != NULL, "FormScriptListener::OnAsyncScriptEvent: invalid event!" ); + OSL_PRECOND( _pEvent != nullptr, "FormScriptListener::OnAsyncScriptEvent: invalid event!" ); if ( !_pEvent ) return; @@ -781,7 +781,7 @@ namespace svxform ::osl::ClearableMutexGuard aGuard( m_aMutex ); if ( !impl_isDisposed_nothrow() ) - impl_doFireScriptEvent_nothrow( aGuard, *_pEvent, NULL ); + impl_doFireScriptEvent_nothrow( aGuard, *_pEvent, nullptr ); } delete _pEvent; @@ -790,7 +790,7 @@ namespace svxform } FormScriptingEnvironment::FormScriptingEnvironment( FmFormModel& _rModel ) - :m_pScriptListener( NULL ) + :m_pScriptListener( nullptr ) ,m_rFormModel( _rModel ) ,m_bDisposed( false ) { @@ -893,7 +893,7 @@ namespace svxform } catch( Exception& ) {} } - m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs, true, aCaller.hasValue() ? &aCaller : 0 ); + m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs, true, aCaller.hasValue() ? &aCaller : nullptr ); } } @@ -979,7 +979,7 @@ namespace svxform { // object shells are not thread safe, so guard the destruction SolarMutexGuard aSolarGuarsReset; - xObjectShell = NULL; + xObjectShell = nullptr; } #endif } diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 5cbca72bf1dd..a0b4115d11d2 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -207,7 +207,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) :SfxShell(_pParent) ,m_pImpl(new FmXFormShell(*this, _pParent->GetViewFrame())) ,m_pFormView( pView ) - ,m_pFormModel( NULL ) + ,m_pFormModel( nullptr ) ,m_pParentShell(_pParent) ,m_nLastSlot( 0 ) ,m_bDesignMode( true ) @@ -224,11 +224,11 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) FmFormShell::~FmFormShell() { if ( m_pFormView ) - SetView( NULL ); + SetView( nullptr ); m_pImpl->dispose(); m_pImpl->release(); - m_pImpl = NULL; + m_pImpl = nullptr; } @@ -254,7 +254,7 @@ bool FmFormShell::PrepareClose(bool bUI) SdrPageView* pCurPageView = m_pFormView->GetSdrPageView(); // sal_uInt16 nPos = pCurPageView ? pCurPageView->GetWinList().Find((OutputDevice*)m_pFormView->GetActualOutDev()) : SDRPAGEVIEWWIN_NOTFOUND; - SdrPageWindow* pWindow = pCurPageView ? pCurPageView->FindPageWindow(*const_cast<OutputDevice*>(m_pFormView->GetActualOutDev())) : 0L; + SdrPageWindow* pWindow = pCurPageView ? pCurPageView->FindPageWindow(*const_cast<OutputDevice*>(m_pFormView->GetActualOutDev())) : nullptr; if(pWindow) { @@ -495,7 +495,7 @@ void FmFormShell::Execute(SfxRequest &rReq) if ( pGrabFocusItem && pGrabFocusItem->GetValue() ) { // see below SfxViewShell* pShell = GetViewShell(); - vcl::Window* pShellWnd = pShell ? pShell->GetWindow() : NULL; + vcl::Window* pShellWnd = pShell ? pShell->GetWindow() : nullptr; if ( pShellWnd ) pShellWnd->GrabFocus(); break; @@ -505,11 +505,11 @@ void FmFormShell::Execute(SfxRequest &rReq) SfxUInt32Item aInventorItem( SID_FM_CONTROL_INVENTOR, FmFormInventor ); const SfxPoolItem* pArgs[] = { - &aIdentifierItem, &aInventorItem, NULL + &aIdentifierItem, &aInventorItem, nullptr }; const SfxPoolItem* pInternalArgs[] = { - NULL + nullptr }; GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_CREATE_CONTROL, SfxCallMode::ASYNCHRON, @@ -752,7 +752,7 @@ void FmFormShell::Execute(SfxRequest &rReq) DBG_ASSERT( pFact, "no dialog factory!" ); if ( pFact ) { - std::unique_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) ); + std::unique_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( nullptr ) ); DBG_ASSERT( dlg.get(), "Dialog creation failed!" ); dlg->SetValue( rController->getCursor()->getRow() ); if ( dlg->Execute() == RET_OK ) @@ -904,7 +904,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) { // Ist der css::drawing::Layer gelocked, so m???ssen die Slots disabled werden. #36897 SdrPageView* pPV = m_pFormView->GetSdrPageView(); - if (pPV != NULL) + if (pPV != nullptr) bLayerLocked = pPV->IsLayerLocked(m_pFormView->GetActiveLayer()); } if (bLayerLocked) @@ -1182,7 +1182,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich) FmFormPage* FmFormShell::GetCurPage() const { - FmFormPage* pP = NULL; + FmFormPage* pP = nullptr; if (m_pFormView && m_pFormView->GetSdrPageView()) pP = dynamic_cast<FmFormPage*>( m_pFormView->GetSdrPageView()->GetPage() ); return pP; @@ -1196,9 +1196,9 @@ void FmFormShell::SetView( FmFormView* _pView ) if ( IsActive() ) GetImpl()->viewDeactivated( *m_pFormView ); - m_pFormView->SetFormShell( NULL, FmFormView::FormShellAccess() ); - m_pFormView = NULL; - m_pFormModel = NULL; + m_pFormView->SetFormShell( nullptr, FmFormView::FormShellAccess() ); + m_pFormView = nullptr; + m_pFormModel = nullptr; } if ( !_pView ) @@ -1300,7 +1300,7 @@ namespace while ( aIter.IsMore() ) { SdrObject* pObject = aIter.Next(); - SdrUnoObj* pUnoObject = pObject ? dynamic_cast<SdrUnoObj*>( pObject ) : NULL; + SdrUnoObj* pUnoObject = pObject ? dynamic_cast<SdrUnoObj*>( pObject ) : nullptr; if ( !pUnoObject ) continue; @@ -1311,7 +1311,7 @@ namespace if ( _rxModel == xControlModel ) return pUnoObject; } - return NULL; + return nullptr; } } @@ -1391,14 +1391,14 @@ namespace SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxModel, const SdrView& _rView, const OutputDevice& _rDevice, Reference< XControl >& _out_rxControl ) const { if ( !_rxModel.is() ) - return NULL; + return nullptr; // we can only retrieve controls for SdrObjects which belong to page which is actually displayed in the given view SdrPageView* pPageView = _rView.GetSdrPageView(); - SdrPage* pPage = pPageView ? pPageView->GetPage() : NULL; + SdrPage* pPage = pPageView ? pPageView->GetPage() : nullptr; OSL_ENSURE( pPage, "FmFormShell::GetFormControl: no page displayed in the given view!" ); if ( !pPage ) - return NULL; + return nullptr; SdrUnoObj* pUnoObject = lcl_findUnoObject( *pPage, _rxModel ); if ( pUnoObject ) @@ -1429,7 +1429,7 @@ SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxMod (void) this; // avoid loplugin:staticmethods #endif - return NULL; + return nullptr; } @@ -1437,7 +1437,7 @@ Reference< runtime::XFormController > FmFormShell::GetFormController( const Refe { const FmFormView* pFormView = dynamic_cast< const FmFormView* >( &_rView ); if ( !pFormView ) - return NULL; + return nullptr; return pFormView->GetFormController( _rxForm, _rDevice ); } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 8bf812d8980f..0c6e7c2ad611 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -289,7 +289,7 @@ namespace if ( pCurrent->IsGroupObject() ) { pGroupIterator.reset(new SdrObjListIter( *pCurrent->GetSubList() )); - pCurrent = pGroupIterator->IsMore() ? pGroupIterator->Next() : NULL; + pCurrent = pGroupIterator->IsMore() ? pGroupIterator->Next() : nullptr; } while ( pCurrent ) @@ -305,7 +305,7 @@ namespace } // next element - pCurrent = pGroupIterator && pGroupIterator->IsMore() ? pGroupIterator->Next() : NULL; + pCurrent = pGroupIterator && pGroupIterator->IsMore() ? pGroupIterator->Next() : nullptr; } } } @@ -400,7 +400,7 @@ namespace // search the model/control idl classes for the event described by pCurrent for ( Sequence< Type>* pCurrentArray = &aModelListeners; pCurrentArray; - pCurrentArray = (pCurrentArray == &aModelListeners) ? &aControlListeners : NULL + pCurrentArray = (pCurrentArray == &aModelListeners) ? &aControlListeners : nullptr ) { const Type* pCurrentListeners = pCurrentArray->getConstArray(); @@ -629,8 +629,8 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), ConfigItemMode::DelayedUpdate) ,m_eNavigate( NavigationBarMode_NONE ) - ,m_nInvalidationEvent( 0 ) - ,m_nActivationEvent( 0 ) + ,m_nInvalidationEvent( nullptr ) + ,m_nActivationEvent( nullptr ) ,m_pShell( &_rShell ) ,m_pTextShell( new svx::FmTextControlShell( _pViewFrame ) ) ,m_aActiveControllerFeatures( this ) @@ -752,9 +752,9 @@ void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( Runtime { // wird der Controller freigeben dann alles loslassen stopListening(); - m_xActiveForm = NULL; - m_xActiveController = NULL; - m_xNavigationController = NULL; + m_xActiveForm = nullptr; + m_xActiveController = nullptr; + m_xNavigationController = nullptr; m_aActiveControllerFeatures.dispose(); m_aNavControllerFeatures.dispose(); @@ -774,9 +774,9 @@ void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( Runtime if (xComp.is()) xComp->removeEventListener(static_cast<XEventListener*>(static_cast<XPropertyChangeListener*>(this))); - m_xExternalViewController = NULL; - m_xExternalDisplayedForm = NULL; - m_xExtViewTriggerController = NULL; + m_xExternalViewController = nullptr; + m_xExternalDisplayedForm = nullptr; + m_xExtViewTriggerController = nullptr; InvalidateSlot( SID_FM_VIEW_AS_GRID, false ); } @@ -875,7 +875,7 @@ void FmXFormShell::disposing() FmXFormShell_BASE::disposing(); if ( m_pShell && !m_pShell->IsDesignMode() ) - setActiveController( NULL, true ); + setActiveController( nullptr, true ); // do NOT save the content of the old form (the second parameter tells this) // if we're here, then we expect that PrepareClose has been called, and thus the user // got a chance to commit or reject any changes. So in case we're here and there @@ -883,7 +883,7 @@ void FmXFormShell::disposing() m_pTextShell->dispose(); - m_xAttachedFrame = NULL; + m_xAttachedFrame = nullptr; CloseExternalFormViewer(); @@ -898,12 +898,12 @@ void FmXFormShell::disposing() if (m_nInvalidationEvent) { Application::RemoveUserEvent(m_nInvalidationEvent); - m_nInvalidationEvent = 0; + m_nInvalidationEvent = nullptr; } if ( m_nActivationEvent ) { Application::RemoveUserEvent( m_nActivationEvent ); - m_nActivationEvent = 0; + m_nActivationEvent = nullptr; } } @@ -923,18 +923,18 @@ void FmXFormShell::disposing() m_xForms.clear(); impl_switchActiveControllerListening( false ); - m_xActiveController = NULL; - m_xActiveForm = NULL; - - m_pShell = NULL; - m_xNavigationController = NULL; - m_xCurrentForm = NULL; - m_xLastGridFound = NULL; - m_xAttachedFrame = NULL; - m_xExternalViewController = NULL; - m_xExtViewTriggerController = NULL; - m_xExternalDisplayedForm = NULL; - m_xLastGridFound = NULL; + m_xActiveController = nullptr; + m_xActiveForm = nullptr; + + m_pShell = nullptr; + m_xNavigationController = nullptr; + m_xCurrentForm = nullptr; + m_xLastGridFound = nullptr; + m_xAttachedFrame = nullptr; + m_xExternalViewController = nullptr; + m_xExtViewTriggerController = nullptr; + m_xExternalDisplayedForm = nullptr; + m_xLastGridFound = nullptr; InterfaceBag aEmpty; m_aCurrentSelection.swap( aEmpty ); @@ -1009,7 +1009,7 @@ IMPL_LINK_NOARG_TYPED(FmXFormShell, OnInvalidateSlots, void*,void) return; ::osl::MutexGuard aGuard(m_aInvalidationSafety); - m_nInvalidationEvent = 0; + m_nInvalidationEvent = nullptr; for (std::vector<InvalidSlotInfo>::const_iterator i = m_arrInvalidSlots.begin(); i < m_arrInvalidSlots.end(); ++i) { @@ -1089,7 +1089,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent return false; SdrPage* pPage = m_pShell->GetCurPage(); - FmFormPage* pFormPage = pPage ? dynamic_cast< FmFormPage* >( pPage ) : NULL; + FmFormPage* pFormPage = pPage ? dynamic_cast< FmFormPage* >( pPage ) : nullptr; OSL_ENSURE( pFormPage, "FmXFormShell::executeControlConversionSlot: no current (form) page!" ); if ( !pFormPage ) return false; @@ -1103,7 +1103,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent { Reference< XInterface > xNormalizedObject( _rxObject, UNO_QUERY ); - FmFormObj* pFormObject = NULL; + FmFormObj* pFormObject = nullptr; SdrObjListIter aPageIter( *pFormPage ); while ( aPageIter.IsMore() ) { @@ -1116,7 +1116,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent if ( xCurrentNormalized.get() == xNormalizedObject.get() ) break; - pFormObject = NULL; + pFormObject = nullptr; } if ( !pFormObject ) @@ -1240,7 +1240,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent { if ( xNewBindable.is() ) xNewBindable->setValueBinding( xOldBindable->getValueBinding() ); - xOldBindable->setValueBinding( NULL ); + xOldBindable->setValueBinding( nullptr ); } catch(const Exception&) { @@ -1258,7 +1258,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent { if ( xNewSink.is() ) xNewSink->setListEntrySource( xOldSink->getListEntrySource() ); - xOldSink->setListEntrySource( NULL ); + xOldSink->setListEntrySource( nullptr ); } catch(const Exception&) { @@ -1269,7 +1269,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent // create an undo action FmFormModel* pModel = m_pShell->GetFormModel(); - DBG_ASSERT(pModel != NULL, "FmXFormShell::executeControlConversionSlot: my shell has no model !"); + DBG_ASSERT(pModel != nullptr, "FmXFormShell::executeControlConversionSlot: my shell has no model !"); if (pModel && pModel->IsUndoEnabled() ) { pModel->AddUndo(new FmUndoModelReplaceAction(*pModel, pFormObject, xOldModel)); @@ -1398,9 +1398,9 @@ void FmXFormShell::LoopGrids(LoopGridsSync nSync, LoopGridsFlags nFlags) Reference< XControlContainer > FmXFormShell::getControlContainerForView() { if ( impl_checkDisposed() ) - return NULL; + return nullptr; - SdrPageView* pPageView = NULL; + SdrPageView* pPageView = nullptr; if ( m_pShell && m_pShell->GetFormView() ) pPageView = m_pShell->GetFormView()->GetSdrPageView(); @@ -1715,18 +1715,18 @@ void FmXFormShell::CloseExternalFormViewer() if (!xCommLink.is()) return; - xExternalViewFrame->setComponent(NULL,NULL); + xExternalViewFrame->setComponent(nullptr,nullptr); ::comphelper::disposeComponent(xExternalViewFrame); - m_xExternalViewController = NULL; - m_xExtViewTriggerController = NULL; - m_xExternalDisplayedForm = NULL; + m_xExternalViewController = nullptr; + m_xExtViewTriggerController = nullptr; + m_xExternalDisplayedForm = nullptr; } Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet>& _xForm) const { if ( impl_checkDisposed() ) - return NULL; + return nullptr; Reference< runtime::XFormController> xExternalCtrlr(m_xExternalViewController, UNO_QUERY); if (xExternalCtrlr.is() && (_xForm == xExternalCtrlr->getModel())) @@ -1741,7 +1741,7 @@ Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet Reference< XForm> FmXFormShell::getInternalForm(const Reference< XForm>& _xForm) const { if ( impl_checkDisposed() ) - return NULL; + return nullptr; Reference< runtime::XFormController > xExternalCtrlr(m_xExternalViewController, UNO_QUERY); if (xExternalCtrlr.is() && (_xForm == xExternalCtrlr->getModel())) @@ -1918,12 +1918,12 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle if ( m_xActiveController.is() ) m_xActiveForm = getInternalForm( Reference< XForm >( m_xActiveController->getModel(), UNO_QUERY ) ); else - m_xActiveForm = NULL; + m_xActiveForm = nullptr; startListening(); // activate all dispatchers belonging to form of the new navigation controller - xNavigationForm = NULL; + xNavigationForm = nullptr; if (m_xNavigationController.is()) xNavigationForm.set(m_xNavigationController->getModel(), UNO_QUERY); @@ -2053,7 +2053,7 @@ void FmXFormShell::forgetCurrentForm() return; // reset ... - impl_updateCurrentForm( NULL ); + impl_updateCurrentForm( nullptr ); // ... and try finding a new current form // #i88186# / 2008-04-12 / frank.schoenheit@sun.com @@ -2131,7 +2131,7 @@ void FmXFormShell::startListening() break; default: - m_xNavigationController = NULL; + m_xNavigationController = nullptr; m_bDatabaseBar = false; } @@ -2154,7 +2154,7 @@ void FmXFormShell::startListening() m_eNavigate = NavigationBarMode_NONE; m_bDatabaseBar = false; - m_xNavigationController = NULL; + m_xNavigationController = nullptr; } @@ -2177,7 +2177,7 @@ void FmXFormShell::stopListening() m_bDatabaseBar = false; m_eNavigate = NavigationBarMode_NONE; - m_xNavigationController = NULL; + m_xNavigationController = nullptr; } @@ -2488,7 +2488,7 @@ IMPL_LINK_TYPED(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscCon if (rfmscContextInfo.arrFields.empty()) { rfmscContextInfo.arrFields.clear(); - rfmscContextInfo.xCursor = NULL; + rfmscContextInfo.xCursor = nullptr; rfmscContextInfo.strUsedFields.clear(); return 0L; } @@ -2841,7 +2841,7 @@ void FmXFormShell::SetDesignMode(bool bDesign) Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlModel >& i_rxModel, const FmFormObj& i_rKnownFormObj ) { if ( impl_checkDisposed() ) - return NULL; + return nullptr; Reference< XControl > xControl; try @@ -2867,7 +2867,7 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod const vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerControl->getPeer() ); ENSURE_OR_THROW( pContainerWindow, "unexpected control container implementation" ); - const SdrView* pSdrView = m_pShell ? m_pShell->GetFormView() : NULL; + const SdrView* pSdrView = m_pShell ? m_pShell->GetFormView() : nullptr; ENSURE_OR_THROW( pSdrView, "no current view" ); xControl.set( i_rKnownFormObj.GetUnoControl( *pSdrView, *pContainerWindow ), UNO_QUERY_THROW ); @@ -3200,7 +3200,7 @@ void FmXFormShell::CreateExternalView() if ( m_xExternalViewController == getActiveController() ) { Reference< runtime::XFormController > xAsFormController( m_xExternalViewController, UNO_QUERY ); - ControllerFeatures aHelper( xAsFormController, NULL ); + ControllerFeatures aHelper( xAsFormController, nullptr ); (void)aHelper->commitCurrentControl(); } @@ -3617,7 +3617,7 @@ IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFirstTimeActivation, void*, void ) if ( impl_checkDisposed() ) return; - m_nActivationEvent = 0; + m_nActivationEvent = nullptr; SfxObjectShell* pDocument = m_pShell->GetObjectShell(); if ( pDocument && !pDocument->HasName() ) @@ -3696,7 +3696,7 @@ void FmXFormShell::impl_defaultCurrentForm_nothrow() return; FmFormView* pFormView = m_pShell->GetFormView(); - FmFormPage* pPage = pFormView ? pFormView->GetCurPage() : NULL; + FmFormPage* pPage = pFormView ? pFormView->GetCurPage() : nullptr; if ( !pPage ) return; @@ -4026,7 +4026,7 @@ SFX_IMPL_MENU_CONTROL(ControlConversionMenuController, SfxBoolItem); ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nId, Menu& _rMenu, SfxBindings& _rBindings ) :SfxMenuControl( _nId, _rBindings ) ,m_pMainMenu( &_rMenu ) - ,m_pConversionMenu( NULL ) + ,m_pConversionMenu( nullptr ) { if ( _nId == SID_FM_CHANGECONTROLTYPE ) { @@ -4045,7 +4045,7 @@ ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI ControlConversionMenuController::~ControlConversionMenuController() { - m_pMainMenu->SetPopupMenu(SID_FM_CHANGECONTROLTYPE, NULL); + m_pMainMenu->SetPopupMenu(SID_FM_CHANGECONTROLTYPE, nullptr); delete m_pConversionMenu; } diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index ca58fe62c2fa..bf563e705ea9 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -87,7 +87,7 @@ namespace svxform { "text", 0 }, { "null", 1 }, { "non-null", 2 }, - { NULL, -1 } + { nullptr, -1 } }; return s_aSearchForTypeMap; } @@ -100,7 +100,7 @@ namespace svxform { "beginning-of-field", MATCHING_BEGINNING }, { "end-of-field", MATCHING_END }, { "complete-field", MATCHING_WHOLETEXT }, - { NULL, -1 } + { nullptr, -1 } }; return s_aSearchPositionMap; } diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index d96ef9390d7a..ac5f78dbd59f 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -97,7 +97,7 @@ FmRecordCountListener::FmRecordCountListener(const Reference< css::sdbc::XResult if (::comphelper::getBOOL(m_xListening->getPropertyValue(FM_PROP_ROWCOUNTFINAL))) { - m_xListening = NULL; + m_xListening = nullptr; // there's nothing to do as the record count is already known return; } @@ -128,7 +128,7 @@ void FmRecordCountListener::DisConnect() { if(m_xListening.is()) m_xListening->removePropertyChangeListener(FM_PROP_ROWCOUNT, static_cast<css::beans::XPropertyChangeListener*>(this)); - m_xListening = NULL; + m_xListening = nullptr; } @@ -364,7 +364,7 @@ OUString FmSearchEngine::FormatField(sal_Int32 nWhich) if (m_bUsingTextComponents) { DBG_ASSERT((sal_uInt32)nWhich < m_aControlTexts.size(), "FmSearchEngine::FormatField(sal_Int32) : invalid position !"); - DBG_ASSERT(m_aControlTexts[nWhich] != NULL, "FmSearchEngine::FormatField(sal_Int32) : invalid object in array !"); + DBG_ASSERT(m_aControlTexts[nWhich] != nullptr, "FmSearchEngine::FormatField(sal_Int32) : invalid object in array !"); DBG_ASSERT(m_aControlTexts[nWhich]->getControl().is(), "FmSearchEngine::FormatField : invalid control !"); if (m_nCurrentFieldIndex != -1) @@ -1170,7 +1170,7 @@ void FmSearchEngine::ImplStartNextSearch() else { SearchNextImpl(); - LINK(this, FmSearchEngine, OnSearchTerminated).Call(NULL); + LINK(this, FmSearchEngine, OnSearchTerminated).Call(nullptr); } } @@ -1232,7 +1232,7 @@ void FmSearchEngine::StartOverSpecial(bool _bSearchForNull) void FmSearchEngine::InvalidatePreviousLoc() { - m_aPreviousLocBookmark.setValue(0,cppu::UnoType<void>::get()); + m_aPreviousLocBookmark.setValue(nullptr,cppu::UnoType<void>::get()); m_iterPreviousLocField = m_arrUsedFields.end(); } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 280d0ac3ba83..89a608b80a82 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -419,7 +419,7 @@ namespace svx SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool(); const SfxSlot* pSlot = rSlotPool.GetSlot( _nSlotId ); - const sal_Char* pAsciiUnoName = NULL; + const sal_Char* pAsciiUnoName = nullptr; if ( pSlot ) { pAsciiUnoName = pSlot->GetUnoName(); @@ -486,7 +486,7 @@ namespace svx static vcl::Window* lcl_getWindow( const Reference< XControl >& _rxControl ) { - vcl::Window* pWindow = NULL; + vcl::Window* pWindow = nullptr; try { Reference< XWindowPeer > xControlPeer; @@ -1223,7 +1223,7 @@ namespace svx // if we found a rich text control, we need context menu support if ( m_bActiveControlIsRichText ) { - DBG_ASSERT( NULL == m_aContextMenuObserver.get(), "FmTextControlShell::controlActivated: already have an observer!" ); + DBG_ASSERT( nullptr == m_aContextMenuObserver.get(), "FmTextControlShell::controlActivated: already have an observer!" ); m_aContextMenuObserver = MouseListenerAdapter( new FmMouseListenerAdapter( _rxControl, this ) ); } @@ -1256,7 +1256,7 @@ namespace svx // #i51621# / 2005-08-19 / frank.schoenheit@sun.com // bool bHaveAnyServeableSlots = m_xActiveTextComponent.is() || !m_aControlFeatures.empty(); // LEM: not calling m_aControlActivatonHandler causes fdo#63695, so disable this hack for now. - m_aControlActivationHandler.Call( NULL ); + m_aControlActivationHandler.Call( nullptr ); m_bNeedClipboardInvalidation = true; } @@ -1310,7 +1310,7 @@ namespace svx Reference< XDispatch > xDispatcher = _rxProvider->queryDispatch( aFeatureURL, OUString(), 0xFF ); if ( xDispatcher.is() ) return new FmTextControlFeature( xDispatcher, aFeatureURL, _nSlot, this ); - return NULL; + return nullptr; } diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 233cc82eeba0..8db5d5346f65 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -251,9 +251,9 @@ void CursorWrapper::ImplConstruct(const Reference< css::sdbc::XResultSet>& _rxCu if ( !m_xMoveOperations.is() || !m_xBookmarkOperations.is() || !m_xColumnsSupplier.is() || !m_xPropertyAccess.is() ) { // all or nothing !! - m_xMoveOperations = NULL; - m_xBookmarkOperations = NULL; - m_xColumnsSupplier = NULL; + m_xMoveOperations = nullptr; + m_xBookmarkOperations = nullptr; + m_xColumnsSupplier = nullptr; } else m_xGeneric = m_xMoveOperations.get(); @@ -267,9 +267,9 @@ const CursorWrapper& CursorWrapper::operator=(const Reference< css::sdbc::XRowSe m_xColumnsSupplier.set(_rxCursor, UNO_QUERY); if (!m_xMoveOperations.is() || !m_xBookmarkOperations.is() || !m_xColumnsSupplier.is()) { // all or nothing !! - m_xMoveOperations = NULL; - m_xBookmarkOperations = NULL; - m_xColumnsSupplier = NULL; + m_xMoveOperations = nullptr; + m_xBookmarkOperations = nullptr; + m_xColumnsSupplier = nullptr; } return *this; } @@ -277,7 +277,7 @@ const CursorWrapper& CursorWrapper::operator=(const Reference< css::sdbc::XRowSe FmXDisposeListener::~FmXDisposeListener() { - setAdapter(NULL); + setAdapter(nullptr); } @@ -287,7 +287,7 @@ void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter) { ::osl::MutexGuard aGuard(m_rMutex); m_pAdapter->release(); - m_pAdapter = NULL; + m_pAdapter = nullptr; } if (pAdapter) @@ -325,10 +325,10 @@ void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& _Source) thr if (m_pListener) { m_pListener->disposing(_Source, m_nId); - m_pListener->setAdapter(NULL); - m_pListener = NULL; + m_pListener->setAdapter(nullptr); + m_pListener = nullptr; } - m_xObject = NULL; + m_xObject = nullptr; } @@ -339,10 +339,10 @@ void FmXDisposeMultiplexer::dispose() Reference< css::lang::XEventListener> xPreventDelete(this); m_xObject->removeEventListener(this); - m_xObject = NULL; + m_xObject = nullptr; - m_pListener->setAdapter(NULL); - m_pListener = NULL; + m_pListener->setAdapter(nullptr); + m_pListener = nullptr; } } diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index b4bc5688af17..0be8b170021d 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -170,7 +170,7 @@ OUString static_STR_UNDO_PROPERTY; FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel) :rModel( _rModel ) - ,m_pPropertySetCache( NULL ) + ,m_pPropertySetCache( nullptr ) ,m_pScriptingEnv( ::svxform::createDefaultFormScriptingEnvironment( _rModel ) ) ,m_Locks( 0 ) ,bReadOnly( false ) @@ -315,7 +315,7 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { case SFX_HINT_DYING: dispose(); - rModel.SetObjectShell( NULL ); + rModel.SetObjectShell( nullptr ); break; case SFX_HINT_MODECHANGED: ModeChanged(); @@ -1056,7 +1056,7 @@ FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod, m_aEvents = xManager->getScriptEvents(m_nIndex); } else - m_xElement = NULL; + m_xElement = nullptr; // we now own the element m_xOwnElement = m_xElement; @@ -1111,7 +1111,7 @@ void FmUndoContainerAction::implReInsert( ) xManager->registerScriptEvents( m_nIndex, m_aEvents ); // we don't own the object anymore - m_xOwnElement = NULL; + m_xOwnElement = nullptr; } } diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 0422871d55d1..788d7d62dbd5 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -92,7 +92,7 @@ FmFormView::FmFormView( FmFormModel* pModel, OutputDevice* pOut ) void FmFormView::Init() { - pFormShell = NULL; + pFormShell = nullptr; pImpl = new FmXFormView(this); pImpl->acquire(); @@ -122,7 +122,7 @@ void FmFormView::Init() SfxObjectShell* pObjShell = pFormModel->GetObjectShell(); if ( pObjShell && pObjShell->GetMedium() ) { - const SfxPoolItem *pItem=0; + const SfxPoolItem *pItem=nullptr; if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, false, &pItem ) == SfxItemState::SET ) { ::comphelper::NamedValueCollection aComponentData( static_cast<const SfxUnoAnyItem*>(pItem)->GetValue() ); @@ -139,18 +139,18 @@ void FmFormView::Init() FmFormView::~FmFormView() { if( pFormShell ) - pFormShell->SetView( NULL ); + pFormShell->SetView( nullptr ); pImpl->notifyViewDying(); pImpl->release(); - pImpl = NULL; + pImpl = nullptr; } FmFormPage* FmFormView::GetCurPage() { SdrPageView* pPageView = GetSdrPageView(); - FmFormPage* pCurPage = pPageView ? dynamic_cast<FmFormPage*>( pPageView->GetPage() ) : NULL; + FmFormPage* pCurPage = pPageView ? dynamic_cast<FmFormPage*>( pPageView->GetPage() ) : nullptr; return pCurPage; } @@ -164,11 +164,11 @@ void FmFormView::MarkListHasChanged() FmFormObj* pObj = getMarkedGrid(); if ( pImpl->m_pMarkedGrid && pImpl->m_pMarkedGrid != pObj ) { - pImpl->m_pMarkedGrid = NULL; + pImpl->m_pMarkedGrid = nullptr; if ( pImpl->m_xWindow.is() ) { pImpl->m_xWindow->removeFocusListener(pImpl); - pImpl->m_xWindow = NULL; + pImpl->m_xWindow = nullptr; } SetMoveOutside(false); //OLMRefreshAllIAOManagers(); @@ -194,7 +194,7 @@ namespace return pPageWindow; } } - return NULL; + return nullptr; } } @@ -422,7 +422,7 @@ SdrObject* FmFormView::CreateFieldControl(const OUString& rFieldDesc) const OUString sFieldName = rFieldDesc.getToken(3,sal_Unicode(11)); if (sFieldName.isEmpty() || sObjectName.isEmpty() || sDataSource.isEmpty()) - return NULL; + return nullptr; ODataAccessDescriptor aColumnDescriptor; aColumnDescriptor.setDataSource(sDataSource); @@ -558,7 +558,7 @@ bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) FmFormObj* FmFormView::getMarkedGrid() const { - FmFormObj* pFormObject = NULL; + FmFormObj* pFormObject = nullptr; const SdrMarkList& rMarkList = GetMarkedObjectList(); if ( 1 == rMarkList.GetMarkCount() ) { @@ -570,7 +570,7 @@ FmFormObj* FmFormView::getMarkedGrid() const { Reference< XServiceInfo > xServInfo( pFormObject->GetUnoControlModel(), UNO_QUERY ); if ( !xServInfo.is() || !xServInfo->supportsService( FM_SUN_COMPONENT_GRIDCONTROL ) ) - pFormObject = NULL; + pFormObject = nullptr; } } } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 4d04ee005ade..a81b2044123c 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -183,7 +183,7 @@ FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference< { Reference< XForm > xForm( xForms->getByIndex(i), UNO_QUERY ); if ( xForm.is() ) - setController( xForm, NULL ); + setController( xForm, nullptr ); } } catch (const Exception&) @@ -400,13 +400,13 @@ void FormViewPageWindowAdapter::updateTabOrder( const Reference< XForm >& _rxFor FmXFormView::FmXFormView(FmFormView* _pView ) - :m_pMarkedGrid(NULL) + :m_pMarkedGrid(nullptr) ,m_pView(_pView) - ,m_nActivationEvent(0) - ,m_nErrorMessageEvent( 0 ) - ,m_nAutoFocusEvent( 0 ) - ,m_nControlWizardEvent( 0 ) - ,m_pWatchStoredList( NULL ) + ,m_nActivationEvent(nullptr) + ,m_nErrorMessageEvent( nullptr ) + ,m_nAutoFocusEvent( nullptr ) + ,m_nControlWizardEvent( nullptr ) + ,m_pWatchStoredList( nullptr ) ,m_bFirstActivation( true ) ,m_isTabOrderUpdateSuspended( false ) { @@ -418,25 +418,25 @@ void FmXFormView::cancelEvents() if ( m_nActivationEvent ) { Application::RemoveUserEvent( m_nActivationEvent ); - m_nActivationEvent = 0; + m_nActivationEvent = nullptr; } if ( m_nErrorMessageEvent ) { Application::RemoveUserEvent( m_nErrorMessageEvent ); - m_nErrorMessageEvent = 0; + m_nErrorMessageEvent = nullptr; } if ( m_nAutoFocusEvent ) { Application::RemoveUserEvent( m_nAutoFocusEvent ); - m_nAutoFocusEvent = 0; + m_nAutoFocusEvent = nullptr; } if ( m_nControlWizardEvent ) { Application::RemoveUserEvent( m_nControlWizardEvent ); - m_nControlWizardEvent = 0; + m_nControlWizardEvent = nullptr; } } @@ -444,7 +444,7 @@ void FmXFormView::cancelEvents() void FmXFormView::notifyViewDying( ) { DBG_ASSERT( m_pView, "FmXFormView::notifyViewDying: my view already died!" ); - m_pView = NULL; + m_pView = nullptr; cancelEvents(); } @@ -466,7 +466,7 @@ FmXFormView::~FmXFormView() cancelEvents(); delete m_pWatchStoredList; - m_pWatchStoredList = NULL; + m_pWatchStoredList = nullptr; } // EventListener @@ -543,7 +543,7 @@ PFormViewPageWindowAdapter FmXFormView::findWindow( const Reference< XControlCon if ( _rxCC == (*i)->getControlContainer() ) return *i; } - return NULL; + return nullptr; } @@ -598,7 +598,7 @@ void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC ) void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) { - DBG_ASSERT( 0 == m_nErrorMessageEvent, "FmXFormView::displayAsyncErrorMessage: not too fast, please!" ); + DBG_ASSERT( nullptr == m_nErrorMessageEvent, "FmXFormView::displayAsyncErrorMessage: not too fast, please!" ); // This should not happen - usually, the PostUserEvent is faster than any possible user // interaction which could trigger a new error. If it happens, we need a queue for the events. m_aAsyncError = _rEvent; @@ -608,7 +608,7 @@ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) IMPL_LINK_NOARG_TYPED(FmXFormView, OnDelayedErrorMessage, void*, void) { - m_nErrorMessageEvent = 0; + m_nErrorMessageEvent = nullptr; displayException( m_aAsyncError ); } @@ -716,7 +716,7 @@ namespace IMPL_LINK_NOARG_TYPED(FmXFormView, OnActivate, void*, void) { - m_nActivationEvent = 0; + m_nActivationEvent = nullptr; if ( !m_pView ) { @@ -735,7 +735,7 @@ IMPL_LINK_NOARG_TYPED(FmXFormView, OnActivate, void*, void) find_active_databaseform fad(pShImpl->getActiveController()); vcl::Window* pWindow = const_cast<vcl::Window*>(static_cast<const vcl::Window*>(m_pView->GetActualOutDev())); - PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; + PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? nullptr : m_aPageWindowAdapters[0]; for ( PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin(); i != m_aPageWindowAdapters.end(); ++i @@ -782,12 +782,12 @@ void FmXFormView::Activate(bool bSync) if (m_nActivationEvent) { Application::RemoveUserEvent(m_nActivationEvent); - m_nActivationEvent = 0; + m_nActivationEvent = nullptr; } if (bSync) { - LINK(this,FmXFormView,OnActivate).Call(NULL); + LINK(this,FmXFormView,OnActivate).Call(nullptr); } else m_nActivationEvent = Application::PostUserEvent(LINK(this,FmXFormView,OnActivate)); @@ -799,18 +799,18 @@ void FmXFormView::Deactivate(bool bDeactivateController) if (m_nActivationEvent) { Application::RemoveUserEvent(m_nActivationEvent); - m_nActivationEvent = 0; + m_nActivationEvent = nullptr; } - FmXFormShell* pShImpl = m_pView->GetFormShell() ? m_pView->GetFormShell()->GetImpl() : NULL; + FmXFormShell* pShImpl = m_pView->GetFormShell() ? m_pView->GetFormShell()->GetImpl() : nullptr; if (pShImpl && bDeactivateController) - pShImpl->setActiveController( NULL ); + pShImpl->setActiveController( nullptr ); } FmFormShell* FmXFormView::GetFormShell() const { - return m_pView ? m_pView->GetFormShell() : NULL; + return m_pView ? m_pView->GetFormShell() : nullptr; } void FmXFormView::AutoFocus( bool _bSync ) @@ -819,7 +819,7 @@ void FmXFormView::AutoFocus( bool _bSync ) Application::RemoveUserEvent(m_nAutoFocusEvent); if ( _bSync ) - OnAutoFocus( NULL ); + OnAutoFocus( nullptr ); else m_nAutoFocusEvent = Application::PostUserEvent(LINK(this, FmXFormView, OnAutoFocus)); } @@ -955,19 +955,19 @@ Reference< XFormController > FmXFormView::getFormController( const Reference< XF IMPL_LINK_NOARG_TYPED(FmXFormView, OnAutoFocus, void*, void) { - m_nAutoFocusEvent = 0; + m_nAutoFocusEvent = nullptr; // go to the first form of our page, examine it's TabController, go to it's first (in terms of the tab order) // control, give it the focus - SdrPageView *pPageView = m_pView ? m_pView->GetSdrPageView() : NULL; - SdrPage *pSdrPage = pPageView ? pPageView->GetPage() : NULL; + SdrPageView *pPageView = m_pView ? m_pView->GetSdrPageView() : nullptr; + SdrPage *pSdrPage = pPageView ? pPageView->GetPage() : nullptr; // get the forms collection of the page we belong to FmFormPage* pPage = dynamic_cast<FmFormPage*>( pSdrPage ); Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms(), UNO_QUERY ) : Reference< XIndexAccess >() ); - const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; - const vcl::Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : NULL; + const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? nullptr : m_aPageWindowAdapters[0]; + const vcl::Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : nullptr; ENSURE_OR_RETURN_VOID( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!" ); @@ -1006,7 +1006,7 @@ IMPL_LINK_NOARG_TYPED(FmXFormView, OnAutoFocus, void*, void) // ensure that the control is visible // 80210 - 12/07/00 - FS - const vcl::Window* pCurrentWindow = m_pView ? dynamic_cast<const vcl::Window*>(m_pView->GetActualOutDev()) : NULL; + const vcl::Window* pCurrentWindow = m_pView ? dynamic_cast<const vcl::Window*>(m_pView->GetActualOutDev()) : nullptr; if ( pCurrentWindow ) { awt::Rectangle aRect = xControlWindow->getPosSize(); @@ -1023,8 +1023,8 @@ IMPL_LINK_NOARG_TYPED(FmXFormView, OnAutoFocus, void*, void) void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject ) { - FmFormShell* pShell = m_pView ? m_pView->GetFormShell() : NULL; - FmXFormShell* pShellImpl = pShell ? pShell->GetImpl() : NULL; + FmFormShell* pShell = m_pView ? m_pView->GetFormShell() : nullptr; + FmXFormShell* pShellImpl = pShell ? pShell->GetImpl() : nullptr; OSL_ENSURE( pShellImpl, "FmXFormView::onCreatedFormObject: no form shell!" ); if ( !pShellImpl ) return; @@ -1059,17 +1059,17 @@ void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject ) void FmXFormView::breakCreateFormObject() { - if (m_nControlWizardEvent != 0) + if (m_nControlWizardEvent != nullptr) { Application::RemoveUserEvent(m_nControlWizardEvent); - m_nControlWizardEvent = 0; + m_nControlWizardEvent = nullptr; } m_xLastCreatedControlModel.clear(); } IMPL_LINK_NOARG_TYPED( FmXFormView, OnStartControlWizard, void*, void ) { - m_nControlWizardEvent = 0; + m_nControlWizardEvent = nullptr; OSL_PRECOND( m_xLastCreatedControlModel.is(), "FmXFormView::OnStartControlWizard: illegal call!" ); if ( !m_xLastCreatedControlModel.is() ) return; @@ -1084,7 +1084,7 @@ IMPL_LINK_NOARG_TYPED( FmXFormView, OnStartControlWizard, void*, void ) DBG_UNHANDLED_EXCEPTION(); } - const sal_Char* pWizardAsciiName = NULL; + const sal_Char* pWizardAsciiName = nullptr; switch ( nClassId ) { case FormComponentType::GRIDCONTROL: @@ -1119,7 +1119,7 @@ IMPL_LINK_NOARG_TYPED( FmXFormView, OnStartControlWizard, void*, void ) if ( !xWizard.is() ) { - ShowServiceNotAvailableError( NULL, OUString::createFromAscii(pWizardAsciiName), true ); + ShowServiceNotAvailableError( nullptr, OUString::createFromAscii(pWizardAsciiName), true ); } else { @@ -1142,7 +1142,7 @@ IMPL_LINK_NOARG_TYPED( FmXFormView, OnStartControlWizard, void*, void ) namespace { void lcl_insertIntoFormComponentHierarchy_throw( const FmFormView& _rView, const SdrUnoObj& _rSdrObj, - const Reference< XDataSource >& _rxDataSource = NULL, const OUString& _rDataSourceName = OUString(), + const Reference< XDataSource >& _rxDataSource = nullptr, const OUString& _rDataSourceName = OUString(), const OUString& _rCommand = OUString(), const sal_Int32 _nCommandType = -1 ) { FmFormPage& rPage = static_cast< FmFormPage& >( *_rView.GetSdrPageView()->GetPage() ); @@ -1164,7 +1164,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor { // not if we're in design mode if ( !m_pView->IsDesignMode() ) - return NULL; + return nullptr; OUString sCommand, sFieldName; sal_Int32 nCommandType = CommandType::COMMAND; @@ -1225,14 +1225,14 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor if (aError.Reason.hasValue()) { displayAsyncErrorMessage( aError ); - return NULL; + return nullptr; } // need a data source and a connection here if (!xDataSource.is() || !xConnection.is()) { OSL_FAIL("FmXFormView::implCreateFieldControl : could not retrieve the data source or the connection!"); - return NULL; + return nullptr; } Reference< XComponent > xKeepFieldsAlive; @@ -1248,7 +1248,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor if (xFields.is() && xFields->hasByName(sFieldName)) xFields->getByName(sFieldName) >>= xField; if ( !xField.is() ) - return NULL; + return nullptr; Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( xConnection ), UNO_SET_THROW ); Reference< XNumberFormats > xNumberFormats( xSupplier->getNumberFormats(), UNO_SET_THROW ); @@ -1257,7 +1257,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor // nur fuer Textgroesse - OutputDevice* pOutDev = NULL; + OutputDevice* pOutDev = nullptr; if (m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW) pOutDev = const_cast<OutputDevice*>(m_pView->GetActualOutDev()); else @@ -1282,11 +1282,11 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor } if ( !pOutDev ) - return NULL; + return nullptr; sal_Int32 nDataType = ::comphelper::getINT32(xField->getPropertyValue(FM_PROP_FIELDTYPE)); if ((DataType::BINARY == nDataType) || (DataType::VARBINARY == nDataType)) - return NULL; + return nullptr; // determine the control type by examining the data type of the bound column @@ -1312,7 +1312,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor break; case DataType::BINARY: case DataType::VARBINARY: - return NULL; + return nullptr; case DataType::BIT: case DataType::BOOLEAN: nOBJID = OBJ_FM_CHECKBOX; @@ -1345,15 +1345,15 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor break; } if (!nOBJID) - return NULL; + return nullptr; - SdrUnoObj* pLabel( NULL ); - SdrUnoObj* pControl( NULL ); + SdrUnoObj* pLabel( nullptr ); + SdrUnoObj* pControl( nullptr ); if ( !createControlLabelPair( *pOutDev, 0, 0, xField, xNumberFormats, nOBJID, sLabelPostfix, pLabel, pControl, xDataSource, sDataSource, sCommand, nCommandType ) ) { - return NULL; + return nullptr; } @@ -1370,7 +1370,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor if ( bDateNTimeField ) { // so far we created a date field only, but we also need a time field - pLabel = pControl = NULL; + pLabel = pControl = nullptr; if ( createControlLabelPair( *pOutDev, 0, 1000, xField, xNumberFormats, OBJ_FM_TIMEFIELD, SVX_RESSTR(RID_STR_POSTFIX_TIME), pLabel, pControl, xDataSource, sDataSource, sCommand, nCommandType ) @@ -1389,7 +1389,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor } - return NULL; + return nullptr; } @@ -1397,7 +1397,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ { // not if we're in design mode if ( !m_pView->IsDesignMode() ) - return NULL; + return nullptr; Reference< XComponent > xKeepFieldsAlive; @@ -1410,7 +1410,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ // nur fuer Textgroesse - OutputDevice* pOutDev = NULL; + OutputDevice* pOutDev = nullptr; if (m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW) pOutDev = const_cast<OutputDevice*>(m_pView->GetActualOutDev()); else @@ -1435,7 +1435,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ } if ( !pOutDev ) - return NULL; + return nullptr; // The service name decides which control should be created @@ -1452,13 +1452,13 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ // xform control or submission button? if ( !xSubmission.is() ) { - SdrUnoObj* pLabel( NULL ); - SdrUnoObj* pControl( NULL ); - if ( !createControlLabelPair( *pOutDev, 0, 0, NULL, xNumberFormats, nOBJID, sLabelPostfix, + SdrUnoObj* pLabel( nullptr ); + SdrUnoObj* pControl( nullptr ); + if ( !createControlLabelPair( *pOutDev, 0, 0, nullptr, xNumberFormats, nOBJID, sLabelPostfix, pLabel, pControl ) ) { - return NULL; + return nullptr; } @@ -1491,7 +1491,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ const MapMode eSourceMode(MAP_100TH_MM); const sal_uInt16 nObjID = OBJ_FM_BUTTON; ::Size controlSize(4000, 500); - FmFormObj *pControl = static_cast<FmFormObj*>(SdrObjFactory::MakeNewObject( FmFormInventor, nObjID, NULL )); + FmFormObj *pControl = static_cast<FmFormObj*>(SdrObjFactory::MakeNewObject( FmFormInventor, nObjID, nullptr )); controlSize.Width() = Fraction(controlSize.Width(), 1) * eTargetMode.GetScaleX(); controlSize.Height() = Fraction(controlSize.Height(), 1) * eTargetMode.GetScaleY(); ::Point controlPos( OutputDevice::LogicToLogic( ::Point( controlSize.Width(), 0 ), eSourceMode, eTargetMode ) ); @@ -1517,7 +1517,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ } - return NULL; + return nullptr; } @@ -1530,7 +1530,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO { if ( !createControlLabelPair( _rOutDev, _nXOffsetMM, _nYOffsetMM, _rxField, _rxNumberFormats, _nControlObjectID, _rFieldPostfix, FmFormInventor, OBJ_FM_FIXEDTEXT, - NULL, NULL, NULL, _rpLabel, _rpControl ) + nullptr, nullptr, nullptr, _rpLabel, _rpControl ) ) return false; @@ -1745,7 +1745,7 @@ void FmXFormView::stopMarkListWatching() { m_pWatchStoredList->EndListeningAll(); delete m_pWatchStoredList; - m_pWatchStoredList = NULL; + m_pWatchStoredList = nullptr; } } @@ -1754,8 +1754,8 @@ void FmXFormView::startMarkListWatching() { if ( !m_pWatchStoredList ) { - FmFormModel* pModel = GetFormShell() ? GetFormShell()->GetFormModel() : NULL; - DBG_ASSERT( pModel != NULL, "FmXFormView::startMarkListWatching: shell has no model!" ); + FmFormModel* pModel = GetFormShell() ? GetFormShell()->GetFormModel() : nullptr; + DBG_ASSERT( pModel != nullptr, "FmXFormView::startMarkListWatching: shell has no model!" ); if (pModel) { m_pWatchStoredList = new ObjectRemoveListener( this ); @@ -1835,7 +1835,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) _rRestoredMarkList.Clear(); const SdrMarkList& rCurrentList = m_pView->GetMarkedObjectList(); - FmFormPage* pPage = GetFormShell() ? GetFormShell()->GetCurPage() : NULL; + FmFormPage* pPage = GetFormShell() ? GetFormShell()->GetCurPage() : nullptr; if (pPage) { if (rCurrentList.GetMarkCount()) @@ -1941,7 +1941,7 @@ void FmXFormView::removeGridWindowListening() { m_pView->SetMoveOutside( false, FmFormView::ImplAccess() ); } - m_xWindow = NULL; + m_xWindow = nullptr; } } diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 671697fe7cc9..853aed3cd538 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -352,7 +352,7 @@ namespace svxform "ParaUserDefinedAttributes", "NumberingIsNumber", "ParaIsConnectBorder", - NULL + nullptr }; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 925da1d21627..e905f757bf57 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -609,7 +609,7 @@ FormController::~FormController() // Freigeben der Aggregation if ( m_xAggregate.is() ) { - m_xAggregate->setDelegator( NULL ); + m_xAggregate->setDelegator( nullptr ); m_xAggregate.clear(); } @@ -1173,8 +1173,8 @@ void FormController::disposing() m_aFilterRows.clear(); ::osl::MutexGuard aGuard( m_aMutex ); - m_xActiveControl = NULL; - implSetCurrentControl( NULL ); + m_xActiveControl = nullptr; + implSetCurrentControl( nullptr ); // clean up our children for (FmFormControllers::const_iterator i = m_aChildren.begin(); @@ -1209,9 +1209,9 @@ void FormController::disposing() if (m_bDBConnection) unload(); - setContainer( NULL ); - setModel( NULL ); - setParent( NULL ); + setContainer( nullptr ); + setModel( nullptr ); + setParent( nullptr ); ::comphelper::disposeComponent( m_xComposer ); @@ -1328,8 +1328,8 @@ bool FormController::replaceControl( const Reference< XControl >& _rxExistentCon if ( bReplacedWasActive ) { - m_xActiveControl = NULL; - implSetCurrentControl( NULL ); + m_xActiveControl = nullptr; + implSetCurrentControl( nullptr ); } else if ( bReplacedWasCurrent ) { @@ -1783,7 +1783,7 @@ void FormController::focusLost(const FocusEvent& e) throw( RuntimeException, std Reference< XControl > xNextControl = isInList(xNext); if (!xNextControl.is()) { - m_xActiveControl = NULL; + m_xActiveControl = nullptr; m_aDeactivationEvent.Call(); } } @@ -1873,8 +1873,8 @@ void FormController::setModel(const Reference< XTabControllerModel > & Model) th // only if both ifaces exit, the controller will work successful if (!m_xModelAsIndex.is() || !m_xModelAsManager.is()) { - m_xModelAsManager = NULL; - m_xModelAsIndex = NULL; + m_xModelAsManager = nullptr; + m_xModelAsIndex = nullptr; } if (m_xModelAsIndex.is()) @@ -2311,7 +2311,7 @@ void FormController::stopControlModifyListening(const Reference< XControl > & xC { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); - bool bModifyListening = lcl_shouldListenForModifications( xControl, NULL ); + bool bModifyListening = lcl_shouldListenForModifications( xControl, nullptr ); // kuenstliches while while (bModifyListening) @@ -2591,7 +2591,7 @@ void FormController::loaded(const EventObject& rEvent) throw( RuntimeException, } Reference< XColumnsSupplier > xFormColumns( xForm, UNO_QUERY ); - m_pColumnInfoCache.reset( xFormColumns.is() ? new ColumnInfoCache( xFormColumns ) : NULL ); + m_pColumnInfoCache.reset( xFormColumns.is() ? new ColumnInfoCache( xFormColumns ) : nullptr ); updateAllDispatchers(); } @@ -3511,7 +3511,7 @@ sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( Runt vcl::Window* FormController::getDialogParentWindow() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); - vcl::Window* pParentWindow = NULL; + vcl::Window* pParentWindow = nullptr; try { Reference< XControl > xContainerControl( getContainer(), UNO_QUERY_THROW ); @@ -3590,7 +3590,7 @@ Reference< XControl > FormController::locateControl( const Reference< XControlMo { DBG_UNHANDLED_EXCEPTION(); } - return NULL; + return nullptr; } @@ -4200,7 +4200,7 @@ bool FormController::ensureInteractionHandler() return false; m_bAttemptedHandlerCreation = true; - m_xInteractionHandler = InteractionHandler::createWithParent(m_xComponentContext, 0); + m_xInteractionHandler = InteractionHandler::createWithParent(m_xComponentContext, nullptr); return m_xInteractionHandler.is(); } diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index d04b2c5a0840..0baab098e9ad 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -194,14 +194,14 @@ namespace svx ControllerFeatures::ControllerFeatures( IControllerFeatureInvalidation* _pInvalidationCallback ) :m_pInvalidationCallback( _pInvalidationCallback ) - ,m_pImpl( NULL ) + ,m_pImpl( nullptr ) { } ControllerFeatures::ControllerFeatures( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback ) :m_pInvalidationCallback( _pInvalidationCallback ) - ,m_pImpl( NULL ) + ,m_pImpl( nullptr ) { assign( _rxController ); } @@ -227,7 +227,7 @@ namespace svx { m_pImpl->dispose(); m_pImpl->release(); - m_pImpl = NULL; + m_pImpl = nullptr; } } diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index e2abd5ba493d..49afca456ad4 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -161,7 +161,7 @@ namespace svxform // Don't reset m_xIntercepted: It may be needed by our owner to check for which object we were // responsible. As we hold the object with a weak reference only, this should be no problem. // 88936 - 23.07.2001 - frank.schoenheit@sun.com - m_pMaster = NULL; + m_pMaster = nullptr; m_pMutex = &m_aFallback; m_bListening = false; } diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index 664f6a1239ad..3f213db05755 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -74,7 +74,7 @@ namespace svx m_aLastKnownState = aUnoState.State; m_bLastKnownEnabled = aUnoState.IsEnabled; - notifyStatus( NULL, aGuard ); + notifyStatus( nullptr, aGuard ); } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index b09288749a61..02a1f9cf70ad 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -113,10 +113,10 @@ namespace svxform NavigatorTree::NavigatorTree( vcl::Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL ) // #100258# OJ WB_HSCROLL added ,m_aControlExchange(this) - ,m_pNavModel( NULL ) - ,m_pRootEntry(NULL) - ,m_pEditEntry(NULL) - ,nEditEvent(0) + ,m_pNavModel( nullptr ) + ,m_pRootEntry(nullptr) + ,m_pEditEntry(nullptr) + ,nEditEvent(nullptr) ,m_sdiState(SDI_DIRTY) ,m_aTimerTriggered(-1,-1) ,m_aDropActionType( DA_SCROLLUP ) @@ -171,7 +171,7 @@ namespace svxform if (m_aSynchronizeTimer.IsActive()) m_aSynchronizeTimer.Stop(); - DBG_ASSERT(GetNavModel() != NULL, "NavigatorTree::~NavigatorTree : unexpected : no ExplorerModel"); + DBG_ASSERT(GetNavModel() != nullptr, "NavigatorTree::~NavigatorTree : unexpected : no ExplorerModel"); EndListening( *m_pNavModel ); Clear(); delete m_pNavModel; @@ -195,7 +195,7 @@ namespace svxform FmFormShell* pOldShell = GetNavModel()->GetFormShell(); FmFormPage* pOldPage = GetNavModel()->GetFormPage(); - FmFormPage* pNewPage = pFormShell ? pFormShell->GetCurPage() : NULL; + FmFormPage* pNewPage = pFormShell ? pFormShell->GetCurPage() : nullptr; if ((pOldShell != pFormShell) || (pOldPage != pNewPage)) { @@ -318,7 +318,7 @@ namespace svxform { ptWhere = rEvt.GetMousePosPixel(); SvTreeListEntry* ptClickedOn = GetEntry(ptWhere); - if (ptClickedOn == NULL) + if (ptClickedOn == nullptr) break; if ( !IsSelected(ptClickedOn) ) { @@ -357,7 +357,7 @@ namespace svxform // create menu FmFormShell* pFormShell = GetNavModel()->GetFormShell(); - FmFormModel* pFormModel = pFormShell ? pFormShell->GetFormModel() : NULL; + FmFormModel* pFormModel = pFormShell ? pFormShell->GetFormModel() : nullptr; if( pFormShell && pFormModel ) { PopupMenu aContextMenu(SVX_RES(RID_FMEXPLORER_POPUPMENU)); @@ -536,7 +536,7 @@ namespace svxform SvTreeListEntry* NavigatorTree::FindEntry( FmEntryData* pEntryData ) { - if( !pEntryData ) return NULL; + if( !pEntryData ) return nullptr; SvTreeListEntry* pCurEntry = First(); while( pCurEntry ) { @@ -547,7 +547,7 @@ namespace svxform pCurEntry = Next( pCurEntry ); } - return NULL; + return nullptr; } @@ -594,7 +594,7 @@ namespace svxform // default-entry "Forms" Image aRootImage( m_aNavigatorImages.GetImage( RID_SVXIMG_FORMS ) ); m_pRootEntry = InsertEntry( SVX_RESSTR(RID_STR_FORMS), aRootImage, aRootImage, - NULL, false, 0 ); + nullptr, false, 0 ); } else if (!m_bMarkingObjects && dynamic_cast<const FmNavRequestSelectHint*>(&rHint)) { // if m_bMarkingObjects is sal_True, I mark objects myself @@ -965,7 +965,7 @@ namespace svxform const Reference< XInterface >* pControls = aControls.getConstArray(); FmFormShell* pFormShell = GetNavModel()->GetFormShell(); - FmFormModel* pFormModel = pFormShell ? pFormShell->GetFormModel() : NULL; + FmFormModel* pFormModel = pFormShell ? pFormShell->GetFormModel() : nullptr; // within undo if (pFormModel) @@ -1026,7 +1026,7 @@ namespace svxform // some data for the target bool bDropTargetIsForm = IsFormEntry(_pTargetEntry); - FmFormData* pTargetData = bDropTargetIsForm ? static_cast<FmFormData*>(_pTargetEntry->GetUserData()) : NULL; + FmFormData* pTargetData = bDropTargetIsForm ? static_cast<FmFormData*>(_pTargetEntry->GetUserData()) : nullptr; DBG_ASSERT( DND_ACTION_COPY != _nAction, "NavigatorTree::implExecuteDataTransfer: somebody changed the logics!" ); @@ -1036,7 +1036,7 @@ namespace svxform // shell and model FmFormShell* pFormShell = GetNavModel()->GetFormShell(); - FmFormModel* pFormModel = pFormShell ? pFormShell->GetFormModel() : NULL; + FmFormModel* pFormModel = pFormShell ? pFormShell->GetFormModel() : nullptr; if (!pFormModel) return DND_ACTION_NONE; @@ -1061,8 +1061,8 @@ namespace svxform { // some data of the current element SvTreeListEntry* pCurrent = *dropped; - DBG_ASSERT(pCurrent != NULL, "NavigatorTree::implExecuteDataTransfer: invalid entry"); - DBG_ASSERT(GetParent(pCurrent) != NULL, "NavigatorTree::implExecuteDataTransfer: invalid entry"); + DBG_ASSERT(pCurrent != nullptr, "NavigatorTree::implExecuteDataTransfer: invalid entry"); + DBG_ASSERT(GetParent(pCurrent) != nullptr, "NavigatorTree::implExecuteDataTransfer: invalid entry"); // don't drag root FmEntryData* pCurrentUserData = static_cast<FmEntryData*>(pCurrent->GetUserData()); @@ -1071,7 +1071,7 @@ namespace svxform Reference< XIndexContainer > xContainer(xCurrentChild->getParent(), UNO_QUERY); FmFormData* pCurrentParentUserData = static_cast<FmFormData*>(pCurrentUserData->GetParent()); - DBG_ASSERT(pCurrentParentUserData == NULL || dynamic_cast<const FmFormData*>( pCurrentParentUserData) != nullptr, "NavigatorTree::implExecuteDataTransfer: invalid parent"); + DBG_ASSERT(pCurrentParentUserData == nullptr || dynamic_cast<const FmFormData*>( pCurrentParentUserData) != nullptr, "NavigatorTree::implExecuteDataTransfer: invalid parent"); // remove from parent if (pCurrentParentUserData) @@ -1318,7 +1318,7 @@ namespace svxform if (!SvTreeListBox::EditingEntry( pEntry, rSelection )) return false; - return (pEntry && (pEntry->GetUserData() != NULL)); + return (pEntry && (pEntry->GetUserData() != nullptr)); // root, which isn't allowed to be renamed, has UserData=NULL } @@ -1391,9 +1391,9 @@ namespace svxform // get ParentForm if (!GetNavModel()->GetFormShell()) - return NULL; + return nullptr; if (!IsFormEntry(pParentEntry)) - return NULL; + return nullptr; FmFormData* pParentFormData = static_cast<FmFormData*>(pParentEntry->GetUserData()); Reference< XForm > xParentForm( pParentFormData->GetFormIface()); @@ -1403,7 +1403,7 @@ namespace svxform Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); Reference<XFormComponent> xNewComponent( xContext->getServiceManager()->createInstanceWithContext(rServiceName, xContext), UNO_QUERY); if (!xNewComponent.is()) - return NULL; + return nullptr; FmControlData* pNewFormControlData = new FmControlData( xNewComponent, m_aNavigatorImages, pParentFormData ); @@ -1457,7 +1457,7 @@ namespace svxform aNewName += OUString::number(i).getStr(); } - if( GetNavModel()->FindData(aNewName, pFormParentData,false) == NULL ) + if( GetNavModel()->FindData(aNewName, pFormParentData,false) == nullptr ) break; } @@ -1476,7 +1476,7 @@ namespace svxform if( !bRes ) { m_pEditEntry = pEntry; - nEditEvent = Application::PostUserEvent( LINK(this, NavigatorTree, OnEdit), NULL, true ); + nEditEvent = Application::PostUserEvent( LINK(this, NavigatorTree, OnEdit), nullptr, true ); } else SetCursor(pEntry, true); @@ -1486,9 +1486,9 @@ namespace svxform IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEdit, void*, void) { - nEditEvent = 0; + nEditEvent = nullptr; EditEntry( m_pEditEntry ); - m_pEditEntry = NULL; + m_pEditEntry = nullptr; } @@ -1693,8 +1693,8 @@ namespace svxform // see below for why we need this mapping from models to shapes FmFormView* pFormView = pFormShell->GetFormView(); - SdrPageView* pPageView = pFormView ? pFormView->GetSdrPageView() : NULL; - SdrPage* pPage = pPageView ? pPageView->GetPage() : NULL; + SdrPageView* pPageView = pFormView ? pFormView->GetSdrPageView() : nullptr; + SdrPage* pPage = pPageView ? pPageView->GetPage() : nullptr; DBG_ASSERT( pPage, "NavigatorTree::DeleteSelection: invalid form page!" ); MapModelToShape aModelShapes; @@ -1893,7 +1893,7 @@ namespace svxform while (pSelection) { FmEntryData* pCurrent = static_cast<FmEntryData*>(pSelection->GetUserData()); - if (pCurrent != NULL) + if (pCurrent != nullptr) { FmEntryDataArray::iterator it = arredToSelect.find(pCurrent); if ( it != arredToSelect.end() ) @@ -2024,7 +2024,7 @@ namespace svxform bool NavigatorTree::IsHiddenControl(FmEntryData* pEntryData) { - if (pEntryData == NULL) return false; + if (pEntryData == nullptr) return false; Reference< XPropertySet > xProperties( pEntryData->GetPropertySet() ); if (::comphelper::hasProperty(FM_PROP_CLASSID, xProperties)) diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 279932f00e8b..f949bd35019f 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -75,7 +75,7 @@ namespace svxform Reference< XFormComponent > xFormComponent(evt.Source, UNO_QUERY); Reference< XForm > xForm(evt.Source, UNO_QUERY); - FmEntryData* pEntryData( NULL ); + FmEntryData* pEntryData( nullptr ); if( xForm.is() ) pEntryData = m_pNavModel->FindData( xForm, m_pNavModel->GetRootList() ); else if( xFormComponent.is() ) @@ -187,9 +187,9 @@ namespace svxform } NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages ) - :m_pFormShell(NULL) - ,m_pFormPage(NULL) - ,m_pFormModel(NULL) + :m_pFormShell(nullptr) + ,m_pFormPage(nullptr) + ,m_pFormModel(nullptr) ,m_aNormalImages( _rNormalImages ) { m_pPropChangeList = new OFormComponentObserver(this); @@ -249,7 +249,7 @@ namespace svxform Reference< css::form::XForms > NavigatorTreeModel::GetForms() const { if( !m_pFormShell || !m_pFormShell->GetCurPage()) - return NULL; + return nullptr; else return m_pFormShell->GetCurPage()->GetForms(); } @@ -511,7 +511,7 @@ namespace svxform { // insert forms from root - if( pFormData == NULL ) + if( pFormData == nullptr ) { Reference< XIndexContainer > xForms(GetForms(), UNO_QUERY); if (!xForms.is()) @@ -580,7 +580,7 @@ namespace svxform // set ParentData Reference< XInterface > xIFace( xForm->getParent()); Reference< XForm > xParentForm(xIFace, UNO_QUERY); - FmFormData* pParentData = NULL; + FmFormData* pParentData = nullptr; if (xParentForm.is()) pParentData = static_cast<FmFormData*>(FindData( xParentForm, GetRootList() )); @@ -601,7 +601,7 @@ namespace svxform FmFormData* pParentData = static_cast<FmFormData*>(FindData( xForm, GetRootList() )); if( !pParentData ) { - pParentData = new FmFormData( xForm, m_aNormalImages, NULL ); + pParentData = new FmFormData( xForm, m_aNormalImages, nullptr ); Insert( pParentData ); } @@ -651,7 +651,7 @@ namespace svxform return pEntryData; } } - return NULL; + return nullptr; } @@ -683,7 +683,7 @@ namespace svxform } } - return NULL; + return nullptr; } @@ -838,14 +838,14 @@ namespace svxform { xForms->addContainerListener(static_cast<XContainerListener*>(m_pPropChangeList)); - FillBranch(NULL); + FillBranch(nullptr); // select same control in tree as in view // (or all of them), if there is one ... if(!m_pFormShell) return; // no shell FmFormView* pFormView = m_pFormShell->GetFormView(); - DBG_ASSERT(pFormView != NULL, "NavigatorTreeModel::UpdateContent : keine FormView"); + DBG_ASSERT(pFormView != nullptr, "NavigatorTreeModel::UpdateContent : keine FormView"); BroadcastMarkedObjects(pFormView->GetMarkedObjectList()); } } @@ -855,7 +855,7 @@ namespace svxform { // If shell is unchanged, do nothing - FmFormPage* pNewPage = pShell ? pShell->GetCurPage() : NULL; + FmFormPage* pNewPage = pShell ? pShell->GetCurPage() : nullptr; if ((pShell == m_pFormShell) && (m_pFormPage == pNewPage)) return; @@ -865,7 +865,7 @@ namespace svxform { if (m_pFormModel) EndListening( *m_pFormModel ); - m_pFormModel = NULL; + m_pFormModel = nullptr; EndListening( *m_pFormShell ); Clear(); } @@ -878,7 +878,7 @@ namespace svxform m_pFormPage = pNewPage; UpdateContent(m_pFormPage->GetForms()); } else - m_pFormPage = NULL; + m_pFormPage = nullptr; // register as Listener again @@ -958,7 +958,7 @@ namespace svxform return pObj; } } - return NULL; + return nullptr; } diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index d5272878fae0..d53525059f2e 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -43,9 +43,9 @@ namespace svxform if (!m_xPropertySet.is() || !m_xColumn.is()) { - m_xPropertySet = NULL; - m_xColumn = NULL; - m_xColumnUpdate = NULL; + m_xPropertySet = nullptr; + m_xColumn = nullptr; + m_xColumnUpdate = nullptr; } } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 700e0a617536..ed8052efd6b4 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -98,9 +98,9 @@ static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< conta if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) ) xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) - _rListBox.InsertEntry( sLabel, NULL, false, TREELIST_APPEND, new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( sLabel, nullptr, false, TREELIST_APPEND, new ColumnInfo(*pEntries,sLabel) ); else - _rListBox.InsertEntry( *pEntries, NULL, false, TREELIST_APPEND, new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( *pEntries, nullptr, false, TREELIST_APPEND, new ColumnInfo(*pEntries,sLabel) ); } } @@ -184,14 +184,14 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Wind ,::comphelper::OPropertyChangeListener(m_aMutex) ,pData(new FmFieldWinData) ,m_nObjectType(0) - ,m_pChangeListener(NULL) + ,m_pChangeListener(nullptr) { SetHelpId( HID_FIELD_SEL_WIN ); SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); pListBox = VclPtr<FmFieldWinListBox>::Create( this ); pListBox->Show(); - UpdateContent(NULL); + UpdateContent(nullptr); SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y)); } @@ -245,14 +245,14 @@ bool FmFieldWin::createSelectionControls( ) SfxUnoAnyItem aDescriptorItem( SID_FM_DATACCESS_DESCRIPTOR, makeAny( aDescr.createPropertyValueSequence() ) ); const SfxPoolItem* pArgs[] = { - &aDescriptorItem, NULL + &aDescriptorItem, nullptr }; // execute the create slot GetBindings().Execute( SID_FM_CREATE_FIELDCONTROL, pArgs ); } - return NULL != pSelected; + return nullptr != pSelected; } @@ -296,7 +296,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoo UpdateContent(pShell); } else - UpdateContent(NULL); + UpdateContent(nullptr); } diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index fbdf616121c2..1da3496a853a 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -202,7 +202,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem ); SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) - ,pFixedText( NULL ) + ,pFixedText( nullptr ) { } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index f8153ff6c762..440c5eaf8ea5 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -115,7 +115,7 @@ GalleryBrowser1::GalleryBrowser1( mpThemes ( VclPtr<GalleryThemeListBox>::Create( this, WB_TABSTOP | WB_3DLOOK | WB_BORDER | WB_HSCROLL | WB_VSCROLL | WB_AUTOHSCROLL | WB_SORT ) ), mpGallery ( pGallery ), mpExchangeData ( new ExchangeData ), - mpThemePropsDlgItemSet( NULL ), + mpThemePropsDlgItemSet( nullptr ), aImgNormal ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_NORMAL ) ), aImgDefault ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_DEFAULT ) ), aImgReadOnly ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_READONLY ) ), @@ -154,14 +154,14 @@ void GalleryBrowser1::dispose() EndListening( *mpGallery ); mpThemes.disposeAndClear(); delete mpExchangeData; - mpExchangeData = NULL; + mpExchangeData = nullptr; maNewTheme.disposeAndClear(); Control::dispose(); } sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ) { - static const bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL ); + static const bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != nullptr ); sal_uIntPtr nRet = LISTBOX_ENTRY_NOTFOUND; @@ -229,7 +229,7 @@ void GalleryBrowser1::ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec) if( pTheme ) { bool bUpdateAllowed, bRenameAllowed, bRemoveAllowed; - static const bool bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL ); + static const bool bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != nullptr ); if( pTheme->IsReadOnly() ) bUpdateAllowed = bRenameAllowed = bRemoveAllowed = false; @@ -269,7 +269,7 @@ void GalleryBrowser1::ImplGalleryThemeProperties( const OUString & rThemeName, b SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); assert(pFact && "Got no AbstractDialogFactory!"); - VclAbstractDialog2* pThemeProps = pFact->CreateGalleryThemePropertiesDialog( NULL, mpExchangeData, mpThemePropsDlgItemSet ); + VclAbstractDialog2* pThemeProps = pFact->CreateGalleryThemePropertiesDialog( nullptr, mpExchangeData, mpThemePropsDlgItemSet ); assert(pThemeProps && "Got no GalleryThemePropertiesDialog!"); if ( bCreateNew ) @@ -342,7 +342,7 @@ IMPL_LINK_TYPED( GalleryBrowser1, DestroyThemePropertiesDlgHdl, void*, p, void ) VclAbstractDialog2* pDialog = static_cast<VclAbstractDialog2*>(p); delete pDialog; delete mpThemePropsDlgItemSet; - mpThemePropsDlgItemSet = 0; + mpThemePropsDlgItemSet = nullptr; } void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) @@ -526,13 +526,13 @@ bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) switch( rKEvt.GetKeyCode().GetCode() ) { case( KEY_INSERT ): - ClickNewThemeHdl( NULL ); + ClickNewThemeHdl( nullptr ); break; case( KEY_I ): { if( bMod1 ) - ClickNewThemeHdl( NULL ); + ClickNewThemeHdl( nullptr ); } break; diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index d2e69896dd88..cfbb7dcfe7fb 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -227,7 +227,7 @@ void GalleryThemePopup::Execute( pInfo->Dispatch = rCmdInfo.Dispatch; if ( !Application::PostUserEvent( - LINK( 0, GalleryBrowser2, AsyncDispatch_Impl), pInfo ) ) + LINK( nullptr, GalleryBrowser2, AsyncDispatch_Impl), pInfo ) ) delete pInfo; } } @@ -414,7 +414,7 @@ void GalleryToolBox::KeyInput( const KeyEvent& rKEvt ) GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) : Control ( pParent, WB_TABSTOP ), mpGallery ( pGallery ), - mpCurTheme ( NULL ), + mpCurTheme ( nullptr ), mpIconView ( VclPtr<GalleryIconView>::Create( this, nullptr ) ), mpListView ( VclPtr<GalleryListView>::Create( this, nullptr ) ), mpPreview ( VclPtr<GalleryPreview>::Create(this) ), @@ -448,7 +448,7 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) : maViewBox->SetHelpId( TBX_ID_LIST, HID_GALLERY_LISTVIEW ); maViewBox->SetQuickHelpText( TBX_ID_LIST, GAL_RESSTR(RID_SVXSTR_GALLERY_LISTVIEW) ); - MiscHdl( NULL ); + MiscHdl( nullptr ); maViewBox->SetSelectHdl( LINK( this, GalleryBrowser2, SelectTbxHdl ) ); maViewBox->Show(); @@ -659,10 +659,10 @@ void GalleryBrowser2::ShowContextMenu( vcl::Window*, const Point* pContextPoint bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) { Point aSelPos; - const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr, aSelPos ); bool bRet = false; svx::sidebar::GalleryControl* pParentControl = dynamic_cast<svx::sidebar::GalleryControl*>(GetParent()); - if (pParentControl != NULL) + if (pParentControl != nullptr) bRet = pParentControl->GalleryKeyInput(rKEvt, pWindow); if( !bRet && !maViewBox->HasFocus() && nItemId && mpCurTheme ) @@ -825,7 +825,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) { Graphic aGraphic; Point aSelPos; - const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr, aSelPos ); if( nItemId ) { @@ -879,7 +879,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel ) if( mpCurTheme ) { Point aSelPos; - const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr, aSelPos ); if( nItemId ) { @@ -1044,7 +1044,7 @@ void GalleryBrowser2::Dispatch( const css::util::URL &rURL ) { Point aSelPos; - const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr, aSelPos ); if( !mpCurTheme || !nItemId ) return; @@ -1131,7 +1131,7 @@ void GalleryBrowser2::Dispatch( pInfo->Dispatch = xDispatch; if ( !Application::PostUserEvent( - LINK( 0, GalleryBrowser2, AsyncDispatch_Impl), pInfo ) ) + LINK( nullptr, GalleryBrowser2, AsyncDispatch_Impl), pInfo ) ) delete pInfo; } break; @@ -1144,7 +1144,7 @@ void GalleryBrowser2::Dispatch( void GalleryBrowser2::Execute( sal_uInt16 nId ) { Point aSelPos; - const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr, aSelPos ); if( mpCurTheme && nItemId ) { @@ -1210,7 +1210,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId ) case( GALLERYBROWSERMODE_PREVIEW ): pWindow = static_cast<vcl::Window*>(mpPreview); break; default: - pWindow = NULL; + pWindow = nullptr; break; } diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 0cf63b8d12a2..2de5c1083986 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -160,7 +160,7 @@ void GalleryPreview::Command(const CommandEvent& rCEvt) if (mpTheme && (rCEvt.GetCommand() == CommandEventId::ContextMenu)) { GalleryBrowser2* pGalleryBrowser = static_cast<GalleryBrowser2*>(GetParent()); - pGalleryBrowser->ShowContextMenu(this, (rCEvt.IsMouseEvent() ? &rCEvt.GetMousePosPixel() : NULL)); + pGalleryBrowser->ShowContextMenu(this, (rCEvt.IsMouseEvent() ? &rCEvt.GetMousePosPixel() : nullptr)); } } @@ -553,7 +553,7 @@ void GalleryListView::Command( const CommandEvent& rCEvt ) if( rCEvt.GetCommand() == CommandEventId::ContextMenu ) { - const Point* pPos = NULL; + const Point* pPos = nullptr; if( rCEvt.IsMouseEvent() && ( GetRowAtYPosPixel( rCEvt.GetMousePosPixel().Y() ) != BROWSER_ENDOFSELECTION ) ) pPos = &rCEvt.GetMousePosPixel(); diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 7a6bfd2498dc..4f5d371262b1 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -182,7 +182,7 @@ Gallery::~Gallery() Gallery* Gallery::GetGalleryInstance() { - static Gallery* pGallery = NULL; + static Gallery* pGallery = nullptr; if( !pGallery ) { @@ -427,7 +427,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO GalleryThemeEntry* Gallery::ImplGetThemeEntry( const OUString& rThemeName ) { - GalleryThemeEntry* pFound = NULL; + GalleryThemeEntry* pFound = nullptr; if( !rThemeName.isEmpty() ) { @@ -441,7 +441,7 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const OUString& rThemeName ) OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const { - GalleryThemeEntry* pFound = NULL; + GalleryThemeEntry* pFound = nullptr; for ( size_t i = 0, n = aThemeList.size(); i < n && !pFound; ++i ) { @@ -502,7 +502,7 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const bool Gallery::HasTheme( const OUString& rThemeName ) { - return( ImplGetThemeEntry( rThemeName ) != NULL ); + return( ImplGetThemeEntry( rThemeName ) != nullptr ); } bool Gallery::CreateTheme( const OUString& rThemeName ) @@ -599,7 +599,7 @@ bool Gallery::RemoveTheme( const OUString& rThemeName ) GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry) { - GalleryTheme* pTheme = NULL; + GalleryTheme* pTheme = nullptr; if( pThemeEntry ) { @@ -631,7 +631,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry) if( pIStm->GetError() ) { - delete pTheme, pTheme = NULL; + delete pTheme, pTheme = nullptr; } } catch (const css::ucb::ContentCreationException&) @@ -663,10 +663,10 @@ void Gallery::ImplDeleteCachedTheme( GalleryTheme* pTheme ) GalleryTheme* Gallery::AcquireTheme( const OUString& rThemeName, SfxListener& rListener ) { - GalleryTheme* pTheme = NULL; + GalleryTheme* pTheme = nullptr; GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rThemeName ); - if( pThemeEntry && ( ( pTheme = ImplGetCachedTheme( pThemeEntry ) ) != NULL ) ) + if( pThemeEntry && ( ( pTheme = ImplGetCachedTheme( pThemeEntry ) ) != nullptr ) ) rListener.StartListening( *pTheme ); return pTheme; diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 397814f330c1..29258839a2dd 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star; ResMgr* GetGalleryResMgr() { - static ResMgr* pGalleryResMgr = NULL; + static ResMgr* pGalleryResMgr = nullptr; if( !pGalleryResMgr ) { @@ -96,7 +96,7 @@ GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, Graphic if( pIStm ) { GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); - std::unique_ptr<GalleryProgress> pProgress(bShowProgress ? new GalleryProgress( &rGraphicFilter ) : NULL); + std::unique_ptr<GalleryProgress> pProgress(bShowProgress ? new GalleryProgress( &rGraphicFilter ) : nullptr); sal_uInt16 nFormat; if( !rGraphicFilter.ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) ) @@ -402,9 +402,9 @@ GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObj mpTheme( pTheme ), meObjectKind( mpTheme->GetObjectKind( nObjectPos ) ), mnObjectPos( nObjectPos ), - mpGraphicObject( NULL ), - mpImageMap( NULL ), - mpURL( NULL ) + mpGraphicObject( nullptr ), + mpImageMap( nullptr ), + mpURL( nullptr ) { InitData( bLazy ); @@ -454,7 +454,7 @@ void GalleryTransferable::InitData( bool bLazy ) mpURL = new INetURLObject; if( !mpTheme->GetURL( mnObjectPos, *mpURL ) ) - delete mpURL, mpURL = NULL; + delete mpURL, mpURL = nullptr; } if( ( SGA_OBJ_SOUND != meObjectKind ) && !mpGraphicObject ) @@ -570,9 +570,9 @@ void GalleryTransferable::DragFinished( sal_Int8 nDropAction ) void GalleryTransferable::ObjectReleased() { mxModelStream.Clear(); - delete mpGraphicObject, mpGraphicObject = NULL; - delete mpImageMap, mpImageMap = NULL; - delete mpURL, mpURL = NULL; + delete mpGraphicObject, mpGraphicObject = nullptr; + delete mpImageMap, mpImageMap = nullptr; + delete mpURL, mpURL = nullptr; } void GalleryTransferable::CopyToClipboard( vcl::Window* pWindow ) diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 696258f3fb79..87bf5ae779a2 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -417,7 +417,7 @@ SgaObjectSvDraw::SgaObjectSvDraw( const FmFormModel& rModel, const INetURLObject SvxGalleryDrawModel::SvxGalleryDrawModel() -: mpFormModel( 0 ) +: mpFormModel( nullptr ) { const OUString sFactoryURL("sdraw"); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 6c8e980499e1..a2ca383c8993 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -149,7 +149,7 @@ bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, Galle SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry ) { - SgaObject* pSgaObj = NULL; + SgaObject* pSgaObj = nullptr; if( pEntry ) { @@ -226,7 +226,7 @@ const GalleryObject* GalleryTheme::ImplGetGalleryObject( const INetURLObject& rU for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) if ( aObjectList[ i ]->aURL == rURL ) return aObjectList[ i ]; - return NULL; + return nullptr; } INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const @@ -245,7 +245,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDat INetURLObject aInfoFileURL( GetParent()->GetUserURL() ); INetURLObject aNewURL; sal_uInt32 nNextNumber = 1999; - sal_Char const* pExt = NULL; + sal_Char const* pExt = nullptr; bool bExists; aDir.Append( "dragdrop" ); @@ -370,7 +370,7 @@ bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos ) if (!rObj.IsValid()) return false; - GalleryObject* pFoundEntry = NULL; + GalleryObject* pFoundEntry = nullptr; size_t iFoundPos = 0; for (size_t n = aObjectList.size(); iFoundPos < n; ++iFoundPos) { @@ -402,7 +402,7 @@ bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos ) pFoundEntry->nOffset = aNewEntry.nOffset; } else - ImplWriteSgaObject(rObj, nInsertPos, NULL); + ImplWriteSgaObject(rObj, nInsertPos, nullptr); ImplSetModified(true); ImplBroadcast(pFoundEntry? iFoundPos: nInsertPos); @@ -417,7 +417,7 @@ SgaObject* GalleryTheme::AcquireObject( size_t nPos ) void GalleryTheme::GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx& rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const { - const GalleryObject* pGalleryObject = nPos < aObjectList.size() ? aObjectList[ nPos ] : NULL; + const GalleryObject* pGalleryObject = nPos < aObjectList.size() ? aObjectList[ nPos ] : nullptr; if(pGalleryObject) { @@ -434,7 +434,7 @@ void GalleryTheme::GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx& rBit void GalleryTheme::SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString& rPath) { - GalleryObject* pGalleryObject = nPos < aObjectList.size() ? aObjectList[ nPos ] : NULL; + GalleryObject* pGalleryObject = nPos < aObjectList.size() ? aObjectList[ nPos ] : nullptr; if(pGalleryObject) { @@ -456,7 +456,7 @@ void GalleryTheme::ReleaseObject( SgaObject* pObject ) bool GalleryTheme::RemoveObject( size_t nPos ) { - GalleryObject* pEntry = NULL; + GalleryObject* pEntry = nullptr; if ( nPos < aObjectList.size() ) { GalleryObjectList::iterator it = aObjectList.begin(); @@ -476,13 +476,13 @@ bool GalleryTheme::RemoveObject( size_t nPos ) Broadcast( GalleryHint( GalleryHintType::CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); Broadcast( GalleryHint( GalleryHintType::OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); delete pEntry; - pEntry = NULL; + pEntry = nullptr; ImplSetModified( true ); ImplBroadcast( nPos ); } - return( pEntry != NULL ); + return( pEntry != nullptr ); } bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos ) @@ -692,7 +692,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, bo { DBG_ASSERT( rURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); - GalleryThemeEntry* pRet = NULL; + GalleryThemeEntry* pRet = nullptr; if( FileExists( rURL ) ) { diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 3690a9ffeb6e..aae699446c5c 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -170,7 +170,7 @@ static INetURLObject Smartify( const OUString &rPath ) void GalApp::Init() { try { - if( !mbInBuildTree && getenv( "OOO_INSTALL_PREFIX" ) == NULL ) { + if( !mbInBuildTree && getenv( "OOO_INSTALL_PREFIX" ) == nullptr ) { OUString fileName = GetAppFileName(); int lastSlash = fileName.lastIndexOf( '/' ); #ifdef WNT @@ -335,7 +335,7 @@ void GalApp::DeInit() uno::Reference< lang::XComponent >( comphelper::getProcessComponentContext(), uno::UNO_QUERY_THROW )-> dispose(); - ::comphelper::setProcessServiceFactory( NULL ); + ::comphelper::setProcessServiceFactory( nullptr ); } void vclmain::createApplication() diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index cb59c82d18b8..f711998f975c 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -88,8 +88,8 @@ public: SvxGraphCtrlAccessibleContext( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, GraphCtrl& rRepresentation, - const OUString* pName = NULL, - const OUString* pDescription = NULL ); + const OUString* pName = nullptr, + const OUString* pDescription = nullptr ); void Notify( SfxBroadcaster& aBC, const SfxHint& aHint ) override; diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index d5a33dd6ecfc..4ebaff8eb0e6 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -40,7 +40,7 @@ namespace svxform public: DelayedEvent( const Link<void*,void>& _rHandler ) :m_aHandler( _rHandler ) - ,m_nEventId( 0 ) + ,m_nEventId( nullptr ) { } diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index d00a9676587e..891d904928a0 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -63,7 +63,7 @@ class FmFilterData public: TYPEINFO(); - FmFilterData(FmParentData* pParent = NULL, const OUString& rText = OUString()) + FmFilterData(FmParentData* pParent = nullptr, const OUString& rText = OUString()) :m_pParent( pParent ) ,m_aText( rText ) {} @@ -125,7 +125,7 @@ class FmFilterItems : public FmParentData { public: TYPEINFO_OVERRIDE(); - FmFilterItems() : FmParentData(NULL, OUString()) {} + FmFilterItems() : FmParentData(nullptr, OUString()) {} FmFilterItems(FmFormItem* pParent, const OUString& rText ) : FmParentData(pParent, rText) {} FmFilterItem* Find( const ::sal_Int32 _nFilterComponentIndex ) const; @@ -176,7 +176,7 @@ public: void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem); void SetTextForItem(FmFilterItem* pItem, const OUString& rText); - FmFormItem* GetCurrentForm() const {return m_pCurrentItems ? static_cast<FmFormItem*>(m_pCurrentItems->GetParent()) : NULL;} + FmFormItem* GetCurrentForm() const {return m_pCurrentItems ? static_cast<FmFormItem*>(m_pCurrentItems->GetParent()) : nullptr;} FmFilterItems* GetCurrentItems() const {return m_pCurrentItems;} void SetCurrentItems(FmFilterItems* pCurrent); @@ -301,8 +301,8 @@ private: * If <TRUE/> the items will not be removed from the model, otherwise they will. */ void insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems, bool _bCopy = false); - SvTreeListEntry* getPrevEntry(SvTreeListEntry* _pStartWith = NULL); - SvTreeListEntry* getNextEntry(SvTreeListEntry* _pStartWith = NULL); + SvTreeListEntry* getPrevEntry(SvTreeListEntry* _pStartWith = nullptr); + SvTreeListEntry* getNextEntry(SvTreeListEntry* _pStartWith = nullptr); using SvTreeListBox::Select; using SvTreeListBox::ExecuteDrop; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 79c53143fe79..f7a7d1abc922 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -202,7 +202,7 @@ public: virtual ~FmEntryDataList(); FmEntryData* at( size_t Index ) - { return ( Index < maEntryDataList.size() ) ? maEntryDataList[ Index ] : NULL; } + { return ( Index < maEntryDataList.size() ) ? maEntryDataList[ Index ] : nullptr; } size_t size() const { return maEntryDataList.size(); } FmEntryData* remove( FmEntryData* pItem ); @@ -245,7 +245,7 @@ public: FmFormData( const css::uno::Reference< css::form::XForm >& _rxForm, const ImageList& _rNormalImages, - FmFormData* _pParent = NULL + FmFormData* _pParent = nullptr ); FmFormData( const FmFormData& rFormData ); @@ -324,7 +324,7 @@ namespace svxform void UnLock() { m_nLocks--; } bool IsLocked() const { return m_nLocks != 0; } bool CanUndo() const { return m_bCanUndo; } - void ReleaseModel() { m_pNavModel = NULL; } + void ReleaseModel() { m_pNavModel = nullptr; } protected: void Insert(const css::uno::Reference< css::uno::XInterface >& xIface, sal_Int32 nIndex); void Remove( const css::uno::Reference< css::uno::XInterface >& _rxElement ); @@ -529,7 +529,7 @@ namespace svxform sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD ); // check if a cut, copy, or drag operation can be started in the current situation - bool implAllowExchange( sal_Int8 _nAction, bool* _pHasNonHidden = NULL ); + bool implAllowExchange( sal_Int8 _nAction, bool* _pHasNonHidden = nullptr ); // check if a paste with the current clipboard content can be accepted bool implAcceptPaste( ); diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index 530697b3feeb..a9f0d3e40527 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.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 &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 1002a12bb8a8..ccacff49ea5a 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -113,7 +113,7 @@ struct FmLoadAction ImplSVEvent * nEventId; sal_uInt16 nFlags; - FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { } + FmLoadAction( ) : pPage( nullptr ), nEventId( nullptr ), nFlags( 0 ) { } FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, ImplSVEvent * _nEventId ) :pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags ) { @@ -527,7 +527,7 @@ public: /** determines whether the current form slot is currently enabled */ - SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, css::form::runtime::FeatureState* _pCompleteState = NULL ); + SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, css::form::runtime::FeatureState* _pCompleteState = nullptr ); protected: DECL_DLLPRIVATE_LINK_TYPED( OnLoadForms, void*, void ); diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index c1ad869cc57b..77d60fa08479 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -277,7 +277,7 @@ private: const OUString& _rFieldPostfix, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl, - const css::uno::Reference< css::sdbc::XDataSource >& _rxDataSource = NULL, + const css::uno::Reference< css::sdbc::XDataSource >& _rxDataSource = nullptr, const OUString& _rDataSourceName = OUString(), const OUString& _rCommand = OUString(), const sal_Int32 _nCommandType = -1 diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index f6b9b519e845..ffbed7f7c01c 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -104,7 +104,7 @@ namespace svx ~ControllerFeatures(); /// checks whether the instance is properly assigned to a form and/or controller - inline bool isAssigned( ) const { return m_pImpl != NULL; } + inline bool isAssigned( ) const { return m_pImpl != nullptr; } /** assign to a controller */ diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 2cc5c0fe92ab..44ca4d57e391 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -97,7 +97,7 @@ private: // used by locked columns public: DbGridColumn(sal_uInt16 _nId, DbGridControl& rParent) - :m_pCell(NULL) + :m_pCell(nullptr) ,m_rParent(rParent) ,m_nLastVisibleWidth(-1) ,m_nFormatKey(0) @@ -287,7 +287,7 @@ public: bool Commit(); // Formatting the field data to output text - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) = 0; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) = 0; virtual void Update(){} // Refresh the control by the field data @@ -399,7 +399,7 @@ public: bool IsSimpleEdit() const { return m_bIsSimpleEdit; } virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; virtual void PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect, @@ -429,7 +429,7 @@ public: virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; @@ -455,7 +455,7 @@ public: virtual void PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; protected: // DbCellControl @@ -472,7 +472,7 @@ public: DbComboBox(DbGridColumn& _rColumn); virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; @@ -500,7 +500,7 @@ public: DbListBox(DbGridColumn& _rColumn); virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; @@ -524,7 +524,7 @@ public: TYPEINFO_OVERRIDE(); DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference<css::uno::XComponentContext>& _rContext ); virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; @@ -574,7 +574,7 @@ class DbDateField : public DbSpinField public: TYPEINFO_OVERRIDE(); DbDateField(DbGridColumn& _rColumn); - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; protected: @@ -599,7 +599,7 @@ class DbTimeField : public DbSpinField public: TYPEINFO_OVERRIDE(); DbTimeField(DbGridColumn& _rColumn); - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; protected: @@ -626,7 +626,7 @@ class DbCurrencyField : public DbSpinField public: TYPEINFO_OVERRIDE(); DbCurrencyField(DbGridColumn& _rColumn); - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; double GetCurrency(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) const; @@ -653,7 +653,7 @@ class DbNumericField : public DbSpinField public: TYPEINFO_OVERRIDE(); DbNumericField(DbGridColumn& _rColumn); - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; protected: @@ -694,7 +694,7 @@ public: virtual ::svt::CellControllerRef CreateController() const override; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect) override; virtual void Update() override; - virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; const OUString& GetText() const {return m_aText;} @@ -873,7 +873,7 @@ public: OUString GetText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, - Color** ppColor = NULL) + Color** ppColor = nullptr) {return m_pCellControl->GetFormatText(_rxField, xFormatter, ppColor);} }; @@ -1090,7 +1090,7 @@ protected: virtual ~FmXFilterCell(); public: TYPEINFO_OVERRIDE(); - FmXFilterCell(DbGridColumn* pColumn = NULL, DbCellControl* pControl = NULL); + FmXFilterCell(DbGridColumn* pColumn = nullptr, DbCellControl* pControl = nullptr); DECLARE_UNO3_AGG_DEFAULTS(FmXFilterCell, FmXGridCell) diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index e7a6ef1e7ed5..c0082a6be418 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -75,8 +75,8 @@ public: SvxRectCtlAccessibleContext( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, SvxRectCtl& rRepresentation, - const OUString* pName = NULL, - const OUString* pDescription = NULL ); + const OUString* pName = nullptr, + const OUString* pDescription = nullptr ); protected: virtual ~SvxRectCtlAccessibleContext(); public: diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 6e8f16f3e77b..5ba83719d0cb 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -97,7 +97,7 @@ SvStream& SvxSmartTagItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const { - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index b0ed1bbb3418..952438888a3b 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -60,7 +60,7 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< bea css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) { - css::uno::Any* pRet = NULL; + css::uno::Any* pRet = nullptr; PropertyHashMap::iterator aHashIter( aPropHashMap.find( rPropName ) ); if ( aHashIter != aPropHashMap.end() ) pRet = &aPropSeq[ (*aHashIter).second ].Value; @@ -69,7 +69,7 @@ css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUStrin const css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) const { - const css::uno::Any* pRet = NULL; + const css::uno::Any* pRet = nullptr; PropertyHashMap::const_iterator aHashIter( aPropHashMap.find( rPropName ) ); if ( aHashIter != aPropHashMap.end() ) pRet = &aPropSeq[ (*aHashIter).second ].Value; @@ -78,7 +78,7 @@ const css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const O css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) { - css::uno::Any* pRet = NULL; + css::uno::Any* pRet = nullptr; css::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); if ( pSeqAny ) { @@ -98,7 +98,7 @@ css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUStrin const css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) const { - const css::uno::Any* pRet = NULL; + const css::uno::Any* pRet = nullptr; const css::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); if ( pSeqAny ) { @@ -166,7 +166,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const OUString& rSequenceName else { css::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); - if( pSeqAny == NULL ) + if( pSeqAny == nullptr ) { css::uno::Sequence < beans::PropertyValue > aSeq; beans::PropertyValue aValue; diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 01313a3d2ed4..423cab1e6fb8 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -228,7 +228,7 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxBitmapListItem, BitmapList ) SvxDashListItem::SvxDashListItem() : - pDashList( 0 ) + pDashList( nullptr ) { } diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index cde11d03b8fe..095a4c80663e 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -145,7 +145,7 @@ SvStream& SvxGalleryItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ SfxPoolItem* SvxGalleryItem::Create(SvStream& , sal_uInt16) const { - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 318a3b22176d..f14d683b0224 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -201,7 +201,7 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ): if( rHyperlinkItem.GetMacroTable() ) pMacroTable = new SvxMacroTableDtor( *rHyperlinkItem.GetMacroTable() ); else - pMacroTable=NULL; + pMacroTable=nullptr; }; @@ -219,7 +219,7 @@ SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, const OUString& rName, c if (pMacroTbl) pMacroTable = new SvxMacroTableDtor ( *pMacroTbl ); else - pMacroTable=NULL; + pMacroTable=nullptr; } SfxPoolItem* SvxHyperlinkItem::Clone( SfxItemPool* ) const diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 612d6c1cbe33..b7be0282428b 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -67,13 +67,13 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, SvxNumberValueType eNumValType, const OUString& rNumStr ) : pFormatter ( pNumFormatter ) - , pCurFmtTable ( NULL ) + , pCurFmtTable ( nullptr ) , eValType ( eNumValType ) , bUndoAddList ( true ) , nCurFormatKey ( nFormatKey ) , nCurCategory (css::util::NumberFormat::ALL) , eCurLanguage (LANGUAGE_NONE) - , pCurCurrencyEntry(NULL) + , pCurCurrencyEntry(nullptr) , bBankingSymbol (false) , nCurCurrencyEntryPos((sal_uInt16) SELPOS_NONE) , bUseStarFormat (false) @@ -100,13 +100,13 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, double nNumVal, const OUString* pNumStr ) : pFormatter ( pNumFormatter ) - , pCurFmtTable ( NULL ) + , pCurFmtTable ( nullptr ) , eValType ( eNumValType ) , bUndoAddList ( true ) , nCurFormatKey ( nFormatKey ) , nCurCategory (css::util::NumberFormat::ALL) , eCurLanguage (LANGUAGE_NONE) - , pCurCurrencyEntry(NULL) + , pCurCurrencyEntry(nullptr) , bBankingSymbol (false) , nCurCurrencyEntryPos((sal_uInt16) SELPOS_NONE) , bUseStarFormat (false) @@ -185,7 +185,7 @@ void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos, eCurLanguage ) ); // reinitialize currency if category newly entered if ( nCurCategory == css::util::NumberFormat::CURRENCY && nOldCategory != nCurCategory ) - pCurCurrencyEntry = NULL; + pCurCurrencyEntry = nullptr; rFmtSelPos = FillEntryList_Impl( rFmtEntries ); } @@ -423,7 +423,7 @@ void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr, OUString& rPreviewStr, Color*& rpFontColor ) { - rpFontColor = NULL; + rpFontColor = nullptr; sal_uIntPtr nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage ); if ( nExistingFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) @@ -467,7 +467,7 @@ bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString ) { const SvNumberformat* pNumEntry = pFormatter->GetEntry(nFound); - if(pNumEntry!=NULL && pNumEntry->HasNewCurrency()) + if(pNumEntry!=nullptr && pNumEntry->HasNewCurrency()) { bool bTestBanking; sal_uInt16 nPos=FindCurrencyTableEntry(rFmtString,bTestBanking); @@ -519,7 +519,7 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, { // precondition: number formater found - DBG_ASSERT( pFormatter != NULL, "Zahlenformatierer nicht gefunden!" ); + DBG_ASSERT( pFormatter != nullptr, "Zahlenformatierer nicht gefunden!" ); short nSelPos = SELPOS_NONE; @@ -593,7 +593,7 @@ void SvxNumberFormatShell::FillEListWithStd_Impl( std::vector<OUString>& rList, * Ist die Liste leer oder gibt es kein aktuelles Format, * so wird SELPOS_NONE geliefert. */ - DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); + DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" ); aCurrencyFormatList.clear(); @@ -673,7 +673,7 @@ short SvxNumberFormatShell::FillEListWithFormats_Impl( std::vector<OUString>& rL const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); - if(pNumEntry==NULL) continue; + if(pNumEntry==nullptr) continue; nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; aStrComment=pNumEntry->GetComment(); @@ -708,7 +708,7 @@ short SvxNumberFormatShell::FillEListWithDateTime_Impl( std::vector<OUString>& r nNFEntry=pFormatter->GetFormatIndex((NfIndexTableOffset)nIndex,eCurLanguage); const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); - if(pNumEntry!=NULL) + if(pNumEntry!=nullptr) { nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; aStrComment=pNumEntry->GetComment(); @@ -736,7 +736,7 @@ short SvxNumberFormatShell::FillEListWithCurrency_Impl( std::vector<OUString>& r * Ist die Liste leer oder gibt es kein aktuelles Format, * so wird SELPOS_NONE geliefert. */ - DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); + DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" ); const NfCurrencyEntry* pTmpCurrencyEntry; bool bTmpBanking; @@ -745,8 +745,8 @@ short SvxNumberFormatShell::FillEListWithCurrency_Impl( std::vector<OUString>& r bool bFlag=pFormatter->GetNewCurrencySymbolString(nCurFormatKey,rSymbol, &pTmpCurrencyEntry,&bTmpBanking); - if( (!bFlag && pCurCurrencyEntry==NULL) || - (bFlag && pTmpCurrencyEntry==NULL && rSymbol.isEmpty()) || + if( (!bFlag && pCurCurrencyEntry==nullptr) || + (bFlag && pTmpCurrencyEntry==nullptr && rSymbol.isEmpty()) || (nCurCategory==css::util::NumberFormat::ALL)) { if ( nCurCategory == css::util::NumberFormat::ALL ) @@ -772,7 +772,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector<OUString>& rL */ sal_uInt16 nMyType; - DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); + DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" ); sal_uInt32 nNFEntry; OUString aStrComment; @@ -792,7 +792,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector<OUString>& rL const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); - if(pNumEntry==NULL) continue; + if(pNumEntry==nullptr) continue; nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; aStrComment=pNumEntry->GetComment(); @@ -830,7 +830,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector<OUString>& rL &pTmpCurrencyEntry, &bTmpBanking); - bUserNewCurrency=(pTmpCurrencyEntry!=NULL); + bUserNewCurrency=(pTmpCurrencyEntry!=nullptr); } if(!bUserNewCurrency &&(pNumEntry->GetType() & css::util::NumberFormat::DEFINED)) @@ -861,7 +861,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector<OUString>& r */ sal_uInt16 nMyType; - DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); + DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" ); OUString aStrComment; OUString aNewFormNInfo; @@ -881,7 +881,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector<OUString>& r OUString rShortSymbol; - if(pCurCurrencyEntry==NULL) + if(pCurCurrencyEntry==nullptr) { // #110398# If no currency format was previously selected (we're not // about to add another currency), try to select the initial currency @@ -904,7 +904,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector<OUString>& r bTmpBanking=bBankingSymbol; } - if(pTmpCurrencyEntry!=NULL) + if(pTmpCurrencyEntry!=nullptr) { rSymbol = pTmpCurrencyEntry->BuildSymbolString(false); rBankSymbol = pTmpCurrencyEntry->BuildSymbolString(true); @@ -1055,7 +1055,7 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<OUString>& rList, */ sal_uInt16 nMyType; - DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); + DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" ); OUString aStrComment; OUString aNewFormNInfo; @@ -1105,7 +1105,7 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<OUString>& rList, void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpColor ) { - rpColor = NULL; + rpColor = nullptr; // #50441# if a string was set in addition to the value, use it for text formats bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING || @@ -1203,7 +1203,7 @@ void SvxNumberFormatShell::MakePrevStringFromVal( Color*& rpFontColor, double nValue) { - rpFontColor = NULL; + rpFontColor = nullptr; pFormatter->GetPreviewString( rFormatStr, nValue, rPreviewStr, &rpFontColor, eCurLanguage ); } @@ -1219,7 +1219,7 @@ void SvxNumberFormatShell::SetComment4Entry(short nEntry, const OUString& aEntSt if(nEntry<0) return; sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; pNumEntry = const_cast<SvNumberformat*>(pFormatter->GetEntry(nMyNfEntry)); - if(pNumEntry!=NULL) pNumEntry->SetComment(aEntStr); + if(pNumEntry!=nullptr) pNumEntry->SetComment(aEntStr); } /* @@ -1237,7 +1237,7 @@ OUString SvxNumberFormatShell::GetComment4Entry(short nEntry) { sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; const SvNumberformat *pNumEntry = pFormatter->GetEntry(nMyNfEntry); - if(pNumEntry!=NULL) + if(pNumEntry!=nullptr) return pNumEntry->GetComment(); } @@ -1261,7 +1261,7 @@ short SvxNumberFormatShell::GetCategory4Entry(short nEntry) const { const SvNumberformat *pNumEntry = pFormatter->GetEntry(nMyNfEntry); sal_uInt16 nMyCat,nMyType; - if(pNumEntry!=NULL) + if(pNumEntry!=nullptr) { nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; CategoryToPos_Impl(nMyCat,nMyType); @@ -1293,7 +1293,7 @@ bool SvxNumberFormatShell::GetUserDefined4Entry(short nEntry) sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; const SvNumberformat *pNumEntry = pFormatter->GetEntry(nMyNfEntry); - if(pNumEntry!=NULL) + if(pNumEntry!=nullptr) { if((pNumEntry->GetType() & css::util::NumberFormat::DEFINED)>0) { @@ -1325,7 +1325,7 @@ OUString SvxNumberFormatShell::GetFormat4Entry(short nEntry) sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; const SvNumberformat *pNumEntry = pFormatter->GetEntry(nMyNfEntry); - if(pNumEntry!=NULL) + if(pNumEntry!=nullptr) return pNumEntry->GetFormatstring(); } return OUString(); @@ -1393,11 +1393,11 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, sal_ { const NfCurrencyEntry* pTmpCurrencyEntry=SvNumberFormatter::MatchSystemCurrency(); - bool bFlag=(pTmpCurrencyEntry==NULL); + bool bFlag=(pTmpCurrencyEntry==nullptr); GetCurrencySymbols(rList, bFlag); - if(pPos!=NULL) + if(pPos!=nullptr) { const NfCurrencyTable& rCurrencyTable=SvNumberFormatter::GetTheCurrencyTable(); sal_uInt16 nTableCount=rCurrencyTable.size(); @@ -1517,7 +1517,7 @@ void SvxNumberFormatShell::SetCurrencySymbol(sal_uInt32 nPos) } else { - pCurCurrencyEntry=NULL; + pCurCurrencyEntry=nullptr; nCurCurrencyEntryPos=0; nCurFormatKey=pFormatter->GetFormatIndex( NF_CURRENCY_1000DEC2_RED, eCurLanguage); @@ -1578,7 +1578,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyTableEntry( const OUString& rFmtStr OUString aSymbol, aExtension; sal_uInt32 nFound = pFormatter->TestNewString( rFmtString, eCurLanguage ); if ( nFound != NUMBERFORMAT_ENTRY_NOT_FOUND && - ((pFormat = pFormatter->GetEntry( nFound )) != 0) && + ((pFormat = pFormatter->GetEntry( nFound )) != nullptr) && pFormat->GetNewCurrencySymbol( aSymbol, aExtension ) ) { // eventually match with format locale const NfCurrencyEntry* pTmpCurrencyEntry = @@ -1665,7 +1665,7 @@ bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos, const NfCurrencyEntry* pTmpCurrencyEntry=&rCurrencyTable[nPos]; - if ( pTmpCurrencyEntry!=NULL) + if ( pTmpCurrencyEntry!=nullptr) { pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pTmpCurrencyEntry, bTmpBanking ); diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index fe378314c421..a6348bc99234 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -30,12 +30,12 @@ TYPEINIT1(SvxNumberInfoItem, SfxPoolItem); eValueType ( eVal ), \ aStringVal ( rStr ), \ nDoubleVal ( nDouble ), \ - pDelFormatArr ( NULL ), \ + pDelFormatArr ( nullptr ), \ nDelCount ( 0 ) SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) : - INIT( NULL, SVX_VALUE_TYPE_UNDEFINED, 0, "" ) + INIT( nullptr, SVX_VALUE_TYPE_UNDEFINED, 0, "" ) { } @@ -93,7 +93,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : eValueType ( rItem.eValueType ), aStringVal ( rItem.aStringVal ), nDoubleVal ( rItem.nDoubleVal ), - pDelFormatArr( NULL ), + pDelFormatArr( nullptr ), nDelCount ( rItem.nDelCount ) { @@ -141,7 +141,7 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const { if ( nDelCount > 0 ) { - if ( pDelFormatArr != NULL && rOther.pDelFormatArr != NULL ) + if ( pDelFormatArr != nullptr && rOther.pDelFormatArr != nullptr ) { bEqual = true; @@ -150,7 +150,7 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const } } else if ( nDelCount == 0 ) - bEqual = ( pDelFormatArr == NULL && rOther.pDelFormatArr == NULL ); + bEqual = ( pDelFormatArr == nullptr && rOther.pDelFormatArr == nullptr ); bEqual = bEqual && pFormatter == rOther.pFormatter && @@ -191,7 +191,7 @@ void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData, if ( pDelFormatArr ) { delete []pDelFormatArr; - pDelFormatArr = NULL; + pDelFormatArr = nullptr; } nDelCount = nCount; @@ -200,7 +200,7 @@ void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData, { pDelFormatArr = new sal_uInt32[ nCount ]; - if ( pData != NULL ) + if ( pData != nullptr ) { for ( sal_uInt32 i = 0; i < nCount; ++i ) pDelFormatArr[i] = pData[i]; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index d073187cffe9..7c6cde664c92 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -70,7 +70,7 @@ SfxPoolItem* SvxViewLayoutItem::Clone( SfxItemPool * /*pPool*/ ) const SfxPoolItem* SvxViewLayoutItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { - return 0; + return nullptr; } diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index c6b1f22e8ef9..5d776322fdf9 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -68,7 +68,7 @@ SfxPoolItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const SfxPoolItem* SvxZoomSliderItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { - return 0; + return nullptr; } diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 4dd8125ae9b7..0a47bf94046e 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -43,7 +43,7 @@ SvxSmartTagsControl::SvxSmartTagsControl ) : mpMenu ( new PopupMenu ), mrParent ( rMenu ), - mpSmartTagItem( 0 ) + mpSmartTagItem( nullptr ) { rMenu.SetPopupMenu( _nId, mpMenu ); } @@ -143,7 +143,7 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const S if ( SfxItemState::DEFAULT == eState ) { const SvxSmartTagItem* pSmartTagItem = dynamic_cast<const SvxSmartTagItem*>( pState ); - if ( 0 != pSmartTagItem ) + if ( nullptr != pSmartTagItem ) { delete mpSmartTagItem; mpSmartTagItem = new SvxSmartTagItem( *pSmartTagItem ); diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 44f35b17cec0..f514f8061dcf 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -43,8 +43,8 @@ SvxClipBoardControl::SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), - pClipboardFmtItem( 0 ), - pPopup( 0 ), + pClipboardFmtItem( nullptr ), + pPopup( nullptr ), bDisabled( false ) { addStatusListener( ".uno:ClipboardFormatItems"); @@ -104,7 +104,7 @@ VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow() GetToolBox().EndSelection(); DelPopup(); - return 0; + return nullptr; } @@ -136,7 +136,7 @@ void SvxClipBoardControl::DelPopup() if(pPopup) { delete pPopup; - pPopup = 0; + pPopup = nullptr; } } diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 7f6060bfe3ed..38b1b763e5ca 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -70,7 +70,7 @@ void SvxFontMenuControl::FillMenu() { const SvxFontListItem* pFonts = static_cast<const SvxFontListItem*>(pDoc->GetItem( SID_ATTR_CHAR_FONTLIST )); - const FontList* pList = pFonts ? pFonts->GetFontList(): 0; + const FontList* pList = pFonts ? pFonts->GetFontList(): nullptr; DBG_ASSERT( pList, "Kein Fonts gefunden" ); pMenu->Fill( pList ); } diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 215cd44c30ae..984391e91c40 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -51,7 +51,7 @@ SFX_IMPL_MENU_CONTROL(SvxFontSizeMenuControl, SvxFontHeightItem); IMPL_LINK_TYPED( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen, void ) { SfxViewFrame* pFrm = SfxViewFrame::Current(); - SfxShell* pSh = pFrm ? pFrm->GetDispatcher()->GetShell( 0 ) : NULL; + SfxShell* pSh = pFrm ? pFrm->GetDispatcher()->GetShell( 0 ) : nullptr; if ( !pSh ) return; @@ -93,7 +93,7 @@ void SvxFontSizeMenuControl::StateChanged( { SfxViewFrame* pFrm = SfxViewFrame::Current(); SfxShell* pSh = pFrm ? pFrm->GetDispatcher()->GetShell( 0 ) - : NULL; + : nullptr; if ( !pSh ) return; @@ -118,7 +118,7 @@ void SvxFontSizeMenuControl::StateChanged( { const SvxFontListItem* pFonts = static_cast<const SvxFontListItem*>( pDoc->GetItem( SID_ATTR_CHAR_FONTLIST )); - const FontList* pList = pFonts ? pFonts->GetFontList(): 0; + const FontList* pList = pFonts ? pFonts->GetFontList(): nullptr; if ( pList ) { @@ -141,7 +141,7 @@ void SvxFontSizeMenuControl::StateChanged( // daf"ur von der Shell eine Fontliste besorgen const SvxFontListItem* pFonts = static_cast<const SvxFontListItem*>(pSh->GetItem( SID_ATTR_CHAR_FONTLIST )); - const FontList* pList = pFonts ? pFonts->GetFontList(): NULL; + const FontList* pList = pFonts ? pFonts->GetFontList(): nullptr; if ( pList ) pMenu->Fill( pList->GetFontName(0), pList ); } diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index e2afe89eeb14..012f0a0c3fc4 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -30,7 +30,7 @@ namespace sdr { Event::Event(sal_uInt32 nTime) : mnTime(nTime), - mpNext(0L) + mpNext(nullptr) { } @@ -66,7 +66,7 @@ namespace sdr namespace animation { EventList::EventList() - : mpHead(0L) + : mpHead(nullptr) { } @@ -80,7 +80,7 @@ namespace sdr if(pNew) { Event* pCurrent = mpHead; - Event* pPrev = 0L; + Event* pPrev = nullptr; while(pCurrent && pCurrent->GetTime() < pNew->GetTime()) { @@ -106,7 +106,7 @@ namespace sdr if(pOld && mpHead) { Event* pCurrent = mpHead; - Event* pPrev = 0L; + Event* pPrev = nullptr; while(pCurrent && pCurrent != pOld) { @@ -123,7 +123,7 @@ namespace sdr mpHead = pOld->GetNext(); } - pOld->SetNext(0L); + pOld->SetNext(nullptr); } } @@ -132,7 +132,7 @@ namespace sdr while(mpHead) { Event* pNext = mpHead->GetNext(); - mpHead->SetNext(0L); + mpHead->SetNext(nullptr); mpHead = pNext; } } diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx index 2ad56ce44172..983854c57492 100644 --- a/svx/source/sdr/attribute/sdrtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrtextattribute.cxx @@ -132,7 +132,7 @@ namespace drawinglayer } ImpSdrTextAttribute() - : mpSdrText(0), + : mpSdrText(nullptr), maSdrFormTextAttribute(), maTextLeftDistance(0), maTextUpperDistance(0), diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index 9ae337ba3cb0..10b971b7329e 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -34,8 +34,8 @@ namespace sdr { namespace contact { ObjectContact::ObjectContact() : maViewObjectContactVector(), maPrimitiveAnimator(), - mpEventHandler(0), - mpViewObjectContactRedirector(0), + mpEventHandler(nullptr), + mpViewObjectContactRedirector(nullptr), maViewInformation2D(uno::Sequence< beans::PropertyValue >()), mbIsPreviewRenderer(false) { @@ -115,7 +115,7 @@ bool ObjectContact::DoVisualizeEnteredGroup() const const ViewContact* ObjectContact::getActiveViewContact() const { // default has no active VC - return 0; + return nullptr; } // Invalidate given rectangle at the window/output which is represented by @@ -167,14 +167,14 @@ void ObjectContact::DeleteEventHandler() { // If there are still Events registered, something has went wrong delete mpEventHandler; - mpEventHandler = 0L; + mpEventHandler = nullptr; } } // test if there is an EventHandler without creating one on demand bool ObjectContact::HasEventHandler() const { - return (0L != mpEventHandler); + return (nullptr != mpEventHandler); } // check if text animation is allowed. Default is sal_true. @@ -254,13 +254,13 @@ bool ObjectContact::isDrawModeHighContrast() const // access to SdrPageView. Default implementation returns NULL SdrPageView* ObjectContact::TryToGetSdrPageView() const { - return 0; + return nullptr; } // access to OutputDevice. Default implementation returns NULL OutputDevice* ObjectContact::TryToGetOutputDevice() const { - return 0; + return nullptr; } void ObjectContact::resetViewPort() diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 6f62f8e670ca..69d74b0862ad 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -145,7 +145,7 @@ bool ObjectContactOfObjListPainter::isOutputToRecordingMetaFile() const // pdf export? bool ObjectContactOfObjListPainter::isOutputToPDFFile() const { - return (0 != mrTargetOutputDevice.GetPDFWriter()); + return (nullptr != mrTargetOutputDevice.GetPDFWriter()); } OutputDevice* ObjectContactOfObjListPainter::TryToGetOutputDevice() const diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 4786c7a5b8d1..b30c904bb5f1 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -164,7 +164,7 @@ namespace sdr // #114359# save old and set clip region OutputDevice* pOutDev = TryToGetOutputDevice(); - OSL_ENSURE(0 != pOutDev, "ObjectContactOfPageView without OutDev, someone has overridden TryToGetOutputDevice wrong (!)"); + OSL_ENSURE(nullptr != pOutDev, "ObjectContactOfPageView without OutDev, someone has overridden TryToGetOutputDevice wrong (!)"); bool bClipRegionPushed(false); const vcl::Region& rRedrawArea(rDisplayInfo.GetRedrawArea()); @@ -347,7 +347,7 @@ namespace sdr return &(GetSdrPage()->GetViewContact()); } - return 0; + return nullptr; } // Invalidate given rectangle at the window/output which is represented by @@ -446,7 +446,7 @@ namespace sdr // pdf export? bool ObjectContactOfPageView::isOutputToPDFFile() const { - return (0 != mrPageWindow.GetPaintWindow().GetOutputDevice().GetPDFWriter()); + return (nullptr != mrPageWindow.GetPaintWindow().GetOutputDevice().GetPDFWriter()); } // gray display mode diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index e2aed54ec2ae..9e15adb3ad96 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -78,7 +78,7 @@ void ViewContact::deleteAllVOCs() // ObjectContact (->View). Always needs to return something. ViewObjectContact& ViewContact::GetViewObjectContact(ObjectContact& rObjectContact) { - ViewObjectContact* pRetval = 0L; + ViewObjectContact* pRetval = nullptr; const sal_uInt32 nCount(maViewObjectContactVector.size()); // first search if there exists a VOC for the given OC @@ -180,7 +180,7 @@ ViewContact& ViewContact::GetViewContact(sal_uInt32 /*nIndex*/) const ViewContact* ViewContact::GetParentContact() const { // default has no parent - return 0; + return nullptr; } void ViewContact::ActionChildInserted(ViewContact& rChild) @@ -220,7 +220,7 @@ void ViewContact::ActionChanged() // implementations do. Override as needed. SdrObject* ViewContact::TryToGetSdrObject() const { - return 0L; + return nullptr; } // primitive stuff diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx index e5d9f689e5df..a07a7ec1cf4c 100644 --- a/svx/source/sdr/contact/viewcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewcontactofe3d.cxx @@ -60,7 +60,7 @@ const sdr::contact::ViewContactOfE3dScene* tryToFindVCOfE3DScene( } // object hierarchy structure is incorrect; no result - return 0; + return nullptr; } } // end of anonymous namespace diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index 7c32e153b4c3..383d09fd788c 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -64,7 +64,7 @@ void createSubPrimitive3DVector( createSubPrimitive3DVector( rCandidate.GetViewContact(a), aNewAllTarget, - o_pVisibleTarget ? &aNewVisibleTarget : 0, + o_pVisibleTarget ? &aNewVisibleTarget : nullptr, pVisibleLayerSet, bTestSelectedVisibility); } @@ -279,7 +279,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createScen // create 3d scene primitive with visible content tested against rLayerVisibility drawinglayer::primitive3d::Primitive3DSequence aAllSequence; drawinglayer::primitive3d::Primitive3DSequence aVisibleSequence; - const bool bTestLayerVisibility(0 != pLayerVisibility); + const bool bTestLayerVisibility(nullptr != pLayerVisibility); const bool bTestSelectedVisibility(GetE3dScene().GetDrawOnlySelected()); const bool bTestVisibility(bTestLayerVisibility || bTestSelectedVisibility); @@ -292,8 +292,8 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createScen createSubPrimitive3DVector( GetViewContact(a), aAllSequence, - bTestLayerVisibility ? &aVisibleSequence : 0, - bTestLayerVisibility ? pLayerVisibility : 0, + bTestLayerVisibility ? &aVisibleSequence : nullptr, + bTestLayerVisibility ? pLayerVisibility : nullptr, bTestSelectedVisibility); } @@ -340,7 +340,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewContactOfE3dScene::createView if(GetObjectCount()) { // create a default ScenePrimitive2D (without visibility test of members) - xRetval = createScenePrimitive2DSequence(0); + xRetval = createScenePrimitive2DSequence(nullptr); } return xRetval; @@ -433,7 +433,7 @@ drawinglayer::primitive3d::Primitive3DSequence ViewContactOfE3dScene::getAllPrim // is seen as part of the ViewTransformation (see text in createViewInformation3D) for(sal_uInt32 a(0L); a < nChildrenCount; a++) { - createSubPrimitive3DVector(GetViewContact(a), aAllPrimitive3DSequence, 0, 0, false); + createSubPrimitive3DVector(GetViewContact(a), aAllPrimitive3DSequence, nullptr, nullptr, false); } return aAllPrimitive3DSequence; diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 6ff5375ae927..1efd086f6f75 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -85,7 +85,7 @@ ViewContact& ViewContactOfSdrObj::GetViewContact(sal_uInt32 nIndex) const ViewContact* ViewContactOfSdrObj::GetParentContact() const { - ViewContact* pRetval = 0L; + ViewContact* pRetval = nullptr; SdrObjList* pObjList = GetSdrObject().GetObjList(); if(pObjList) diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index 4f68e3bd29d8..fa92aed98b06 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -88,7 +88,7 @@ namespace sdr { namespace contact { SdrUnoObj* pUnoObject = dynamic_cast< SdrUnoObj* >( TryToGetSdrObject() ); OSL_ENSURE( pUnoObject, "ViewContactOfUnoControl::getTemporaryControlForDevice: no SdrUnoObj!" ); if ( !pUnoObject ) - return NULL; + return nullptr; return ViewObjectContactOfUnoControl::getTemporaryControlForWindow( _rWindow, _inout_ControlContainer, *pUnoObject ); } @@ -100,7 +100,7 @@ namespace sdr { namespace contact { ObjectContactOfPageView* const pPageViewContact = dynamic_cast< ObjectContactOfPageView* >( &_rObjectContact ); const bool bPrintOrPreview = pPageViewContact - && ( ( ( pDevice != NULL ) && ( pDevice->GetOutDevType() == OUTDEV_PRINTER ) ) + && ( ( ( pDevice != nullptr ) && ( pDevice->GetOutDevType() == OUTDEV_PRINTER ) ) || pPageViewContact->GetPageWindow().GetPageView().GetView().IsPrintPreview() ) ; diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index 7ce2905c4809..8078349251fb 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -165,7 +165,7 @@ ViewObjectContact::ViewObjectContact(ObjectContact& rObjectContact, ViewContact& mrViewContact(rViewContact), maObjectRange(), mxPrimitive2DSequence(), - mpPrimitiveAnimation(0), + mpPrimitiveAnimation(nullptr), mbLazyInvalidate(false) { // make the ViewContact remember me @@ -187,7 +187,7 @@ ViewObjectContact::~ViewObjectContact() if(mpPrimitiveAnimation) { delete mpPrimitiveAnimation; - mpPrimitiveAnimation = 0; + mpPrimitiveAnimation = nullptr; } // take care of remembered ObjectContact. Remove from @@ -297,7 +297,7 @@ void ViewObjectContact::checkForPrimitive2DAnimations() if(mpPrimitiveAnimation) { delete mpPrimitiveAnimation; - mpPrimitiveAnimation = 0; + mpPrimitiveAnimation = nullptr; } // check for animated primitives diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index a2a578e029b4..dd68629779e6 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -218,7 +218,7 @@ namespace sdr // #i103720# forget event to avoid possible deletion by the following ActionChanged call // which may use createPrimitive2DSequence/impPrepareGraphicWithAsynchroniousLoading again. // Deletion is actually done by the scheduler who leaded to coming here - mpAsynchLoadEvent = 0; + mpAsynchLoadEvent = nullptr; // Invalidate all paint areas and check existing animation (which may have changed). GetViewContact().ActionChanged(); @@ -237,7 +237,7 @@ namespace sdr "ViewObjectContactOfGraphic::forgetAsynchGraphicLoadingEvent: Forced to forget another event then I have scheduled (?)"); // forget event - mpAsynchLoadEvent = 0; + mpAsynchLoadEvent = nullptr; } } @@ -307,7 +307,7 @@ namespace sdr ViewObjectContactOfGraphic::ViewObjectContactOfGraphic(ObjectContact& rObjectContact, ViewContact& rViewContact) : ViewObjectContactOfSdrObj(rObjectContact, rViewContact), - mpAsynchLoadEvent(0) + mpAsynchLoadEvent(nullptr) { } diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index 7cc66dcfc4ab..8a1b3ccbb4a4 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -77,7 +77,7 @@ public: PagePrimitiveExtractor::PagePrimitiveExtractor( ViewObjectContactOfPageObj& rVOC) -: ObjectContactOfPagePainter(0, rVOC.GetObjectContact()), +: ObjectContactOfPagePainter(nullptr, rVOC.GetObjectContact()), mrViewObjectContactOfPageObj(rVOC) { // make this renderer a preview renderer @@ -258,7 +258,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageObj::creat // #i105548# reset VOCRedirector to not accidentally have a pointer to a // temporary class, so calls to it are avoided safely - mpExtractor->SetViewObjectContactRedirector(0); + mpExtractor->SetViewObjectContactRedirector(nullptr); // reset recursion flag bInCreatePrimitive2D = false; @@ -314,11 +314,11 @@ ViewObjectContactOfPageObj::~ViewObjectContactOfPageObj() // remember candidate and reset own pointer to avoid action when createPrimitive2DSequence() // would be called for any reason PagePrimitiveExtractor* pCandidate = mpExtractor; - mpExtractor = 0; + mpExtractor = nullptr; // also reset the StartPage to avoid ActionChanged() forwardings in the // PagePrimitiveExtractor::InvalidatePartOfView() implementation - pCandidate->SetStartPage(0); + pCandidate->SetStartPage(nullptr); delete pCandidate; } } diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index a114927f360d..cdc5cc2a4112 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -36,7 +36,7 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r ViewContact& rViewContact, const ::avmedia::MediaItem& rMediaItem ) : ViewObjectContactOfSdrObj( rObjectContact, rViewContact ), - mpMediaWindow( NULL ) + mpMediaWindow( nullptr ) { #if HAVE_FEATURE_AVMEDIA vcl::Window* pWindow = getWindow(); @@ -55,14 +55,14 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj() { delete mpMediaWindow; - mpMediaWindow = NULL; + mpMediaWindow = nullptr; } vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const { - vcl::Window* pRetval = 0; + vcl::Window* pRetval = nullptr; boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice(); if( oPageOutputDev ) diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx index 0c9afc62db49..836925c0f5e0 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx @@ -125,7 +125,7 @@ bool ViewObjectContactOfSdrObj::isPrimitiveVisible(const DisplayInfo& rDisplayIn } else { - const bool bIsFormControl = dynamic_cast< const FmFormObj * >( &rObject ) != 0; + const bool bIsFormControl = dynamic_cast< const FmFormObj * >( &rObject ) != nullptr; if(bIsFormControl && bHideFormControl) { return false; diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 169b136f28bf..d3a46cb5feec 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -391,7 +391,7 @@ namespace sdr { namespace contact { Reference< XControlContainer > SdrPageViewAccess::getControlContainer( const OutputDevice& _rDevice ) const { Reference< XControlContainer > xControlContainer = m_rPageView.GetControlContainer( _rDevice ); - DBG_ASSERT( xControlContainer.is() || NULL == m_rPageView.FindPageWindow( _rDevice ), + DBG_ASSERT( xControlContainer.is() || nullptr == m_rPageView.FindPageWindow( _rDevice ), "SdrPageViewAccess::getControlContainer: the output device is known, but there is no control container for it?" ); return xControlContainer; } @@ -482,7 +482,7 @@ namespace sdr { namespace contact { Reference< XControlContainer > DummyPageViewAccess::getControlContainer( const OutputDevice& /*_rDevice*/ ) const { - return NULL; + return nullptr; } @@ -757,7 +757,7 @@ namespace sdr { namespace contact { /** determines whether the instance is disposed @nofail */ - bool impl_isDisposed_nofail() const { return m_pAntiImpl == NULL; } + bool impl_isDisposed_nofail() const { return m_pAntiImpl == nullptr; } /** determines whether our control is currently visible @nofail @@ -848,7 +848,7 @@ namespace sdr { namespace contact { ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl ) :m_pAntiImpl( _pAntiImpl ) ,m_bCreatingControl( false ) - ,m_pOutputDeviceForWindow( NULL ) + ,m_pOutputDeviceForWindow( nullptr ) ,m_bControlIsVisible( false ) ,m_bIsDesignModeListening( false ) ,m_eControlDesignMode( eUnknown ) @@ -905,10 +905,10 @@ namespace sdr { namespace contact { m_aControl.clear(); m_xContainer.clear(); - m_pOutputDeviceForWindow = NULL; + m_pOutputDeviceForWindow = nullptr; m_bControlIsVisible = false; - m_pAntiImpl = NULL; + m_pAntiImpl = nullptr; } @@ -923,14 +923,14 @@ namespace sdr { namespace contact { { OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::getUnoObject: already disposed()" ); if ( impl_isDisposed_nofail() ) - _out_rpObject = NULL; + _out_rpObject = nullptr; else { _out_rpObject = dynamic_cast< SdrUnoObj* >( m_pAntiImpl->GetViewContact().TryToGetSdrObject() ); DBG_ASSERT( _out_rpObject || !m_pAntiImpl->GetViewContact().TryToGetSdrObject(), "ViewObjectContactOfUnoControl_Impl::getUnoObject: invalid SdrObject!" ); } - return ( _out_rpObject != NULL ); + return ( _out_rpObject != nullptr ); } @@ -942,7 +942,7 @@ namespace sdr { namespace contact { try { - SdrUnoObj* pUnoObject( NULL ); + SdrUnoObj* pUnoObject( nullptr ); if ( getUnoObject( pUnoObject ) ) { Point aGridOffset = pUnoObject->GetGridOffset(); @@ -1054,7 +1054,7 @@ namespace sdr { namespace contact { UnoControlContactHelper::disposeAndClearControl_nothrow( m_aControl ); } - SdrUnoObj* pUnoObject( NULL ); + SdrUnoObj* pUnoObject( nullptr ); if ( !getUnoObject( pUnoObject ) ) return false; @@ -1067,7 +1067,7 @@ namespace sdr { namespace contact { m_xContainer.set(_rPageView.getControlContainer( _rDevice ), css::uno::UNO_QUERY); DBG_ASSERT( ( m_xContainer.is() // either have a XControlContainer || ( ( !_rPageView.getControlContainer( _rDevice ).is() ) // or don't have any container, - && ( dynamic_cast< const vcl::Window* >( &_rDevice ) == NULL ) // which is allowed for non-Window instances only + && ( dynamic_cast< const vcl::Window* >( &_rDevice ) == nullptr ) // which is allowed for non-Window instances only ) ), "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: no XContainer at the ControlContainer!" ); @@ -1163,7 +1163,7 @@ namespace sdr { namespace contact { { OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: already disposed!" ); - _out_rpPageView = NULL; + _out_rpPageView = nullptr; if ( impl_isDisposed_nofail() ) return false; @@ -1171,8 +1171,8 @@ namespace sdr { namespace contact { if ( pPageViewContact ) _out_rpPageView = &pPageViewContact->GetPageWindow().GetPageView(); - DBG_ASSERT( _out_rpPageView != NULL, "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: this method is expected to always have success!" ); - return ( _out_rpPageView != NULL ); + DBG_ASSERT( _out_rpPageView != nullptr, "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: this method is expected to always have success!" ); + return ( _out_rpPageView != nullptr ); } @@ -1181,11 +1181,11 @@ namespace sdr { namespace contact { OSL_PRECOND( m_aControl.is(), "ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw: only valid if we have a control!" ); - SdrPageView* pPageView( NULL ); + SdrPageView* pPageView( nullptr ); if ( !impl_getPageView_nothrow( pPageView ) ) return; - SdrUnoObj* pUnoObject( NULL ); + SdrUnoObj* pUnoObject( nullptr ); if ( !getUnoObject( pUnoObject ) ) return; @@ -1299,7 +1299,7 @@ namespace sdr { namespace contact { bool ViewObjectContactOfUnoControl_Impl::isPrintableControl() const { - SdrUnoObj* pUnoObject( NULL ); + SdrUnoObj* pUnoObject( nullptr ); if ( !getUnoObject( pUnoObject ) ) return false; @@ -1613,7 +1613,7 @@ namespace sdr { namespace contact { ViewObjectContactOfUnoControl::~ViewObjectContactOfUnoControl() { m_pImpl->dispose(); - m_pImpl = NULL; + m_pImpl = nullptr; } @@ -1621,7 +1621,7 @@ namespace sdr { namespace contact { Reference< XControl > ViewObjectContactOfUnoControl::getControl() { SolarMutexGuard aSolarGuard; - m_pImpl->ensureControl( NULL ); + m_pImpl->ensureControl( nullptr ); return m_pImpl->getExistentControl().getControl(); } diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index c8c4f7a1ae99..50625289caff 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -78,7 +78,7 @@ namespace sdr } else { - return 0L; + return nullptr; } } @@ -100,7 +100,7 @@ namespace sdr for(;;) { BaseEvent* pEvent = GetEvent(); - if(pEvent == NULL) + if(pEvent == nullptr) break; pEvent->ExecuteEvent(); delete pEvent; diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index d32e4d679789..27faabd67acb 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -194,7 +194,7 @@ namespace sdr invalidateRange(rTarget.getBaseRange()); // clear manager - rTarget.mpOverlayManager = 0; + rTarget.mpOverlayManager = nullptr; } void OverlayManager::impApplyAddActions(OverlayObject& rTarget) @@ -268,7 +268,7 @@ namespace sdr void OverlayManager::add(OverlayObject& rOverlayObject) { - OSL_ENSURE(0 == rOverlayObject.mpOverlayManager, "OverlayObject is added twice to an OverlayManager (!)"); + OSL_ENSURE(nullptr == rOverlayObject.mpOverlayManager, "OverlayObject is added twice to an OverlayManager (!)"); // add to the end of chain to preserve display order in paint maOverlayObjects.push_back(&rOverlayObject); diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index 25109df16e89..cba94c6f9091 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -425,7 +425,7 @@ namespace sdr void OverlayManagerBuffered::flush() { // call timer handler direct - ImpBufferTimerHandler(0); + ImpBufferTimerHandler(nullptr); } void OverlayManagerBuffered::restoreBackground(const vcl::Region& rRegion) const diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 00499829e0fb..09d1d948687f 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -91,7 +91,7 @@ namespace sdr OverlayObject::OverlayObject(Color aBaseColor) : Event(0), - mpOverlayManager(0), + mpOverlayManager(nullptr), maBaseColor(aBaseColor), mbIsVisible(true), mbIsHittable(true), @@ -102,7 +102,7 @@ namespace sdr OverlayObject::~OverlayObject() { - OSL_ENSURE(0 == getOverlayManager(), "OverlayObject is destructed which is still registered at OverlayManager (!)"); + OSL_ENSURE(nullptr == getOverlayManager(), "OverlayObject is destructed which is still registered at OverlayManager (!)"); } drawinglayer::primitive2d::Primitive2DSequence OverlayObject::getOverlayObjectPrimitive2DSequence() const diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index 390683f2be3b..7d41b77eb2ed 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -83,7 +83,7 @@ namespace drawinglayer } // prepare fully scaled polygon - BasePrimitive2D* pNewFillPrimitive = 0; + BasePrimitive2D* pNewFillPrimitive = nullptr; if(!rFill.getGradient().isDefault()) { @@ -155,7 +155,7 @@ namespace drawinglayer // create line and stroke attribute const attribute::LineAttribute aLineAttribute(rLine.getColor(), rLine.getWidth(), rLine.getJoin(), rLine.getCap()); const attribute::StrokeAttribute aStrokeAttribute(rLine.getDotDashArray(), rLine.getFullDotDashLen()); - BasePrimitive2D* pNewLinePrimitive = 0L; + BasePrimitive2D* pNewLinePrimitive = nullptr; if(!rPolygon.isClosed() && !rStroke.isDefault()) { @@ -195,7 +195,7 @@ namespace drawinglayer bool bClipOnBounds) { basegfx::B2DHomMatrix aAnchorTransform(rObjectTransform); - SdrTextPrimitive2D* pNew = 0; + SdrTextPrimitive2D* pNew = nullptr; if(rText.isContour()) { @@ -337,7 +337,7 @@ namespace drawinglayer } } - OSL_ENSURE(pNew != 0, "createTextPrimitive: no text primitive created (!)"); + OSL_ENSURE(pNew != nullptr, "createTextPrimitive: no text primitive created (!)"); if(rText.isBlink()) { diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index ea4ffa396d30..0594716fd427 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -37,7 +37,7 @@ namespace drawinglayer Primitive2DSequence SdrOleContentPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*aViewInformation*/) const { Primitive2DSequence aRetval; - const SdrOle2Obj* pSource = (mpSdrOle2Obj.is() ? static_cast< SdrOle2Obj* >(mpSdrOle2Obj.get()) : 0); + const SdrOle2Obj* pSource = (mpSdrOle2Obj.is() ? static_cast< SdrOle2Obj* >(mpSdrOle2Obj.get()) : nullptr); bool bScaleContent(false); Graphic aGraphic; diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx index 21cf0812545c..78a27d92fc92 100644 --- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx +++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx @@ -31,7 +31,7 @@ namespace drawinglayer { BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor) { - static vcl::DeleteOnDeinit< BitmapEx > aRetVal(0); + static vcl::DeleteOnDeinit< BitmapEx > aRetVal(nullptr); static basegfx::BColor aColor; static ::osl::Mutex aMutex; diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 0fbcd16ed873..674b3ef4a5f4 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -99,7 +99,7 @@ namespace sdr // reset parent of ItemSet if(mpItemSet) { - mpItemSet->SetParent(0L); + mpItemSet->SetParent(nullptr); } SdrObject& rObj = GetSdrObject(); @@ -107,7 +107,7 @@ namespace sdr rObj.SetRectsDirty(true); } - mpStyleSheet = 0L; + mpStyleSheet = nullptr; } // create a new itemset @@ -126,13 +126,13 @@ namespace sdr AttributeProperties::AttributeProperties(SdrObject& rObj) : DefaultProperties(rObj), - mpStyleSheet(0L) + mpStyleSheet(nullptr) { } AttributeProperties::AttributeProperties(const AttributeProperties& rProps, SdrObject& rObj) : DefaultProperties(rProps, rObj), - mpStyleSheet(0L) + mpStyleSheet(nullptr) { if(rProps.GetStyleSheet()) { @@ -164,7 +164,7 @@ namespace sdr { if(pNewItem) { - const SfxPoolItem* pResultItem = NULL; + const SfxPoolItem* pResultItem = nullptr; SdrModel* pModel = GetSdrObject().GetModel(); switch( nWhich ) @@ -246,7 +246,7 @@ namespace sdr void AttributeProperties::MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel) { - OSL_ASSERT(pNewModel!=NULL); + OSL_ASSERT(pNewModel!=nullptr); if(pSrcPool && pDestPool && (pSrcPool != pDestPool)) { @@ -285,12 +285,12 @@ namespace sdr // name or use the default. // Look up the style in the new document. - OSL_ASSERT(pNewModel->GetStyleSheetPool() != NULL); + OSL_ASSERT(pNewModel->GetStyleSheetPool() != nullptr); SfxStyleSheet* pNewStyleSheet = dynamic_cast<SfxStyleSheet*>( pNewModel->GetStyleSheetPool()->Find( pStySheet->GetName(), SFX_STYLE_FAMILY_ALL)); - if (pNewStyleSheet == NULL + if (pNewStyleSheet == nullptr || &pNewStyleSheet->GetPool().GetPool() != pDestPool) { // There is no copy of the style in the new @@ -340,7 +340,7 @@ namespace sdr { // build a list of to-be-copied Styles std::vector<SfxStyleSheetBase*> aStyleList; - SfxStyleSheetBase* pAnchor = 0L; + SfxStyleSheetBase* pAnchor = nullptr; while(pSheet) { @@ -354,14 +354,14 @@ namespace sdr else { // the style does exist - pSheet = 0L; + pSheet = nullptr; } } // copy and set the parents - SfxStyleSheetBase* pNewSheet = 0L; - SfxStyleSheetBase* pLastSheet = 0L; - SfxStyleSheetBase* pForThisObject = 0L; + SfxStyleSheetBase* pNewSheet = nullptr; + SfxStyleSheetBase* pLastSheet = nullptr; + SfxStyleSheetBase* pForThisObject = nullptr; std::vector<SfxStyleSheetBase*>::iterator iter; for (iter = aStyleList.begin(); iter != aStyleList.end(); ++iter) @@ -456,7 +456,7 @@ namespace sdr } delete mpItemSet; - mpItemSet = 0L; + mpItemSet = nullptr; } mpItemSet = pNewSet; @@ -480,7 +480,7 @@ namespace sdr // prepare copied, new itemset, but WITHOUT parent GetObjectItemSet(); SfxItemSet* pDestItemSet = new SfxItemSet(*mpItemSet); - pDestItemSet->SetParent(0L); + pDestItemSet->SetParent(nullptr); // prepare forgetting the current stylesheet like in RemoveStyleSheet() EndListening(*mpStyleSheet); @@ -490,7 +490,7 @@ namespace sdr // WhichIDs than the style. SfxWhichIter aIter(*pDestItemSet); sal_uInt16 nWhich(aIter.FirstWhich()); - const SfxPoolItem *pItem = NULL; + const SfxPoolItem *pItem = nullptr; // now set all hard attributes of the current at the new itemset while(nWhich) @@ -513,7 +513,7 @@ namespace sdr GetSdrObject().SetBoundRectDirty(); GetSdrObject().SetRectsDirty(true); - mpStyleSheet = NULL; + mpStyleSheet = nullptr; } } @@ -545,7 +545,7 @@ namespace sdr case SfxStyleSheetHintId::INDESTRUCTION : { // Style needs to be exchanged - SfxStyleSheet* pNewStSh = 0L; + SfxStyleSheet* pNewStSh = nullptr; SdrModel* pModel = rObj.GetModel(); // Do nothing if object is in destruction, else a StyleSheet may be found from diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 813e963ea034..338cfedf1ec3 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -43,13 +43,13 @@ namespace sdr DefaultProperties::DefaultProperties(SdrObject& rObj) : BaseProperties(rObj), - mpItemSet(0L) + mpItemSet(nullptr) { } DefaultProperties::DefaultProperties(const DefaultProperties& rProps, SdrObject& rObj) : BaseProperties(rObj), - mpItemSet(0L) + mpItemSet(nullptr) { if(rProps.mpItemSet) { @@ -59,7 +59,7 @@ namespace sdr // This class just copies the ItemSet, ignore parent. if(mpItemSet && mpItemSet->GetParent()) { - mpItemSet->SetParent(0L); + mpItemSet->SetParent(nullptr); } } } @@ -74,7 +74,7 @@ namespace sdr if(mpItemSet) { delete mpItemSet; - mpItemSet = 0L; + mpItemSet = nullptr; } } @@ -193,7 +193,7 @@ namespace sdr void DefaultProperties::PostItemChange(const sal_uInt16 nWhich ) { - if( (nWhich == XATTR_FILLSTYLE) && (mpItemSet != NULL) ) + if( (nWhich == XATTR_FILLSTYLE) && (mpItemSet != nullptr) ) CleanupFillProperties(*mpItemSet); } @@ -205,7 +205,7 @@ namespace sdr SfxStyleSheet* DefaultProperties::GetStyleSheet() const { // no StyleSheet in DefaultProperties - return 0L; + return nullptr; } void DefaultProperties::ForceDefaultAttributes() diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index f9a128d4a5fe..44530ee1ba8f 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -247,7 +247,7 @@ namespace sdr SfxStyleSheet* E3dSceneProperties::GetStyleSheet() const { - SfxStyleSheet* pRetval = 0L; + SfxStyleSheet* pRetval = nullptr; const SdrObjList* pSub = static_cast<const E3dScene&>(GetSdrObject()).GetSubList(); const size_t nCount(pSub->GetObjCount()); @@ -261,7 +261,7 @@ namespace sdr if(pCandidate != pRetval) { // different StyleSheelts, return none - return 0L; + return nullptr; } } else diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index f0567e8b9f97..d91644547b47 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -40,13 +40,13 @@ namespace sdr EmptyProperties::EmptyProperties(SdrObject& rObj) : BaseProperties(rObj), - mpEmptyItemSet(0L) + mpEmptyItemSet(nullptr) { } EmptyProperties::EmptyProperties(const EmptyProperties& rProps, SdrObject& rObj) : BaseProperties(rProps, rObj), - mpEmptyItemSet(0L) + mpEmptyItemSet(nullptr) { // do not gererate an assert, else derivations like PageProperties will generate an assert // using the Clone() operator path. @@ -57,7 +57,7 @@ namespace sdr if(mpEmptyItemSet) { delete mpEmptyItemSet; - mpEmptyItemSet = 0L; + mpEmptyItemSet = nullptr; } } @@ -133,7 +133,7 @@ namespace sdr SfxStyleSheet* EmptyProperties::GetStyleSheet() const { DBG_ASSERT(false, "EmptyProperties::GetStyleSheet() should never be called (!)"); - return 0L; + return nullptr; } } // end of namespace properties } // end of namespace sdr diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index c4e9d91a17b8..f902c05aef6f 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -202,7 +202,7 @@ namespace sdr SfxStyleSheet* GroupProperties::GetStyleSheet() const { - SfxStyleSheet* pRetval = 0L; + SfxStyleSheet* pRetval = nullptr; const SdrObjList* pSub = static_cast<const SdrObjGroup&>(GetSdrObject()).GetSubList(); const size_t nCount(pSub->GetObjCount()); @@ -216,7 +216,7 @@ namespace sdr if(pCandidate != pRetval) { // different StyleSheelts, return none - return 0L; + return nullptr; } } else @@ -265,7 +265,7 @@ namespace sdr // just delete it and set to 0L. // mpItemSet->ClearItem(); delete mpItemSet; - mpItemSet = 0L; + mpItemSet = nullptr; } } } diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index e97c4479af68..6a34946099f2 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -107,7 +107,7 @@ namespace sdr SfxWhichIter aIter(rSet); sal_uInt16 nWhich(aIter.FirstWhich()); - const SfxPoolItem *pItem = NULL; + const SfxPoolItem *pItem = nullptr; while(nWhich) { diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index 36a93c7cfd2f..20758b0f24ed 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -76,12 +76,12 @@ namespace sdr SfxStyleSheet* PageProperties::GetStyleSheet() const { // override to legally return a 0L pointer here - return 0L; + return nullptr; } void PageProperties::PostItemChange(const sal_uInt16 nWhich ) { - if( (nWhich == XATTR_FILLSTYLE) && (mpEmptyItemSet != NULL) ) + if( (nWhich == XATTR_FILLSTYLE) && (mpEmptyItemSet != nullptr) ) CleanupFillProperties(*mpEmptyItemSet); } diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 8f68d861da24..9b4a045bb62a 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -92,7 +92,7 @@ namespace sdr { SdrText* pText = rTextProvider.getText( nText ); - OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : 0; + OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : nullptr; if(pParaObj) { @@ -251,7 +251,7 @@ namespace sdr { SdrText* pText = rTextProvider.getText( nText ); - OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : 0; + OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : nullptr; if( !pParaObj ) continue; @@ -263,7 +263,7 @@ namespace sdr { for(sal_Int32 nPara = 0; nPara < nParaCount; nPara++) { - SfxItemSet* pTempSet = 0L; + SfxItemSet* pTempSet = nullptr; // since setting the stylesheet removes all para attributes if(bDontRemoveHardAttr) @@ -282,8 +282,8 @@ namespace sdr aNewStyleSheetName += OUString::number( nDepth <= 0 ? 1 : nDepth + 1); SdrModel* pModel = rObj.GetModel(); - SfxStyleSheetBasePool* pStylePool = (pModel != NULL) ? pModel->GetStyleSheetPool() : 0L; - SfxStyleSheet* pNewStyle = NULL; + SfxStyleSheetBasePool* pStylePool = (pModel != nullptr) ? pModel->GetStyleSheetPool() : nullptr; + SfxStyleSheet* pNewStyle = nullptr; if(pStylePool) pNewStyle = static_cast<SfxStyleSheet*>(pStylePool->Find(aNewStyleSheetName, GetStyleSheet()->GetFamily())); DBG_ASSERT( pNewStyle, "AutoStyleSheetName - Style not found!" ); @@ -301,7 +301,7 @@ namespace sdr else { // remove StyleSheet - rOutliner.SetStyleSheet(nPara, 0L); + rOutliner.SetStyleSheet(nPara, nullptr); } if(bDontRemoveHardAttr) @@ -413,7 +413,7 @@ namespace sdr { SdrText* pText = rTextProvider.getText( nText ); - OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : 0; + OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : nullptr; if( !pParaObj ) continue; diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index 58eb5e49049a..3a70fa51b94c 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -57,7 +57,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( SfxViewShell* pViewShell, const ::sfx2::sidebar::EnumContext::Context eContext) { - if (pViewShell != NULL) + if (pViewShell != nullptr) NotifyContextChange(pViewShell->GetController(), eContext); } diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 49f3b96747ce..8cc30e697b0a 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -126,18 +126,18 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( aArguments.getOrDefault("ContextName", OUString())); vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); - if ( ! xParentWindow.is() || pParentWindow==NULL) + if ( ! xParentWindow.is() || pParentWindow==nullptr) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow", - NULL); + nullptr); if ( ! xFrame.is()) throw RuntimeException( "PanelFactory::createUIElement called without Frame", - NULL); - if (pBindings == NULL) + nullptr); + if (pBindings == nullptr) throw RuntimeException( "PanelFactory::createUIElement called without SfxBindings", - NULL); + nullptr); VclPtr<vcl::Window> pControl; ui::LayoutSize aLayoutSize (-1,-1,-1); diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 2ce453032e3d..7a6c97df812c 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -91,12 +91,12 @@ VclPtr<vcl::Window> AreaPropertyPanel::Create ( const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to AreaPropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to AreaPropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to AreaPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to AreaPropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to AreaPropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to AreaPropertyPanel::Create", nullptr, 2); return VclPtr<AreaPropertyPanel>::Create( pParent, diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 2a3777f22d33..e1a97b380d6f 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -443,7 +443,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void) const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectEntry(), aGradient); // #i122676# Change FillStyle and Gradinet in one call - setFillStyleAndGradient(bFillStyleChange ? &aXFillStyleItem : NULL, aXFillGradientItem); + setFillStyleAndGradient(bFillStyleChange ? &aXFillStyleItem : nullptr, aXFillGradientItem); } break; @@ -467,7 +467,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void) const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectEntry(), aHatch); // #i122676# Change FillStyle and Hatch in one call - setFillStyleAndHatch(bFillStyleChange ? &aXFillStyleItem : NULL, aXFillHatchItem); + setFillStyleAndHatch(bFillStyleChange ? &aXFillStyleItem : nullptr, aXFillHatchItem); } } @@ -496,7 +496,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void) const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); // #i122676# Change FillStyle and Bitmap in one call - setFillStyleAndBitmap(bFillStyleChange ? &aXFillStyleItem : NULL, aXFillBitmapItem); + setFillStyleAndBitmap(bFillStyleChange ? &aXFillStyleItem : nullptr, aXFillBitmapItem); } } @@ -560,7 +560,7 @@ void AreaPropertyPanelBase::ImpUpdateTransparencies() { const XGradient& rGradient = mpFloatTransparenceItem->GetGradientValue(); sal_Int32 nEntryPos(0); - Image* pImage = 0; + Image* pImage = nullptr; mpLBTransType->Enable(); mpTrspTextFT->Enable(); @@ -750,7 +750,7 @@ void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefault, co { if(bDefault) { - mpFillGradientItem.reset(pItem ? static_cast<XFillGradientItem*>(pItem->Clone()) : 0); + mpFillGradientItem.reset(pItem ? static_cast<XFillGradientItem*>(pItem->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_GRADIENT == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -787,7 +787,7 @@ void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefault, const { if(bDefault) { - mpHatchItem.reset(pItem ? static_cast<XFillHatchItem*>(pItem->Clone()) : 0); + mpHatchItem.reset(pItem ? static_cast<XFillHatchItem*>(pItem->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_HATCH == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -816,7 +816,7 @@ void AreaPropertyPanelBase::updateFillColor(bool bDefault, const XFillColorItem* { if(bDefault) { - mpColorItem.reset(pItem ? static_cast<XFillColorItem*>(pItem->Clone()) : 0); + mpColorItem.reset(pItem ? static_cast<XFillColorItem*>(pItem->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_SOLID == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -832,7 +832,7 @@ void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefault, cons { if(bDefault) { - mpBitmapItem.reset(pItem ? static_cast<XFillBitmapItem*>(pItem->Clone()) : 0); + mpBitmapItem.reset(pItem ? static_cast<XFillBitmapItem*>(pItem->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_BITMAP == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -1244,7 +1244,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, v break; } - SfxItemPool* pPool = 0; + SfxItemPool* pPool = nullptr; const XFillFloatTransparenceItem aGradientItem(pPool, aTmpGradient, bGradient); setFillFloatTransparence(aGradientItem); } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index 0a5aa89ed37d..d6e64d49e98e 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -284,7 +284,7 @@ void AreaTransparencyGradientControl::ExecuteValueModify( sal_uInt8 nStartCol, s mrAreaPropertyPanel.SetGradient(aTmpGradient); - SfxItemPool* pPool = NULL; + SfxItemPool* pPool = nullptr; bool bEnable = true; XFillFloatTransparenceItem aGradientItem(pPool,aTmpGradient, bEnable ); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index 98ddc10f589a..04db2e750878 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -40,7 +40,7 @@ void AreaTransparencyGradientPopup::Rearrange (XFillFloatTransparenceItem* pItem ProvideContainerAndControl(); AreaTransparencyGradientControl* pControl = dynamic_cast<AreaTransparencyGradientControl*>(mxControl.get()); - if (pControl != NULL) + if (pControl != nullptr) pControl->Rearrange(pItem); } diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 1f0513ab25ad..b43fd3f04d5f 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -226,12 +226,12 @@ VclPtr<vcl::Window> GraphicPropertyPanel::Create ( const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to GraphicPropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to GraphicPropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to GraphicPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to GraphicPropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to GraphicPropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to GraphicPropertyPanel::Create", nullptr, 2); return VclPtr<GraphicPropertyPanel>::Create( pParent, diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index ff120dcae83d..c0e4649aa067 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -66,7 +66,7 @@ InsertPropertyPanel::InsertPropertyPanel ( // In other words, we should find the underlying problem, and remove the // WindowEventListener for good. vcl::Window* pTopWindow = pParent; - while (pTopWindow->GetParent() != NULL) + while (pTopWindow->GetParent() != nullptr) pTopWindow = pTopWindow->GetParent(); pTopWindow->AddChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener)); } @@ -80,7 +80,7 @@ void InsertPropertyPanel::dispose() { // Remove window child listener. vcl::Window* pTopWindow = this; - while (pTopWindow->GetParent() != NULL) + while (pTopWindow->GetParent() != nullptr) pTopWindow = pTopWindow->GetParent(); pTopWindow->RemoveChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener)); mpStandardShapesToolBox.clear(); @@ -101,7 +101,7 @@ IMPL_LINK_TYPED(InsertPropertyPanel, WindowEventListener, VclWindowEvent&, rEven vcl::Window* pWindow = rEvent.GetWindow(); ToolBox* pToolBox = dynamic_cast<ToolBox*>(pWindow); - if (pToolBox == NULL) + if (pToolBox == nullptr) return; // Extract name of (sub)toolbar from help id. @@ -118,13 +118,13 @@ IMPL_LINK_TYPED(InsertPropertyPanel, WindowEventListener, VclWindowEvent&, rEven return; SidebarToolBox* pSidebarToolBox = dynamic_cast<SidebarToolBox*>(mpStandardShapesToolBox.get()); - if (pSidebarToolBox == NULL) + if (pSidebarToolBox == nullptr) return; sal_uInt16 nItemId (pSidebarToolBox->GetItemIdForSubToolbarName(aURL.Path)); if (nItemId == 0) { pSidebarToolBox = dynamic_cast<SidebarToolBox*>(mpCustomShapesToolBox.get()); - if (pSidebarToolBox == NULL) + if (pSidebarToolBox == nullptr) return; nItemId = pSidebarToolBox->GetItemIdForSubToolbarName(aURL.Path); if (nItemId == 0) diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 2a5e134954de..77f67e9602d4 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -108,12 +108,12 @@ VclPtr<vcl::Window> LinePropertyPanel::Create ( const uno::Reference<frame::XFrame>& rxFrame, SfxBindings* pBindings) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to LinePropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to LinePropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to LinePropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to LinePropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to LinePropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to LinePropertyPanel::Create", nullptr, 2); return VclPtr<LinePropertyPanel>::Create(pParent, rxFrame, pBindings); } diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index a2831c4aa888..2c6958e84aa2 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -298,7 +298,7 @@ void LinePropertyPanelBase::updateLineStyle(bool bDisabled, bool bSetOrDefault, } else { - mpStyleItem.reset(0); + mpStyleItem.reset(nullptr); } SelectLineStyle(); @@ -410,7 +410,7 @@ void LinePropertyPanelBase::updateLineStart(bool bDisabled, bool bSetOrDefault, } } - mpStartItem.reset(0); + mpStartItem.reset(nullptr); SelectEndStyle(true); } @@ -437,7 +437,7 @@ void LinePropertyPanelBase::updateLineEnd(bool bDisabled, bool bSetOrDefault, } } - mpEndItem.reset(0); + mpEndItem.reset(nullptr); SelectEndStyle(false); } diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 685ed7abe726..c938102c401f 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -44,7 +44,7 @@ LineWidthControl::LineWidthControl ( maFTWidth( VclPtr<FixedText>::Create(this, SVX_RES(FT_LINE_WIDTH))), maMFWidth( VclPtr<MetricField>::Create(this, SVX_RES(MF_WIDTH))), meMapUnit(SFX_MAPUNIT_TWIP), - rStr(NULL), + rStr(nullptr), mstrPT(SVX_RESSTR(STR_PT)), mnCustomWidth(0), mbCustom(false), diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 2dfb136211f6..8fc0bc33abe9 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -47,14 +47,14 @@ void LineWidthPopup::SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMa ProvideContainerAndControl(); LineWidthControl* pControl = dynamic_cast<LineWidthControl*>(mxControl.get()); - if (pControl != NULL) + if (pControl != nullptr) pControl->SetWidthSelect(lValue, bValuable, eMapUnit); } void LineWidthPopup::PopupModeEndCallback() { LineWidthControl* pControl = dynamic_cast<LineWidthControl*>(mxControl.get()); - if (pControl != NULL) + if (pControl != nullptr) { if (pControl->IsCloseByEdit()) { diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index b8354fc6dca9..2d41152032c0 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -26,7 +26,7 @@ namespace svx { namespace sidebar { LineWidthValueSet::LineWidthValueSet ( vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ), - pVDev(NULL), + pVDev(nullptr), nSelItem(0), bCusEnable(false) { diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index cd3b0d36f6bd..78d4a7c65609 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -240,7 +240,7 @@ void NBOTypeMgrBase::StoreMapUnit_impl() { } } // Character Bullet Type lib -BulletsSettings_Impl* BulletsTypeMgr::pActualBullets[] ={0,0,0,0,0,0,0,0}; +BulletsSettings_Impl* BulletsTypeMgr::pActualBullets[] ={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}; sal_Unicode BulletsTypeMgr::aDynamicBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '}; sal_Unicode BulletsTypeMgr::aDynamicRTLBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '}; @@ -590,7 +590,7 @@ sal_uInt16 GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uI SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); const SvxBrushItem* pBrsh = aFmt.GetBrush(); - const Graphic* pGrf = 0; + const Graphic* pGrf = nullptr; if ( pBrsh ) pGrf = pBrsh->GetGraphic(); @@ -632,7 +632,7 @@ bool GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); const SvxBrushItem* pBrsh = aFmt.GetBrush(); - const Graphic* pGrf = 0; + const Graphic* pGrf = nullptr; if ( pBrsh ) pGrf = pBrsh->GetGraphic(); else @@ -759,8 +759,8 @@ OUString GraphyicBulletsTypeMgr::GetGrfName(sal_uInt16 nIndex) return sRet; } // Mix Bullets Type lib -MixBulletsSettings_Impl* MixBulletsTypeMgr::pActualBullets[] ={0,0,0,0,0,0,0,0}; -MixBulletsSettings_Impl* MixBulletsTypeMgr::pDefaultActualBullets[] ={0,0,0,0,0,0,0,0}; +MixBulletsSettings_Impl* MixBulletsTypeMgr::pActualBullets[] ={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}; +MixBulletsSettings_Impl* MixBulletsTypeMgr::pDefaultActualBullets[] ={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}; MixBulletsTypeMgr::MixBulletsTypeMgr() : NBOTypeMgrBase(eNBOType::MIXBULLETS) @@ -809,7 +809,7 @@ MixBulletsTypeMgr::MixBulletsTypeMgr(const MixBulletsTypeMgr& aTypeMgr): static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->sDescription = static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->sDescription; static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->bIsCustomized = static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized; static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->eType = static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->eType; - if ( static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized && static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->pGrfObj != NULL) + if ( static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized && static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->pGrfObj != nullptr) { static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->pGrfObj = static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->pGrfObj; } @@ -953,7 +953,7 @@ sal_uInt16 MixBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 }else if ( (eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) { const SvxBrushItem* pBrsh = aFmt.GetBrush(); - const Graphic* pGrf = 0; + const Graphic* pGrf = nullptr; if ( pBrsh ) pGrf = pBrsh->GetGraphic(); @@ -1020,7 +1020,7 @@ bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u }else if ( (eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP && pActualBullets[nIndex]->eType == eNBType::GRAPHICBULLETS ) { const SvxBrushItem* pBrsh = aFmt.GetBrush(); - const Graphic* pGrf = 0; + const Graphic* pGrf = nullptr; if ( pBrsh ) pGrf = pBrsh->GetGraphic(); else @@ -1055,7 +1055,7 @@ bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u }else { delete pActualBullets[nIndex]->pBullets; - pActualBullets[nIndex]->pBullets = 0; + pActualBullets[nIndex]->pBullets = nullptr; if ( eNumType == SVX_NUM_CHAR_SPECIAL ) { sal_Unicode cChar = aFmt.GetBulletChar(); @@ -1075,7 +1075,7 @@ bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u }else if ( (eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) { const SvxBrushItem* pBrsh = aFmt.GetBrush(); - const Graphic* pGrf = 0; + const Graphic* pGrf = nullptr; if ( pBrsh ) pGrf = pBrsh->GetGraphic(); else @@ -1268,7 +1268,7 @@ NumberingTypeMgr::NumberingTypeMgr() NumberingTypeMgr::NumberingTypeMgr(const NumberingTypeMgr& rTypeMgr) : NBOTypeMgrBase(rTypeMgr) , pNumberSettingsArr (new NumberSettingsArr_Impl) - , pDefaultNumberSettingsArr(NULL) + , pDefaultNumberSettingsArr(nullptr) { ImplLoad("standard.syb"); } @@ -1656,7 +1656,7 @@ bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI }else if ((eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) { if (_pSet->pBrushItem) { delete (_pSet->pBrushItem); - _pSet->pBrushItem=NULL; + _pSet->pBrushItem=nullptr; } if (aFmt.GetBrush()) _pSet->pBrushItem = new SvxBrushItem(*aFmt.GetBrush()); @@ -1698,7 +1698,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 if(DEFAULT_NUM_VALUSET_COUNT <= nIndex) return false; - const FontList* pList = 0; + const FontList* pList = nullptr; OutlineSettings_Impl* pItemArr = pOutlineSettingsArrs[nIndex]; if (isDefault) pItemArr=pDefaultOutlineSettingsArrs[nIndex]; @@ -1706,7 +1706,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 //Font& rActBulletFont = lcl_GetDefaultBulletFont(); NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr; - NumSettings_Impl* pLevelSettings = 0; + NumSettings_Impl* pLevelSettings = nullptr; OUString sBulletCharFormatName = GetBulCharFmtName(); for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) { @@ -1732,7 +1732,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 { SfxObjectShell* pCurDocShell = SfxObjectShell::Current(); const SvxFontListItem* pFontListItem = static_cast<const SvxFontListItem*>( pCurDocShell->GetItem( SID_ATTR_CHAR_FONTLIST ) ); - pList = pFontListItem ? pFontListItem->GetFontList() : 0; + pList = pFontListItem ? pFontListItem->GetFontList() : nullptr; } if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) ) { diff --git a/svx/source/sidebar/nbdtmgfact.cxx b/svx/source/sidebar/nbdtmgfact.cxx index fa04343a8220..06a699551942 100644 --- a/svx/source/sidebar/nbdtmgfact.cxx +++ b/svx/source/sidebar/nbdtmgfact.cxx @@ -44,7 +44,7 @@ NBOTypeMgrBase* CreateInstance(const NBOType aType) { return &OutlineTypeMgr::GetInstance(); } - return NULL; + return nullptr; } }}} diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 12128d72f463..4183ec06e507 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -81,7 +81,7 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId) mpLineDistAtMetricBox->SetModifyHdl( aLink2 ); FieldUnit eUnit = FUNIT_INCH; - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; if (SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_METRIC, pItem) >= SfxItemState::DEFAULT) eUnit = static_cast<FieldUnit>(static_cast<const SfxUInt16Item*>(pItem)->GetValue()); else diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index aed071486bcd..aca25bfe144f 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -57,12 +57,12 @@ VclPtr<vcl::Window> ParaPropertyPanel::Create ( SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to ParaPropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to ParaPropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to ParaPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to ParaPropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to ParaPropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to ParaPropertyPanel::Create", nullptr, 2); return VclPtr<ParaPropertyPanel>::Create( pParent, @@ -545,7 +545,7 @@ FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolI else { SfxViewFrame* pFrame = SfxViewFrame::Current(); - SfxObjectShell* pSh = NULL; + SfxObjectShell* pSh = nullptr; if ( pFrame ) pSh = pFrame->GetObjectShell(); if ( pSh ) //the object shell is not always available during reload diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 63bb7b3f820b..7ce660157ce4 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -59,7 +59,7 @@ PosSizePropertyPanel::PosSizePropertyPanel( const css::uno::Reference<css::ui::XSidebar>& rxSidebar) : PanelLayout(pParent, "PosSizePropertyPanel", "svx/ui/sidebarpossize.ui", rxFrame), maRect(), - mpView(0), + mpView(nullptr), mlOldWidth(1), mlOldHeight(1), meRP(RP_LT), @@ -220,9 +220,9 @@ void PosSizePropertyPanel::Initialize() if ( pCurSh ) mpView = pCurSh->GetDrawView(); else - mpView = NULL; + mpView = nullptr; - if ( mpView != NULL ) + if ( mpView != nullptr ) { maUIScale = mpView->GetModel()->GetUIScale(); mbAdjustEnabled = hasText(*mpView); @@ -237,12 +237,12 @@ VclPtr<vcl::Window> PosSizePropertyPanel::Create ( SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to PosSizePropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to PosSizePropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to PosSizePropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to PosSizePropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to PosSizePropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to PosSizePropertyPanel::Create", nullptr, 2); return VclPtr<PosSizePropertyPanel>::Create( pParent, @@ -586,9 +586,9 @@ void PosSizePropertyPanel::NotifyItemUpdate( if ( pCurSh ) mpView = pCurSh->GetDrawView(); else - mpView = NULL; + mpView = nullptr; - if ( mpView == NULL ) + if ( mpView == nullptr ) return; mbAdjustEnabled = hasText(*mpView); @@ -1042,7 +1042,7 @@ FieldUnit PosSizePropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPo else { SfxViewFrame* pFrame = SfxViewFrame::Current(); - SfxObjectShell* pSh = NULL; + SfxObjectShell* pSh = nullptr; if ( pFrame ) pSh = pFrame->GetObjectShell(); if ( pSh ) diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index cbb62ade9e93..812229bf2acf 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -361,12 +361,12 @@ VclPtr<vcl::Window> ShadowPropertyPanel::Create ( const uno::Reference<frame::XFrame>& rxFrame, SfxBindings* pBindings) { - if(pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to ShadowPropertyPanel::Create", NULL, 0); + if(pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to ShadowPropertyPanel::Create", nullptr, 0); if( !rxFrame.is() ) - throw lang::IllegalArgumentException("no XFrame given to ShadowPropertyPanel::Create", NULL, 1); - if(pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to ShadowPropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to ShadowPropertyPanel::Create", nullptr, 1); + if(pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to ShadowPropertyPanel::Create", nullptr, 2); return VclPtr<ShadowPropertyPanel>::Create(pParent, rxFrame, pBindings); } diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.cxx b/svx/source/sidebar/styles/StylesPropertyPanel.cxx index 9e310a9ad1c5..8d29d24ec5a3 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.cxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.cxx @@ -10,10 +10,10 @@ VclPtr<vcl::Window> StylesPropertyPanel::Create ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to StylesPropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to StylesPropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to StylesPropertyPanel::Create", NULL, 1); + throw lang::IllegalArgumentException("no XFrame given to StylesPropertyPanel::Create", nullptr, 1); return VclPtr<StylesPropertyPanel>::Create(pParent,rxFrame); } diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 087824e6938b..b52b194622a4 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -44,10 +44,10 @@ TextCharacterSpacingControl::TextCharacterSpacingControl ( , maFTBy (VclPtr<FixedText>::Create(this, SVX_RES(FT_BY))) , maEditKerning (VclPtr<MetricField>::Create(this, SVX_RES(ED_KERNING))) -, mpImg (NULL) -, mpImgSel (NULL) -, mpStr (NULL) -, mpStrTip (NULL) +, mpImg (nullptr) +, mpImgSel (nullptr) +, mpStr (nullptr) +, mpStrTip (nullptr) , maImgCus (SVX_RES(IMG_CUSTOM)) , maImgCusGrey (SVX_RES(IMG_CUSTOM_GRAY)) @@ -141,7 +141,7 @@ void TextCharacterSpacingControl::initial() for (int i=0;i<5;i++) maVSSpacing->AddItem(mpImg[i], &mpImgSel[i],mpStr[i],&mpStrTip[i]); - maVSSpacing->AddItem( maImgCus, 0, maStrCus, 0 ); + maVSSpacing->AddItem( maImgCus, nullptr, maStrCus, nullptr ); maVSSpacing->SetNoSelection(); maVSSpacing->SetSelectHdl(LINK(this, TextCharacterSpacingControl,VSSelHdl )); @@ -174,12 +174,12 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l if( !mnLastCus ) { - maVSSpacing->ReplaceItemImages(6, maImgCusGrey,0); + maVSSpacing->ReplaceItemImages(6, maImgCusGrey,nullptr); } else { //set custom tips - maVSSpacing->ReplaceItemImages(6, maImgCus,0); + maVSSpacing->ReplaceItemImages(6, maImgCus,nullptr); if(mnCustomKern > 0) { OUString aStrTip( maStrCusE); //LAST CUSTOM no tip defect //add diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index c32de3082ccd..16bbba66ef28 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -43,7 +43,7 @@ void TextCharacterSpacingPopup::Rearrange (bool bLBAvailable,bool bAvailable, lo ProvideContainerAndControl(); TextCharacterSpacingControl* pControl = dynamic_cast<TextCharacterSpacingControl*>(mxControl.get()); - if (pControl != NULL) + if (pControl != nullptr) pControl->Rearrange(bLBAvailable,bAvailable,nKerning); } @@ -51,7 +51,7 @@ void TextCharacterSpacingPopup::PopupModeEndCallback() { ProvideContainerAndControl(); TextCharacterSpacingControl* pControl = dynamic_cast<TextCharacterSpacingControl*>(mxControl.get()); - if (pControl == NULL) + if (pControl == nullptr) return; if( pControl->GetLastCustomState() == SPACING_CLOSE_BY_CUS_EDIT) diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 4d7cee447047..38484e7c3988 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -68,12 +68,12 @@ VclPtr<vcl::Window> TextPropertyPanel::Create ( SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext) { - if (pParent == NULL) - throw lang::IllegalArgumentException("no parent Window given to TextPropertyPanel::Create", NULL, 0); + if (pParent == nullptr) + throw lang::IllegalArgumentException("no parent Window given to TextPropertyPanel::Create", nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to TextPropertyPanel::Create", NULL, 1); - if (pBindings == NULL) - throw lang::IllegalArgumentException("no SfxBindings given to TextPropertyPanel::Create", NULL, 2); + throw lang::IllegalArgumentException("no XFrame given to TextPropertyPanel::Create", nullptr, 1); + if (pBindings == nullptr) + throw lang::IllegalArgumentException("no SfxBindings given to TextPropertyPanel::Create", nullptr, 2); return VclPtr<TextPropertyPanel>::Create( pParent, @@ -106,7 +106,7 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref InitToolBoxSpacing(); //init state - mpHeightItem = NULL; + mpHeightItem = nullptr; meUnderline = UNDERLINE_NONE; meUnderlineColor = COL_AUTO; mbKernAvailable = true; @@ -264,7 +264,7 @@ void TextPropertyPanel::NotifyItemUpdate ( if ( eState >= SfxItemState::DEFAULT && dynamic_cast<const SvxFontHeightItem*>( pState) != nullptr ) mpHeightItem = const_cast<SvxFontHeightItem*>(static_cast<const SvxFontHeightItem*>(pState)); else - mpHeightItem = NULL; + mpHeightItem = nullptr; } break; case SID_ATTR_CHAR_UNDERLINE: diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index a7c175465406..f4c342ee9cd9 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -40,7 +40,7 @@ void TextUnderlinePopup::Rearrange (FontUnderline eLine) ProvideContainerAndControl(); TextUnderlineControl* pControl = dynamic_cast<TextUnderlineControl*>(mxControl.get()); - if (pControl != NULL) + if (pControl != nullptr) pControl->Rearrange(eLine); } diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index f0bc51373f62..d2c9943113e5 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -54,7 +54,7 @@ void ValueSetWithTextControl::AddItem( ValueSetWithTextItem aItem; aItem.maItemImage = rItemImage; - aItem.maSelectedItemImage = (pSelectedItemImage != 0) + aItem.maSelectedItemImage = (pSelectedItemImage != nullptr) ? *pSelectedItemImage : rItemImage; @@ -64,7 +64,7 @@ void ValueSetWithTextControl::AddItem( b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor()); aItem.maItemImage = Image(b); - if ( pSelectedItemImage != 0 ) + if ( pSelectedItemImage != nullptr ) { b = aItem.maSelectedItemImage.GetBitmapEx(); b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor()); @@ -78,7 +78,7 @@ void ValueSetWithTextControl::AddItem( InsertItem( maItems.size() ); SetItemText( maItems.size(), - (pItemHelpText != 0) ? *pItemHelpText : rItemText ); + (pItemHelpText != nullptr) ? *pItemHelpText : rItemText ); } @@ -100,7 +100,7 @@ void ValueSetWithTextControl::AddItem( InsertItem( maItems.size() ); SetItemText( maItems.size(), - (pItemHelpText != 0) ? *pItemHelpText : rItemText ); + (pItemHelpText != nullptr) ? *pItemHelpText : rItemText ); } @@ -121,7 +121,7 @@ void ValueSetWithTextControl::ReplaceItemImages( } maItems[nItemId-1].maItemImage = rItemImage; - maItems[nItemId-1].maSelectedItemImage = (pSelectedItemImage != 0) + maItems[nItemId-1].maSelectedItemImage = (pSelectedItemImage != nullptr) ? *pSelectedItemImage : rItemImage; @@ -132,7 +132,7 @@ void ValueSetWithTextControl::ReplaceItemImages( b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor()); maItems[nItemId-1].maItemImage = Image(b); - if ( pSelectedItemImage != 0 ) + if ( pSelectedItemImage != nullptr ) { b = maItems[nItemId-1].maSelectedItemImage.GetBitmapEx(); b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor()); @@ -177,7 +177,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt ) } //draw image + text resp. text + text - Image* pImage = 0; + Image* pImage = nullptr; if ( GetSelectItemId() == nItemId ) { aFont.SetColor( sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Color_HighlightText ) ); diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 6721a7919995..72a1baac0b56 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -110,7 +110,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, IMPL_LINK_TYPED( SvxModifyControl, OnTimer, Idle *, pTimer, void ) { - if (pTimer == 0) + if (pTimer == nullptr) return; pTimer->Stop(); @@ -124,7 +124,7 @@ IMPL_LINK_TYPED( SvxModifyControl, OnTimer, Idle *, pTimer, void ) void SvxModifyControl::_repaint() { if ( GetStatusBar().AreItemsVisible() ) - GetStatusBar().SetItemData( GetId(), 0 ); // force repaint + GetStatusBar().SetItemData( GetId(), nullptr ); // force repaint } /** diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 96dd1bd84d78..dc8a766bfdeb 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -291,7 +291,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt } if ( GetStatusBar().AreItemsVisible() ) - GetStatusBar().SetItemData( GetId(), 0 ); + GetStatusBar().SetItemData( GetId(), nullptr ); // set only strings as text at the statusBar, so that the Help-Tips // can work with the text, when it is too long for the statusBar diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index c5948dd27230..4c8e9cc0ea37 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -100,7 +100,7 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons } if( GetStatusBar().AreItemsVisible() ) // necessary ? - GetStatusBar().SetItemData( GetId(), 0 ); + GetStatusBar().SetItemData( GetId(), nullptr ); GetStatusBar().SetItemText( GetId(), "" ); // necessary ? diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 3f9348167fed..3c56ee9bb52f 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -399,7 +399,7 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) void SvxZoomSliderControl::forceRepaint() const { if (GetStatusBar().AreItemsVisible()) - GetStatusBar().SetItemData(GetId(), 0); + GetStatusBar().SetItemData(GetId(), nullptr); } void SvxZoomSliderControl::repaintAndExecute() diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx index 4d37a48cdf46..9f3574c2e6ca 100644 --- a/svx/source/svdraw/clonelist.cxx +++ b/svx/source/svdraw/clonelist.cxx @@ -91,7 +91,7 @@ void CloneList::CopyConnections() const if(it != maOriginalList.end()) { - SdrObject *cObj = NULL; + SdrObject *cObj = nullptr; if (nPos < cloneCount) cObj = GetClone(nPos); @@ -111,7 +111,7 @@ void CloneList::CopyConnections() const if(it != maOriginalList.end()) { - SdrObject *cObj = NULL; + SdrObject *cObj = nullptr; if (nPos < cloneCount) cObj = GetClone(nPos); diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index dab3e14e2b3e..4ea659954b60 100644 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx @@ -41,7 +41,7 @@ SdrObject* SdrObjectPrimitiveHit( const SetOfByte* pVisiLayer, bool bTextOnly) { - SdrObject* pResult = 0; + SdrObject* pResult = nullptr; if(rObject.GetSubList() && rObject.GetSubList()->GetObjCount()) { @@ -100,7 +100,7 @@ SdrObject* SdrObjListPrimitiveHit( bool bTextOnly) { size_t nObjNum(rList.GetObjCount()); - SdrObject* pRetval = 0; + SdrObject* pRetval = nullptr; while(!pRetval && nObjNum > 0) { diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx index 6ef787d53dd5..22f50a5dec3e 100644 --- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx +++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx @@ -37,7 +37,7 @@ namespace sdr MasterPageDescriptor::MasterPageDescriptor(SdrPage& aOwnerPage, SdrPage& aUsedPage) : maOwnerPage(aOwnerPage), maUsedPage(aUsedPage), - mpViewContact(0L) + mpViewContact(nullptr) { // all layers visible maVisibleLayers.SetAll(); @@ -54,7 +54,7 @@ namespace sdr if(mpViewContact) { delete mpViewContact; - mpViewContact = 0L; + mpViewContact = nullptr; } } @@ -119,7 +119,7 @@ namespace sdr // else the PoolDefault (XFILL_COLOR and Blue8) will be used. Normally, all // MasterPages should have a StyleSheet excactly for this reason, but historically // e.g. the Notes MasterPage has no StyleSheet set (and there maybe others). - pCorrectProperties = 0; + pCorrectProperties = nullptr; } return pCorrectProperties; diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 00fc659aada2..9b8f4aa3790d 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -58,10 +58,10 @@ struct SdrPageWindow::Impl uno::Reference<awt::XControlContainer> mxControlContainer; Impl( SdrPageView& rPageView, SdrPaintWindow& rPaintWindow ) : - mpObjectContact(NULL), + mpObjectContact(nullptr), mrPageView(rPageView), mpPaintWindow(&rPaintWindow), - mpOriginalPaintWindow(NULL) + mpOriginalPaintWindow(nullptr) { } @@ -187,7 +187,7 @@ void SdrPageWindow::unpatchPaintWindow() if (mpImpl->mpOriginalPaintWindow) { mpImpl->mpPaintWindow = mpImpl->mpOriginalPaintWindow; - mpImpl->mpOriginalPaintWindow = NULL; + mpImpl->mpOriginalPaintWindow = nullptr; } } @@ -345,7 +345,7 @@ void SdrPageWindow::RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedir } // reset redirector - GetObjectContact().SetViewObjectContactRedirector(0L); + GetObjectContact().SetViewObjectContactRedirector(nullptr); // LineClip test #ifdef CLIPPER_TEST @@ -404,7 +404,7 @@ void SdrPageWindow::RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObject } // reset redirector - GetObjectContact().SetViewObjectContactRedirector(0L); + GetObjectContact().SetViewObjectContactRedirector(nullptr); } // Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...) @@ -456,7 +456,7 @@ sdr::contact::ObjectContact& SdrPageWindow::GetObjectContact() bool SdrPageWindow::HasObjectContact() const { - return mpImpl->mpObjectContact != NULL; + return mpImpl->mpObjectContact != nullptr; } // #i26631# @@ -465,7 +465,7 @@ void SdrPageWindow::ResetObjectContact() if (mpImpl->mpObjectContact) { delete mpImpl->mpObjectContact; - mpImpl->mpObjectContact = 0L; + mpImpl->mpObjectContact = nullptr; } } diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index dea8e6c9fbb1..c35207e1049d 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -242,7 +242,7 @@ SdrPaintWindow::SdrPaintWindow(SdrPaintView& rNewPaintView, OutputDevice& rOut, : mrOutputDevice(rOut), mpWindow(pWindow), mrPaintView(rNewPaintView), - mpPreRenderDevice(0L), + mpPreRenderDevice(nullptr), mbTemporaryTarget(false), // #i72889# mbUseBuffer(true) { @@ -309,7 +309,7 @@ void SdrPaintWindow::DestroyPreRenderDevice() if(mpPreRenderDevice) { delete mpPreRenderDevice; - mpPreRenderDevice = 0L; + mpPreRenderDevice = nullptr; } } diff --git a/svx/source/svdraw/sdrundomanager.cxx b/svx/source/svdraw/sdrundomanager.cxx index 1a4541d0158e..374cb8f05f7c 100644 --- a/svx/source/svdraw/sdrundomanager.cxx +++ b/svx/source/svdraw/sdrundomanager.cxx @@ -24,7 +24,7 @@ SdrUndoManager::SdrUndoManager(sal_uInt16 nMaxUndoActionCount) : EditUndoManager(nMaxUndoActionCount) , maEndTextEditHdl() - , mpLastUndoActionBeforeTextEdit(0) + , mpLastUndoActionBeforeTextEdit(nullptr) , mbEndTextEditTriggeredFromUndo(false) { } @@ -107,7 +107,7 @@ void SdrUndoManager::SetEndTextEditHdl(const Link<SdrUndoManager*,void>& rLink) if(isTextEditActive()) { // text edit start, remember last non-textedit action for later cleanup - mpLastUndoActionBeforeTextEdit = GetUndoActionCount() ? GetUndoAction() : 0; + mpLastUndoActionBeforeTextEdit = GetUndoActionCount() ? GetUndoAction() : nullptr; } else { @@ -123,7 +123,7 @@ void SdrUndoManager::SetEndTextEditHdl(const Link<SdrUndoManager*,void>& rLink) ClearRedo(); // forget marker again - mpLastUndoActionBeforeTextEdit = 0; + mpLastUndoActionBeforeTextEdit = nullptr; } } diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 80813a275a4b..49a50b550a8e 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -368,12 +368,12 @@ SdrItemPool::~SdrItemPool() { SetRefCount(*mppLocalPoolDefaults[i],0); delete mppLocalPoolDefaults[i]; - mppLocalPoolDefaults[i] = 0L; + mppLocalPoolDefaults[i] = nullptr; } } // split pools before destroying - SetSecondaryPool(NULL); + SetSecondaryPool(nullptr); } bool SdrItemPool::GetPresentation( @@ -871,7 +871,7 @@ bool SdrAngleItem::GetPresentation( sal_Unicode aUnicodeNull('0'); sal_Int32 nCount(2); - const IntlWrapper* pMyIntlWrapper = NULL; + const IntlWrapper* pMyIntlWrapper = nullptr; if(!pIntlWrapper) pIntlWrapper = pMyIntlWrapper = new IntlWrapper( Application::GetSettings().GetLanguageTag() ); @@ -908,7 +908,7 @@ bool SdrAngleItem::GetPresentation( if ( pMyIntlWrapper ) { delete pMyIntlWrapper; - pIntlWrapper = NULL; + pIntlWrapper = nullptr; } } diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index fe3aceabc9c2..709ba718ea4d 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -189,7 +189,7 @@ void SdrCreateView::ImpClearConnectMarker() if(mpCoMaOverlay) { delete mpCoMaOverlay; - mpCoMaOverlay = 0L; + mpCoMaOverlay = nullptr; } } @@ -197,8 +197,8 @@ void SdrCreateView::ImpClearVars() { nAktInvent=SdrInventor; nAktIdent=OBJ_NONE; - pAktCreate=NULL; - pCreatePV=NULL; + pAktCreate=nullptr; + pCreatePV=nullptr; bAutoTextEdit=false; b1stPointAsCenter=false; aAktCreatePointer=Pointer(PointerStyle::Cross); @@ -212,7 +212,7 @@ void SdrCreateView::ImpClearVars() SdrCreateView::SdrCreateView(SdrModel* pModel1, OutputDevice* pOut) : SdrDragView(pModel1,pOut), - mpCoMaOverlay(0L), + mpCoMaOverlay(nullptr), mpCreateViewExtraData(new ImpSdrCreateViewExtraData()) { ImpClearVars(); @@ -227,26 +227,26 @@ SdrCreateView::~SdrCreateView() bool SdrCreateView::IsAction() const { - return SdrDragView::IsAction() || pAktCreate!=NULL; + return SdrDragView::IsAction() || pAktCreate!=nullptr; } void SdrCreateView::MovAction(const Point& rPnt) { SdrDragView::MovAction(rPnt); - if (pAktCreate!=NULL) { + if (pAktCreate!=nullptr) { MovCreateObj(rPnt); } } void SdrCreateView::EndAction() { - if (pAktCreate!=NULL) EndCreateObj(SDRCREATE_FORCEEND); + if (pAktCreate!=nullptr) EndCreateObj(SDRCREATE_FORCEEND); SdrDragView::EndAction(); } void SdrCreateView::BckAction() { - if (pAktCreate!=NULL) BckCreateObj(); + if (pAktCreate!=nullptr) BckCreateObj(); SdrDragView::BckAction(); } @@ -258,7 +258,7 @@ void SdrCreateView::BrkAction() void SdrCreateView::TakeActionRect(Rectangle& rRect) const { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { rRect=maDragStat.GetActionRect(); if (rRect.IsEmpty()) @@ -274,7 +274,7 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const bool SdrCreateView::CheckEdgeMode() { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { // is managed by EdgeObj if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return false; @@ -330,9 +330,9 @@ bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { // TODO: Change default hit tolerance at IsMarkedHit() some time! Point aPos(pWin->PixelToLogic(rMEvt.GetPosPixel())); - bool bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos); + bool bMarkHit=PickHandle(aPos)!=nullptr || IsMarkedObjHit(aPos); SdrObjConnection aCon; - if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,NULL,pWin); + if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,nullptr,pWin); SetConnectMarker(aCon,*pPV); } } @@ -360,7 +360,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent) { nAktInvent=nInvent; nAktIdent=nIdent; - SdrObject* pObj = SdrObjFactory::MakeNewObject(nInvent,nIdent,NULL); + SdrObject* pObj = SdrObjFactory::MakeNewObject(nInvent,nIdent,nullptr); if(pObj) { @@ -396,7 +396,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const ImpClearConnectMarker(); - if (pPV!=NULL) + if (pPV!=nullptr) { pCreatePV=pPV; } @@ -404,7 +404,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const { pCreatePV = GetSdrPageView(); } - if (pCreatePV!=NULL) + if (pCreatePV!=nullptr) { // otherwise no side registered! OUString aLay(maActualLayer); @@ -441,9 +441,9 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // no snapping for Edge and Freehand aPnt=GetSnapPos(aPnt,pCreatePV); } - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { - if (mpDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(mpDefaultStyleSheet, false); + if (mpDefaultStyleSheet!=nullptr) pAktCreate->NbcSetStyleSheet(mpDefaultStyleSheet, false); // SW uses a naked SdrObject for frame construction. Normally, such an // object should not be created. Since it is possible to use it as a helper @@ -515,8 +515,8 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const else { SdrObject::Free( pAktCreate ); - pAktCreate=NULL; - pCreatePV=NULL; + pAktCreate=nullptr; + pCreatePV=nullptr; } } } @@ -526,7 +526,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) { - return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), 0L); + return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), nullptr); } bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject) @@ -540,19 +540,19 @@ bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov nIdent = pPreparedFactoryObject->GetObjIdentifier(); } - return ImpBegCreateObj(nInvent, nIdent, rPnt, 0L, nMinMov, 0L, Rectangle(), pPreparedFactoryObject); + return ImpBegCreateObj(nInvent, nIdent, rPnt, nullptr, nMinMov, nullptr, Rectangle(), pPreparedFactoryObject); } bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) { return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV, - Rectangle(rPnt,Size(rObjSiz.Width()+1,rObjSiz.Height()+1)), 0L); + Rectangle(rPnt,Size(rObjSiz.Width()+1,rObjSiz.Height()+1)), nullptr); } void SdrCreateView::MovCreateObj(const Point& rPnt) { - if (pAktCreate!=NULL) { + if (pAktCreate!=nullptr) { Point aPnt(rPnt); if (!maDragStat.IsNoSnap()) { @@ -599,7 +599,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) SdrObject* pObjMerk=pAktCreate; SdrPageView* pPVMerk=pCreatePV; - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { sal_uIntPtr nCount=maDragStat.GetPointAnz(); @@ -622,7 +622,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) { // otherwise Brk, because all points are equal SdrObject* pObj=pAktCreate; - pAktCreate=NULL; + pAktCreate=nullptr; const SdrLayerAdmin& rAd = pCreatePV->GetPage()->GetLayerAdmin(); SdrLayerID nLayer(0); @@ -659,7 +659,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) { // delete object, its content is cloned and inserted SdrObject::Free( pObjMerk ); - pObjMerk = 0L; + pObjMerk = nullptr; bSceneIntoScene = true; } } @@ -670,7 +670,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) InsertObjectAtView(pObj, *pCreatePV); } - pCreatePV=NULL; + pCreatePV=nullptr; bRet=true; // sal_True = event interpreted } else @@ -694,10 +694,10 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) bRet=true; } } - if (bRet && pObjMerk!=NULL && IsTextEditAfterCreate()) + if (bRet && pObjMerk!=nullptr && IsTextEditAfterCreate()) { SdrTextObj* pText=dynamic_cast<SdrTextObj*>( pObjMerk ); - if (pText!=NULL && pText->IsTextFrame()) + if (pText!=nullptr && pText->IsTextFrame()) { SdrBeginTextEdit(pText, pPVMerk, nullptr, true); } @@ -708,7 +708,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) void SdrCreateView::BckCreateObj() { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { if (maDragStat.GetPointAnz()<=2 ) { @@ -732,13 +732,13 @@ void SdrCreateView::BckCreateObj() void SdrCreateView::BrkCreateObj() { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { HideCreateObj(); pAktCreate->BrkCreate(maDragStat); SdrObject::Free( pAktCreate ); - pAktCreate=NULL; - pCreatePV=NULL; + pAktCreate=nullptr; + pCreatePV=nullptr; } } @@ -841,7 +841,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/) // object according to current zoom so as objects relative // position to grid appears stable aPoly.transform( basegfx::tools::createTranslateB2DHomMatrix( aGridOff.X(), aGridOff.Y() ) ); - mpCreateViewExtraData->CreateAndShowOverlay(*this, 0, aPoly); + mpCreateViewExtraData->CreateAndShowOverlay(*this, nullptr, aPoly); } // #i101679# Force changed overlay to be shown @@ -905,7 +905,7 @@ bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) SfxStyleSheet* SdrCreateView::GetStyleSheet() const { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { return pAktCreate->GetStyleSheet(); } @@ -917,7 +917,7 @@ SfxStyleSheet* SdrCreateView::GetStyleSheet() const bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); return true; diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx index f6ed475da790..91cd2d145072 100644 --- a/svx/source/svdraw/svddrag.cxx +++ b/svx/source/svdraw/svddrag.cxx @@ -27,7 +27,7 @@ void SdrDragStat::Clear(bool bLeaveOne) aPnts.pop_back(); } delete pUser; - pUser=NULL; + pUser=nullptr; aPnts.clear(); if (bLeaveOne) { aPnts.push_back(new Point); @@ -36,18 +36,18 @@ void SdrDragStat::Clear(bool bLeaveOne) void SdrDragStat::Reset() { - pView=NULL; - pPageView=NULL; + pView=nullptr; + pPageView=nullptr; bShown=false; nMinMov=1; bMinMoved=false; bHorFixed=false; bVerFixed=false; bWantNoSnap=false; - pHdl=NULL; + pHdl=nullptr; bOrtho4=false; bOrtho8=false; - pDragMethod=NULL; + pDragMethod=nullptr; bEndDragChangesAttributes=false; bEndDragChangesGeoAndAttributes=false; bMouseIsUp=false; @@ -132,7 +132,7 @@ void SdrDragStat::TakeCreateRect(Rectangle& rRect) const rRect.Right()=aBtmRgt.X(); rRect.Bottom()=aBtmRgt.Y(); } - if (pView!=NULL && pView->IsCreate1stPointAsCenter()) { + if (pView!=nullptr && pView->IsCreate1stPointAsCenter()) { rRect.Top()+=rRect.Top()-rRect.Bottom(); rRect.Left()+=rRect.Left()-rRect.Right(); } diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 2040694f077b..d97ef1b85278 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -142,7 +142,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPolyPolygon::createPr SdrDragEntrySdrObject::SdrDragEntrySdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) : SdrDragEntry(), maOriginal(rOriginal), - mpClone(0), + mpClone(nullptr), mrObjectContact(rObjectContact), mbModify(bModify) { @@ -167,7 +167,7 @@ void SdrDragEntrySdrObject::prepareCurrentState(SdrDragMethod& rDragMethod) if(mpClone) { SdrObject::Free(mpClone); - mpClone = 0; + mpClone = nullptr; } if(mbModify) @@ -574,17 +574,17 @@ void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr SdrObject* SdrDragMethod::GetDragObj() const { - SdrObject* pObj=NULL; - if (getSdrDragView().mpDragHdl!=NULL) pObj=getSdrDragView().mpDragHdl->GetObj(); - if (pObj==NULL) pObj=getSdrDragView().mpMarkedObj; + SdrObject* pObj=nullptr; + if (getSdrDragView().mpDragHdl!=nullptr) pObj=getSdrDragView().mpDragHdl->GetObj(); + if (pObj==nullptr) pObj=getSdrDragView().mpMarkedObj; return pObj; } SdrPageView* SdrDragMethod::GetDragPV() const { - SdrPageView* pPV=NULL; - if (getSdrDragView().mpDragHdl!=NULL) pPV=getSdrDragView().mpDragHdl->GetPageView(); - if (pPV==NULL) pPV=getSdrDragView().mpMarkedPV; + SdrPageView* pPV=nullptr; + if (getSdrDragView().mpDragHdl!=nullptr) pPV=getSdrDragView().mpDragHdl->GetPageView(); + if (pPV==nullptr) pPV=getSdrDragView().mpMarkedPV; return pPV; } @@ -997,7 +997,7 @@ bool SdrDragMovHdl::BeginSdrDrag() if (eKind==HDL_MIRX) { - if (pH1==NULL || pH2==NULL) + if (pH1==nullptr || pH2==nullptr) { OSL_FAIL("SdrDragMovHdl::BeginSdrDrag(): Moving the axis of reflection: reference handles not found."); return false; @@ -1025,7 +1025,7 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) SdrHdl* pH1=GetHdlList().GetHdl(HDL_REF1); SdrHdl* pH2=GetHdlList().GetHdl(HDL_REF2); - if (pH1==NULL || pH2==NULL) + if (pH1==nullptr || pH2==nullptr) return; if (!DragStat().IsNoSnap()) @@ -1035,8 +1035,8 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) bool bXSnapped=false; bool bYSnapped=false; Point aDif(aPnt-DragStat().GetStart()); - getSdrDragView().CheckSnap(Ref1()+aDif,NULL,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); - getSdrDragView().CheckSnap(Ref2()+aDif,NULL,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); + getSdrDragView().CheckSnap(Ref1()+aDif,nullptr,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); + getSdrDragView().CheckSnap(Ref2()+aDif,nullptr,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); aPnt.X()+=nBestXSnap; aPnt.Y()+=nBestYSnap; } @@ -1084,7 +1084,7 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) SdrHdl* pH=GetHdlList().GetHdl(eRef); - if (pH!=NULL) + if (pH!=nullptr) { Point aRef(pH->GetPos()); long nAngle=NormAngle360(GetAngle(aPnt-aRef)); @@ -1171,7 +1171,7 @@ Pointer SdrDragMovHdl::GetSdrDragPointer() const { const SdrHdl* pHdl = GetDragHdl(); - if (pHdl!=NULL) + if (pHdl!=nullptr) { return pHdl->GetPointer(); } @@ -1185,7 +1185,7 @@ TYPEINIT1(SdrDragObjOwn,SdrDragMethod); SdrDragObjOwn::SdrDragObjOwn(SdrDragView& rNewView) : SdrDragMethod(rNewView), - mpClone(0) + mpClone(nullptr) { const SdrObject* pObj = GetDragObj(); @@ -1345,7 +1345,7 @@ void SdrDragObjOwn::MoveSdrDrag(const Point& rNoSnapPnt) if(mpClone) { SdrObject::Free(mpClone); - mpClone = 0; + mpClone = nullptr; } // create a new clone and modify to current drag state @@ -1377,8 +1377,8 @@ bool SdrDragObjOwn::EndSdrDrag(bool /*bCopy*/) if(pObj) { - SdrUndoAction* pUndo = NULL; - SdrUndoAction* pUndo2 = NULL; + SdrUndoAction* pUndo = nullptr; + SdrUndoAction* pUndo2 = nullptr; const bool bUndo = getSdrDragView().IsUndoEnabled(); if( bUndo ) @@ -1686,7 +1686,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_) { const SdrMark* pM=rML.GetMark(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - const size_t nPointCount=pPts==NULL ? 0 : pPts->size(); + const size_t nPointCount=pPts==nullptr ? 0 : pPts->size(); if (nPointCount!=0) { @@ -1831,7 +1831,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const bool SdrDragResize::BeginSdrDrag() { SdrHdlKind eRefHdl=HDL_MOVE; - SdrHdl* pRefHdl=NULL; + SdrHdl* pRefHdl=nullptr; switch (GetDragHdlKind()) { @@ -1849,7 +1849,7 @@ bool SdrDragResize::BeginSdrDrag() if (eRefHdl!=HDL_MOVE) pRefHdl=GetHdlList().GetHdl(eRefHdl); - if (pRefHdl!=NULL && !getSdrDragView().IsResizeAtCenter()) + if (pRefHdl!=nullptr && !getSdrDragView().IsResizeAtCenter()) { // Calc hack to adjust for calc grid DragStat().Ref1()=pRefHdl->GetPos() - getSdrDragView().GetGridOffset(); @@ -1859,7 +1859,7 @@ bool SdrDragResize::BeginSdrDrag() SdrHdl* pRef1=GetHdlList().GetHdl(HDL_UPLFT); SdrHdl* pRef2=GetHdlList().GetHdl(HDL_LWRGT); - if (pRef1!=NULL && pRef2!=NULL) + if (pRef1!=nullptr && pRef2!=nullptr) { DragStat().Ref1()=Rectangle(pRef1->GetPos(),pRef2->GetPos()).Center(); } @@ -2094,7 +2094,7 @@ Pointer SdrDragResize::GetSdrDragPointer() const { const SdrHdl* pHdl=GetDragHdl(); - if (pHdl!=NULL) + if (pHdl!=nullptr) { return pHdl->GetPointer(); } @@ -2144,7 +2144,7 @@ bool SdrDragRotate::BeginSdrDrag() { SdrHdl* pH=GetHdlList().GetHdl(HDL_REF1); - if (pH!=NULL) + if (pH!=nullptr) { Show(); DragStat().Ref1()=pH->GetPos(); @@ -2279,7 +2279,7 @@ void SdrDragShear::TakeSdrDragComment(OUString& rStr) const bool SdrDragShear::BeginSdrDrag() { SdrHdlKind eRefHdl=HDL_MOVE; - SdrHdl* pRefHdl=NULL; + SdrHdl* pRefHdl=nullptr; switch (GetDragHdlKind()) { @@ -2293,7 +2293,7 @@ bool SdrDragShear::BeginSdrDrag() if (eRefHdl!=HDL_MOVE) pRefHdl=GetHdlList().GetHdl(eRefHdl); - if (pRefHdl!=NULL) + if (pRefHdl!=nullptr) { DragStat().Ref1()=pRefHdl->GetPos(); nAngle0=GetAngle(DragStat().GetStart()-DragStat().GetRef1()); @@ -2570,7 +2570,7 @@ bool SdrDragMirror::BeginSdrDrag() SdrHdl* pH1=GetHdlList().GetHdl(HDL_REF1); SdrHdl* pH2=GetHdlList().GetHdl(HDL_REF2); - if (pH1!=NULL && pH2!=NULL) + if (pH1!=nullptr && pH2!=nullptr) { DragStat().Ref1()=pH1->GetPos(); DragStat().Ref2()=pH2->GetPos(); @@ -2658,7 +2658,7 @@ TYPEINIT1(SdrDragGradient, SdrDragMethod); SdrDragGradient::SdrDragGradient(SdrDragView& rNewView, bool bGrad) : SdrDragMethod(rNewView), - pIAOHandle(NULL), + pIAOHandle(nullptr), bIsGradient(bGrad) { } @@ -3037,9 +3037,9 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget) switch (eMode) { - case SDRCROOK_ROTATE : CrookRotateXPoint (aCtr1,NULL,NULL,aC,aRad,nSin,nCos,bVertical); break; - case SDRCROOK_SLANT : CrookSlantXPoint (aCtr1,NULL,NULL,aC,aRad,nSin,nCos,bVertical); break; - case SDRCROOK_STRETCH: CrookStretchXPoint(aCtr1,NULL,NULL,aC,aRad,nSin,nCos,bVertical,aMarkRect); break; + case SDRCROOK_ROTATE : CrookRotateXPoint (aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical); break; + case SDRCROOK_SLANT : CrookSlantXPoint (aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical); break; + case SDRCROOK_STRETCH: CrookStretchXPoint(aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical,aMarkRect); break; } // switch } @@ -3071,8 +3071,8 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget) while (i<nPointCount) { Point* pPnt=&aPol[i]; - Point* pC1=NULL; - Point* pC2=NULL; + Point* pC1=nullptr; + Point* pC2=nullptr; if (i+1<nPointCount && aPol.IsControl(i)) { // control point on the left @@ -3102,8 +3102,8 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget) void SdrDragCrook::_MovCrookPoint(Point& rPnt, Point* pC1, Point* pC2) { bool bVert=bVertical; - bool bC1=pC1!=NULL; - bool bC2=pC2!=NULL; + bool bC1=pC1!=nullptr; + bool bC2=pC2!=nullptr; Point aC(aCenter); if (bResize) @@ -3684,7 +3684,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/) SdrHdl* pRef1=GetHdlList().GetHdl(HDL_UPLFT); SdrHdl* pRef2=GetHdlList().GetHdl(HDL_LWRGT); - if (pRef1==NULL || pRef2==NULL) + if (pRef1==nullptr || pRef2==nullptr) return false; Rectangle rect(pRef1->GetPos(),pRef2->GetPos()); diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index da6660341d0c..62b2b81bc059 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -56,14 +56,14 @@ void SdrDragView::ImpClearVars() mbDragLimit=false; mbMarkedHitMovesAlways=false; meDragHdl=HDL_MOVE; - mpDragHdl=NULL; + mpDragHdl=nullptr; mbDragHdl=false; mbDragSpecial=false; - mpCurrentSdrDragMethod=NULL; + mpCurrentSdrDragMethod=nullptr; mbDragStripes=false; mbMirrRefDragObj=true; mbDragWithCopy=false; - mpInsPointUndo=NULL; + mpInsPointUndo=nullptr; mbInsGluePoint=false; mbInsObjPointMode=false; mbInsGluePointMode=false; @@ -214,23 +214,23 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { SetDragWithCopy(false); //TODO: aAni.Reset(); - mpCurrentSdrDragMethod=NULL; + mpCurrentSdrDragMethod=nullptr; mbDragSpecial=false; mbDragLimit=false; SdrDragMode eTmpMode=meDragMode; - if (eTmpMode==SDRDRAG_MOVE && pHdl!=NULL && pHdl->GetKind()!=HDL_MOVE) { + if (eTmpMode==SDRDRAG_MOVE && pHdl!=nullptr && pHdl->GetKind()!=HDL_MOVE) { eTmpMode=SDRDRAG_RESIZE; } mbDragLimit=TakeDragLimit(eTmpMode,maDragLimit); mbFramDrag=ImpIsFrameHandles(); if (!mbFramDrag && - (mpMarkedObj==NULL || !mpMarkedObj->hasSpecialDrag()) && - (pHdl==NULL || pHdl->GetObj()==NULL)) { + (mpMarkedObj==nullptr || !mpMarkedObj->hasSpecialDrag()) && + (pHdl==nullptr || pHdl->GetObj()==nullptr)) { mbFramDrag=true; } Point aPnt(rPnt); - if(pHdl == NULL + if(pHdl == nullptr || pHdl->GetKind() == HDL_MOVE || pHdl->GetKind() == HDL_MIRX || pHdl->GetKind() == HDL_TRNS @@ -250,7 +250,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl maDragStat.NextPoint(); mpDragWin=pOut; mpDragHdl=pHdl; - meDragHdl= pHdl==NULL ? HDL_MOVE : pHdl->GetKind(); + meDragHdl= pHdl==nullptr ? HDL_MOVE : pHdl->GetKind(); mbDragHdl=meDragHdl==HDL_REF1 || meDragHdl==HDL_REF2 || meDragHdl==HDL_MIRX; // Expand test for HDL_ANCHOR_TR @@ -479,7 +479,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl } } } - if (pForcedMeth!=NULL) + if (pForcedMeth!=nullptr) { delete mpCurrentSdrDragMethod; mpCurrentSdrDragMethod = pForcedMeth; @@ -490,11 +490,11 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl bRet = mpCurrentSdrDragMethod->BeginSdrDrag(); if (!bRet) { - if (pHdl==NULL && dynamic_cast< const SdrDragObjOwn* >(mpCurrentSdrDragMethod) != nullptr) + if (pHdl==nullptr && dynamic_cast< const SdrDragObjOwn* >(mpCurrentSdrDragMethod) != nullptr) { // Obj may not Move SpecialDrag, so try with MoveFrameDrag delete mpCurrentSdrDragMethod; - mpCurrentSdrDragMethod = 0; + mpCurrentSdrDragMethod = nullptr; mbDragSpecial=false; if (!IsMoveAllowed()) @@ -509,7 +509,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl if (!bRet) { delete mpCurrentSdrDragMethod; - mpCurrentSdrDragMethod = 0; + mpCurrentSdrDragMethod = nullptr; maDragStat.SetDragMethod(mpCurrentSdrDragMethod); } } @@ -555,7 +555,7 @@ bool SdrDragView::EndDragObj(bool bCopy) EndUndo(); delete mpCurrentSdrDragMethod; - mpCurrentSdrDragMethod = 0; + mpCurrentSdrDragMethod = nullptr; if (bEliminatePolyPoints) { @@ -578,7 +578,7 @@ bool SdrDragView::EndDragObj(bool bCopy) } meDragHdl=HDL_MOVE; - mpDragHdl=NULL; + mpDragHdl=nullptr; if (!mbSomeObjChgdFlag) { @@ -607,13 +607,13 @@ void SdrDragView::BrkDragObj() mpCurrentSdrDragMethod->CancelSdrDrag(); delete mpCurrentSdrDragMethod; - mpCurrentSdrDragMethod = 0; + mpCurrentSdrDragMethod = nullptr; if (mbInsPolyPoint) { mpInsPointUndo->Undo(); // delete inserted point again delete mpInsPointUndo; - mpInsPointUndo=NULL; + mpInsPointUndo=nullptr; SetMarkHandles(); mbInsPolyPoint=false; } @@ -622,18 +622,18 @@ void SdrDragView::BrkDragObj() { mpInsPointUndo->Undo(); // delete inserted glue point again delete mpInsPointUndo; - mpInsPointUndo=NULL; + mpInsPointUndo=nullptr; SetInsertGluePoint(false); } meDragHdl=HDL_MOVE; - mpDragHdl=NULL; + mpDragHdl=nullptr; } } bool SdrDragView::IsInsObjPointPossible() const { - return mpMarkedObj!=NULL && mpMarkedObj->IsPolyObj(); + return mpMarkedObj!=nullptr && mpMarkedObj->IsPolyObj(); } bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut) @@ -692,7 +692,7 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point else { delete mpInsPointUndo; - mpInsPointUndo = NULL; + mpInsPointUndo = nullptr; } } @@ -754,22 +754,22 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt) maInsPointUndoStr = aStr.replaceFirst("%1", pObj->TakeObjNameSingul() ); SdrGluePointList* pGPL=pObj->ForceGluePointList(); - if (pGPL!=NULL) + if (pGPL!=nullptr) { sal_uInt16 nGlueIdx=pGPL->Insert(SdrGluePoint()); SdrGluePoint& rGP=(*pGPL)[nGlueIdx]; sal_uInt16 nGlueId=rGP.GetId(); rGP.SetAbsolutePos(rPnt,*pObj); - SdrHdl* pHdl=NULL; + SdrHdl* pHdl=nullptr; if (MarkGluePoint(pObj,nGlueId,pPV)) { pHdl=GetGluePointHdl(pObj,nGlueId); } - if (pHdl!=NULL && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId) + if (pHdl!=nullptr && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId) { SetInsertGluePoint(true); - bRet=BegDragObj(rPnt,NULL,pHdl,0); + bRet=BegDragObj(rPnt,nullptr,pHdl,0); if (bRet) { maDragStat.SetMinMoved(); @@ -779,7 +779,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt) { SetInsertGluePoint(false); delete mpInsPointUndo; - mpInsPointUndo=NULL; + mpInsPointUndo=nullptr; } } else @@ -792,7 +792,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt) // no glue points possible for this object (e. g. Edge) SetInsertGluePoint(false); delete mpInsPointUndo; - mpInsPointUndo=NULL; + mpInsPointUndo=nullptr; } } @@ -887,7 +887,7 @@ bool SdrDragView::IsOrthoDesired() const void SdrDragView::SetMarkHandles() { if( mpDragHdl ) - mpDragHdl = 0; + mpDragHdl = nullptr; SdrExchangeView::SetMarkHandles(); } diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 7bf5c5cbdc88..c2d705c17ff0 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -350,7 +350,7 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes() SdrMark* pEM = GetMarkedEdgesOfMarkedNodes().GetMark(i); SdrObject* pEdgeTmp=pEM->GetMarkedSdrObj(); SdrEdgeObj* pEdge=dynamic_cast<SdrEdgeObj*>( pEdgeTmp ); - if (pEdge!=NULL) { + if (pEdge!=nullptr) { pEdge->SetEdgeTrackDirty(); } } @@ -491,8 +491,8 @@ void SdrEditView::CheckPossibilities() // still missing ... const SdrObject* pObj=GetMarkedObjectByIndex(0); //const SdrPathObj* pPath=dynamic_cast<SdrPathObj*>( pObj ); - bool bGroup=pObj->GetSubList()!=NULL; - bool bHasText=pObj->GetOutlinerParaObject()!=NULL; + bool bGroup=pObj->GetSubList()!=nullptr; + bool bHasText=pObj->GetOutlinerParaObject()!=nullptr; if (bGroup || bHasText) { bCombinePossible=true; } @@ -540,7 +540,7 @@ void SdrEditView::CheckPossibilities() } bool bNoMovRotFound=false; - const SdrPageView* pPV0=NULL; + const SdrPageView* pPV0=nullptr; for (size_t nm=0; nm<nMarkCount; ++nm) { const SdrMark* pM=GetSdrMarkByIndex(nm); @@ -593,7 +593,7 @@ void SdrEditView::CheckPossibilities() bCanConvToContour = false; // Ungroup - if (!bUnGroupPossible) bUnGroupPossible=pObj->GetSubList()!=NULL; + if (!bUnGroupPossible) bUnGroupPossible=pObj->GetSubList()!=nullptr; // ConvertToCurve: If at least one can be converted, that is fine. if (aInfo.bCanConvToPath ) bCanConvToPath =true; if (aInfo.bCanConvToPoly ) bCanConvToPoly =true; @@ -650,10 +650,10 @@ void SdrEditView::CheckPossibilities() if (nMarkCount==1) { SdrObject* pObj=GetMarkedObjectByIndex(0); SdrEdgeObj* pEdge=dynamic_cast<SdrEdgeObj*>( pObj ); - if (pEdge!=NULL) { + if (pEdge!=nullptr) { SdrObject* pNode1=pEdge->GetConnectedNode(true); SdrObject* pNode2=pEdge->GetConnectedNode(false); - if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=false; + if (pNode1!=nullptr || pNode2!=nullptr) bMoveAllowed=false; } } } @@ -911,7 +911,7 @@ void SdrEditView::CopyMarkedObj() for (size_t nm=0; nm<nMarkCount; ++nm) { SdrMark* pM=aSourceObjectsForCopy.GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj()->Clone(); - if (pO!=NULL) { + if (pO!=nullptr) { SdrInsertReason aReason(SDRREASON_VIEWCALL); pM->GetPageView()->GetObjList()->InsertObject(pO, SAL_MAX_SIZE, &aReason); @@ -972,7 +972,7 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInser pObj->NbcSetLayer(nLayer); } if (nOptions & SdrInsertFlags::SETDEFATTR) { - if (mpDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(mpDefaultStyleSheet, false); + if (mpDefaultStyleSheet!=nullptr) pObj->NbcSetStyleSheet(mpDefaultStyleSheet, false); pObj->SetMergedItemSet(maDefaultAttr); } if (!pObj->IsInserted()) { diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index bf38d8699531..863f8d48fd60 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -512,7 +512,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa SdrPathObj* pPath=dynamic_cast<SdrPathObj*>( pO ); bool bDone = false; - if(pPath!=NULL && !bNoContortion) + if(pPath!=nullptr && !bNoContortion) { XPolyPolygon aXPP(pPath->GetPathPoly()); switch (eMode) { @@ -569,9 +569,9 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa switch (eMode) { - case SDRCROOK_ROTATE : nAngle=CrookRotateXPoint (aCtr1,NULL,NULL,rRef,rRad,nSin,nCos,bVertical); bRotOk=bRotate; break; - case SDRCROOK_SLANT : nAngle=CrookSlantXPoint (aCtr1,NULL,NULL,rRef,rRad,nSin,nCos,bVertical); break; - case SDRCROOK_STRETCH: nAngle=CrookStretchXPoint(aCtr1,NULL,NULL,rRef,rRad,nSin,nCos,bVertical,rMarkRect); break; + case SDRCROOK_ROTATE : nAngle=CrookRotateXPoint (aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical); bRotOk=bRotate; break; + case SDRCROOK_SLANT : nAngle=CrookSlantXPoint (aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical); break; + case SDRCROOK_STRETCH: nAngle=CrookStretchXPoint(aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical,rMarkRect); break; } } @@ -613,7 +613,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO)); const SdrObjList* pOL=pO->GetSubList(); - if (bNoContortion || pOL==NULL) { + if (bNoContortion || pOL==nullptr) { ImpCrookObj(pO,rRef,rRad,eMode,bVertical,bNoContortion,bRotate,aMarkRect); } else { SdrObjListIter aIter(*pOL,IM_DEEPNOGROUPS); @@ -689,7 +689,7 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto Rectangle aRefRect(rRef); XPolygon aRefPoly(rDistortedRect); const SdrObjList* pOL=pO->GetSubList(); - if (bNoContortion || pOL==NULL) { + if (bNoContortion || pOL==nullptr) { ImpDistortObj(pO,aRefRect,aRefPoly,bNoContortion); } else { SdrObjListIter aIter(*pOL,IM_DEEPNOGROUPS); @@ -709,7 +709,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bRep { // bReplaceAll has no effect here Rectangle aAllSnapRect(GetMarkedObjRect()); - const SfxPoolItem *pPoolItem=NULL; + const SfxPoolItem *pPoolItem=nullptr; if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,true,&pPoolItem)==SfxItemState::SET) { long n=static_cast<const SdrTransformRef1XItem*>(pPoolItem)->GetValue(); SetRef1(Point(n,GetRef1().Y())); @@ -960,7 +960,7 @@ std::vector<sal_uInt16> GetAllCharPropIds(const SfxItemSet& rSet) { SfxItemIter aIter(rSet); const SfxPoolItem* pItem=aIter.FirstItem(); - while (pItem!=NULL) + while (pItem!=nullptr) { if (!IsInvalidItem(pItem)) { @@ -983,7 +983,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) bool bHasEEFeatureItems=false; SfxItemIter aIter(rAttr); const SfxPoolItem* pItem=aIter.FirstItem(); - while (!bHasEEFeatureItems && pItem!=NULL) { + while (!bHasEEFeatureItems && pItem!=nullptr) { if (!IsInvalidItem(pItem)) { sal_uInt16 nW=pItem->Which(); if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=true; @@ -1092,7 +1092,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) // multiple portions exist with multiple formats. If a OutlinerParaObject // really exists and needs to be rescued is evaluated in the undo // implementation itself. - const bool bRescueText = dynamic_cast< SdrTextObj* >(pObj) != 0; + const bool bRescueText = dynamic_cast< SdrTextObj* >(pObj) != nullptr; // add attribute undo AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,false,bHasEEItems || bPossibleGeomChange || bRescueText)); @@ -1192,14 +1192,14 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const { - SfxStyleSheet* pRet=NULL; + SfxStyleSheet* pRet=nullptr; bool b1st=true; const size_t nMarkCount=GetMarkedObjectCount(); for (size_t nm=0; nm<nMarkCount; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SfxStyleSheet* pSS=pM->GetMarkedSdrObj()->GetStyleSheet(); if (b1st) pRet=pSS; - else if (pRet!=pSS) return NULL; // different stylesheets + else if (pRet!=pSS) return nullptr; // different stylesheets b1st=false; } return pRet; @@ -1214,7 +1214,7 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRe if( bUndo ) { OUString aStr; - if (pStyleSheet!=NULL) + if (pStyleSheet!=nullptr) ImpTakeDescriptionStr(STR_EditSetStylesheet,aStr); else ImpTakeDescriptionStr(STR_EditDelStylesheet,aStr); @@ -1474,7 +1474,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) long nOldShearAngle=GetMarkedObjShear(); const SdrMarkList& rMarkList=GetMarkedObjectList(); const size_t nMarkCount=rMarkList.GetMarkCount(); - SdrObject* pObj=NULL; + SdrObject* pObj=nullptr; RECT_POINT eSizePoint=RP_MM; long nPosDX=0; @@ -1516,7 +1516,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) bool bSetAttr=false; SfxItemSet aSetAttr(mpModel->GetItemPool()); - const SfxPoolItem* pPoolItem=NULL; + const SfxPoolItem* pPoolItem=nullptr; // position if (SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,true,&pPoolItem)) { @@ -1825,13 +1825,13 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool const SdrObject* pObj=GetMarkedObjectByIndex(0); const SdrPage* pPage=pObj->GetPage(); const SdrPageGridFrameList* pGFL=pPage->GetGridFrameList(GetSdrPageViewOfMarkedByIndex(0),&(pObj->GetSnapRect())); - const SdrPageGridFrame* pFrame=NULL; - if (pGFL!=NULL && pGFL->GetCount()!=0) + const SdrPageGridFrame* pFrame=nullptr; + if (pGFL!=nullptr && pGFL->GetCount()!=0) { // Writer pFrame=&((*pGFL)[0]); } - if (pFrame!=NULL) + if (pFrame!=nullptr) { // Writer aBound=pFrame->GetUserArea(); } diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 851d1090d29e..42248be8ecae 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -49,12 +49,12 @@ using namespace com::sun::star; SdrObject* SdrEditView::GetMaxToTopObj(SdrObject* /*pObj*/) const { - return NULL; + return nullptr; } SdrObject* SdrEditView::GetMaxToBtmObj(SdrObject* /*pObj*/) const { - return NULL; + return nullptr; } void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, sal_uIntPtr /*nOldPos*/, sal_uIntPtr /*nNewPos*/) @@ -77,7 +77,7 @@ void SdrEditView::MovMarkedToTop() GetMarkedObjectByIndex(nm)->GetOrdNum(); } bool bChg=false; - SdrObjList* pOL0=NULL; + SdrObjList* pOL0=nullptr; size_t nNewPos=0; for (size_t nm=nAnz; nm>0;) { @@ -94,7 +94,7 @@ void SdrEditView::MovMarkedToTop() const Rectangle& rBR=pObj->GetCurrentBoundRect(); size_t nCmpPos = nNowPos+1; SdrObject* pMaxObj=GetMaxToTopObj(pObj); - if (pMaxObj!=NULL) + if (pMaxObj!=nullptr) { size_t nMaxPos=pMaxObj->GetOrdNum(); if (nMaxPos!=0) @@ -108,7 +108,7 @@ void SdrEditView::MovMarkedToTop() while (nCmpPos<nNewPos && !bEnd) { SdrObject* pCmpObj=pOL->GetObj(nCmpPos); - if (pCmpObj==NULL) + if (pCmpObj==nullptr) { OSL_FAIL("MovMarkedToTop(): Reference object not found."); bEnd=true; @@ -165,7 +165,7 @@ void SdrEditView::MovMarkedToBtm() } bool bChg=false; - SdrObjList* pOL0=NULL; + SdrObjList* pOL0=nullptr; size_t nNewPos=0; for (size_t nm=0; nm<nAnz; ++nm) { @@ -183,7 +183,7 @@ void SdrEditView::MovMarkedToBtm() if (nCmpPos>0) --nCmpPos; SdrObject* pMaxObj=GetMaxToBtmObj(pObj); - if (pMaxObj!=NULL) + if (pMaxObj!=nullptr) { const size_t nMinPos=pMaxObj->GetOrdNum()+1; if (nNewPos<nMinPos) @@ -198,7 +198,7 @@ void SdrEditView::MovMarkedToBtm() while (nCmpPos>nNewPos && !bEnd) { SdrObject* pCmpObj=pOL->GetObj(nCmpPos); - if (pCmpObj==NULL) + if (pCmpObj==nullptr) { OSL_FAIL("MovMarkedToBtm(): Reference object not found."); bEnd=true; @@ -240,7 +240,7 @@ void SdrEditView::MovMarkedToBtm() void SdrEditView::PutMarkedToTop() { - PutMarkedInFrontOfObj(NULL); + PutMarkedInFrontOfObj(nullptr); } void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) @@ -254,7 +254,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) SortMarkedObjects(); - if (pRefObj!=NULL) + if (pRefObj!=nullptr) { // Make "in front of the object" work, even if the // selected objects are already in front of the other object @@ -277,7 +277,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) GetMarkedObjectByIndex(nm)->GetOrdNum(); } bool bChg=false; - SdrObjList* pOL0=NULL; + SdrObjList* pOL0=nullptr; size_t nNewPos=0; for (size_t nm=nAnz; nm>0;) { @@ -294,7 +294,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) } const size_t nNowPos=pObj->GetOrdNumDirect(); SdrObject* pMaxObj=GetMaxToTopObj(pObj); - if (pMaxObj!=NULL) + if (pMaxObj!=nullptr) { size_t nMaxOrd=pMaxObj->GetOrdNum(); // sadly doesn't work any other way if (nMaxOrd>0) @@ -304,7 +304,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) if (nNewPos<nNowPos) nNewPos=nNowPos; // nor go into the other direction } - if (pRefObj!=NULL) + if (pRefObj!=nullptr) { if (pRefObj->GetObjList()==pObj->GetObjList()) { @@ -341,7 +341,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) void SdrEditView::PutMarkedToBtm() { - PutMarkedBehindObj(NULL); + PutMarkedBehindObj(nullptr); } void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) @@ -355,7 +355,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) BegUndo(ImpGetResStr(STR_EditPutToBtm),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_PUTTOBTM); SortMarkedObjects(); - if (pRefObj!=NULL) + if (pRefObj!=nullptr) { // Make "behind the object" work, even if the // selected objects are already behind the other object @@ -377,7 +377,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) GetMarkedObjectByIndex(nm)->GetOrdNum(); } bool bChg=false; - SdrObjList* pOL0=NULL; + SdrObjList* pOL0=nullptr; size_t nNewPos=0; for (size_t nm=0; nm<nAnz; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); @@ -390,12 +390,12 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) } const size_t nNowPos=pObj->GetOrdNumDirect(); SdrObject* pMinObj=GetMaxToBtmObj(pObj); - if (pMinObj!=NULL) { + if (pMinObj!=nullptr) { const size_t nMinOrd=pMinObj->GetOrdNum()+1; // sadly doesn't work any differently if (nNewPos<nMinOrd) nNewPos=nMinOrd; // neither go faster... if (nNewPos>nNowPos) nNewPos=nNowPos; // nor go into the other direction } - if (pRefObj!=NULL) { + if (pRefObj!=nullptr) { if (pRefObj->GetObjList()==pObj->GetObjList()) { const size_t nMinOrd=pRefObj->GetOrdNum(); // sadly doesn't work any differently if (nNewPos<nMinOrd) nNewPos=nMinOrd; // neither go faster... @@ -488,19 +488,19 @@ void SdrEditView::ImpCheckToTopBtmPossible() size_t nMin=0; const size_t nObjNum=pObj->GetOrdNum(); SdrObject* pRestrict=GetMaxToTopObj(pObj); - if (pRestrict!=NULL) { + if (pRestrict!=nullptr) { const size_t nRestrict=pRestrict->GetOrdNum(); if (nRestrict<nMax) nMax=nRestrict; } pRestrict=GetMaxToBtmObj(pObj); - if (pRestrict!=NULL) { + if (pRestrict!=nullptr) { const size_t nRestrict=pRestrict->GetOrdNum(); if (nRestrict>nMin) nMin=nRestrict; } bToTopPossible=nObjNum<nMax-1; bToBtmPossible=nObjNum>nMin; } else { // multiple selection - SdrObjList* pOL0=NULL; + SdrObjList* pOL0=nullptr; size_t nPos0 = 0; for (size_t nm = 0; !bToBtmPossible && nm<nAnz; ++nm) { // check 'send to background' SdrObject* pObj=GetMarkedObjectByIndex(nm); @@ -514,7 +514,7 @@ void SdrEditView::ImpCheckToTopBtmPossible() nPos0 = nPos; } - pOL0=NULL; + pOL0=nullptr; nPos0 = SAL_MAX_SIZE; for (size_t nm=nAnz; !bToTopPossible && nm>0; ) { // check 'bring to front' --nm; @@ -537,9 +537,9 @@ void SdrEditView::ImpCheckToTopBtmPossible() void SdrEditView::ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) const { - if (pSource!=NULL) { + if (pSource!=nullptr) { SdrObjList* pOL=pSource->GetSubList(); - if (pOL!=NULL && !pSource->Is3DObj()) { // get first non-group object from group + if (pOL!=nullptr && !pSource->Is3DObj()) { // get first non-group object from group SdrObjListIter aIter(*pOL,IM_DEEPNOGROUPS); pSource=aIter.Next(); } @@ -770,7 +770,7 @@ void SdrEditView::DistributeMarkedObjects() SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - std::unique_ptr<AbstractSvxDistributeDialog> pDlg(pFact->CreateSvxDistributeDialog(NULL, aNewAttr)); + std::unique_ptr<AbstractSvxDistributeDialog> pDlg(pFact->CreateSvxDistributeDialog(nullptr, aNewAttr)); DBG_ASSERT(pDlg, "Dialog creation failed!"); sal_uInt16 nResult = pDlg->Execute(); @@ -1001,12 +1001,12 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) BegUndo(); size_t nInsPos = SAL_MAX_SIZE; - const SdrObject* pAttrObj = NULL; + const SdrObject* pAttrObj = nullptr; basegfx::B2DPolyPolygon aMergePolyPolygonA; basegfx::B2DPolyPolygon aMergePolyPolygonB; - SdrObjList* pInsOL = NULL; - SdrPageView* pInsPV = NULL; + SdrObjList* pInsOL = nullptr; + SdrPageView* pInsPV = nullptr; bool bFirstObjectComplete(false); // make sure selected objects are contour objects @@ -1266,14 +1266,14 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) // continue as before basegfx::B2DPolyPolygon aPolyPolygon; - SdrObjList* pAktOL = 0L; + SdrObjList* pAktOL = nullptr; SdrMarkList aRemoveMerker; SortMarkedObjects(); size_t nInsPos = SAL_MAX_SIZE; - SdrObjList* pInsOL = 0L; - SdrPageView* pInsPV = 0L; - const SdrObject* pAttrObj = 0L; + SdrObjList* pInsOL = nullptr; + SdrPageView* pInsPV = nullptr; + const SdrObject* pAttrObj = nullptr; for(size_t a = GetMarkedObjectCount(); a; ) { @@ -1514,7 +1514,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, if(pSrcPath) { // #i74631# redesigned due to XpolyPolygon removal and explicit constructors - SdrObject* pLast = 0; // to be able to apply OutlinerParaObject + SdrObject* pLast = nullptr; // to be able to apply OutlinerParaObject const basegfx::B2DPolyPolygon& rPolyPolygon(pSrcPath->GetPathPoly()); const sal_uInt32 nPolyCount(rPolyPolygon.count()); @@ -1609,7 +1609,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, { // #i37011# also create a text object and add at rPos + 1 SdrObject* pTextObj = SdrObjFactory::MakeNewObject( - pCustomShape->GetObjInventor(), OBJ_TEXT, 0L, pCustomShape->GetModel()); + pCustomShape->GetObjInventor(), OBJ_TEXT, nullptr, pCustomShape->GetModel()); // Copy text content OutlinerParaObject* pParaObj = pCustomShape->GetOutlinerParaObject(); @@ -1670,7 +1670,7 @@ void SdrEditView::DismantleMarkedObjects(bool bMakeLines) BegUndo("", "", bMakeLines ? SDRREPFUNC_OBJ_DISMANTLE_LINES : SDRREPFUNC_OBJ_DISMANTLE_POLYS); } - SdrObjList* pOL0=NULL; + SdrObjList* pOL0=nullptr; for (size_t nm=GetMarkedObjectCount(); nm>0;) { --nm; SdrMark* pM=GetSdrMarkByIndex(nm); @@ -1683,7 +1683,7 @@ void SdrEditView::DismantleMarkedObjects(bool bMakeLines) const size_t nPos0=pObj->GetOrdNumDirect(); size_t nPos=nPos0+1; SdrObjList* pSubList=pObj->GetSubList(); - if (pSubList!=NULL && !pObj->Is3DObj()) { + if (pSubList!=nullptr && !pObj->Is3DObj()) { SdrObjListIter aIter(*pSubList,IM_DEEPNOGROUPS); while (aIter.IsMore()) { const SdrObject* pObj1=aIter.Next(); @@ -1748,8 +1748,8 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) // make sure OrdNums are correct if (pSrcLst->IsObjOrdNumsDirty()) pSrcLst->RecalcObjOrdNums(); - SdrObject* pGrp=NULL; - SdrObjList* pDstLst=NULL; + SdrObject* pGrp=nullptr; + SdrObjList* pDstLst=nullptr; // if all selected objects come from foreign object lists. // the group object is the last one in the list. size_t nInsPos=pSrcLst->GetObjCount(); @@ -1760,14 +1760,14 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) SdrMark* pM=GetSdrMarkByIndex(nm); if (pM->GetPageView()==pPV) { - if (pGrp==NULL) + if (pGrp==nullptr) { - if (pUserGrp!=NULL) + if (pUserGrp!=nullptr) pGrp=pUserGrp->Clone(); - if (pGrp==NULL) + if (pGrp==nullptr) pGrp=new SdrObjGroup; pDstLst=pGrp->GetSubList(); - DBG_ASSERT(pDstLst!=NULL,"Alleged group object doesn't return object list."); + DBG_ASSERT(pDstLst!=nullptr,"Alleged group object doesn't return object list."); } SdrObject* pObj=pM->GetMarkedSdrObj(); pSrcLst=pObj->GetObjList(); @@ -1792,7 +1792,7 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) pSrcLst0=pSrcLst; } } - if (pGrp!=NULL) + if (pGrp!=nullptr) { aNewMark.InsertEntry(SdrMark(pGrp,pPV)); const size_t nAnz=pDstLst->GetObjCount(); @@ -1837,7 +1837,7 @@ void SdrEditView::UnGroupMarked() SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pGrp=pM->GetMarkedSdrObj(); SdrObjList* pSrcLst=pGrp->GetSubList(); - if (pSrcLst!=NULL) { + if (pSrcLst!=nullptr) { nCount++; if (nCount==1) { aName = pGrp->TakeObjNameSingul(); // retrieve name of group @@ -1922,11 +1922,11 @@ void SdrEditView::UnGroupMarked() SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, bool bPath, bool bLineToArea) { SdrObject* pNewObj = pObj->ConvertToPolyObj(bPath, bLineToArea); - if (pNewObj!=NULL) + if (pNewObj!=nullptr) { SdrObjList* pOL=pObj->GetObjList(); - DBG_ASSERT(pOL!=NULL,"ConvertTo: Object doesn't return object list"); - if (pOL!=NULL) + DBG_ASSERT(pOL!=nullptr,"ConvertTo: Object doesn't return object list"); + if (pOL!=nullptr) { const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -1982,7 +1982,7 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea) } } else { SdrObject* pNewObj=ImpConvertOneObj(pObj,bPath,bLineToArea); - if (pNewObj!=NULL) { + if (pNewObj!=nullptr) { bMrkChg=true; GetMarkedObjectListWriteAccess().ReplaceMark(SdrMark(pNewObj,pPV),nm); } @@ -2023,7 +2023,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) for (size_t nm=nAnz; nm>0;) { // create Undo objects for all new objects // check for cancellation between the metafiles - if( pProgrInfo != NULL ) + if( pProgrInfo != nullptr ) { pProgrInfo->SetNextObject(); if(!pProgrInfo->ReportActions(0)) @@ -2061,7 +2061,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) nInsAnz = aFilter.DoImport(aMetaFile, *pOL, nInsPos, pProgrInfo); } } - if ( pOle2!=NULL && pOle2->GetGraphic() ) + if ( pOle2!=nullptr && pOle2->GetGraphic() ) { aLogicRect = pOle2->GetLogicRect(); ImpSdrGDIMetaFileImport aFilter(*mpModel, pObj->GetLayer(), aLogicRect); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index b676dc210d08..492906d1e4f7 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -70,17 +70,17 @@ void SdrObjEditView::ImpClearVars() { bQuickTextEditMode=true; bMacroMode=true; - pTextEditOutliner=NULL; - pTextEditOutlinerView=NULL; - pTextEditPV=NULL; - pTextEditWin=NULL; - pTextEditCursorMerker=NULL; - pEditPara=NULL; + pTextEditOutliner=nullptr; + pTextEditOutlinerView=nullptr; + pTextEditPV=nullptr; + pTextEditWin=nullptr; + pTextEditCursorMerker=nullptr; + pEditPara=nullptr; bTextEditNewObj=false; bMacroDown=false; - pMacroObj=NULL; - pMacroPV=NULL; - pMacroWin=NULL; + pMacroObj=nullptr; + pMacroPV=nullptr; + pMacroWin=nullptr; nMacroTol=0; bTextEditDontDelete=false; bTextEditOnlyOneView=false; @@ -88,14 +88,14 @@ void SdrObjEditView::ImpClearVars() SdrObjEditView::SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut): SdrGlueEditView(pModel1,pOut), - mpOldTextEditUndoManager(0) + mpOldTextEditUndoManager(nullptr) { ImpClearVars(); } SdrObjEditView::~SdrObjEditView() { - pTextEditWin = NULL; // so there's no ShowCursor in SdrEndTextEdit + pTextEditWin = nullptr; // so there's no ShowCursor in SdrEndTextEdit if (IsTextEdit()) SdrEndTextEdit(); delete pTextEditOutliner; @@ -147,7 +147,7 @@ void SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SdrGlueEditView::Notify(rBC,rHint); // change of printer while editing const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint); - if (pSdrHint!=NULL && pTextEditOutliner!=NULL) { + if (pSdrHint!=nullptr && pTextEditOutliner!=nullptr) { SdrHintKind eKind=pSdrHint->GetKind(); if (eKind==HINT_REFDEVICECHG) { pTextEditOutliner->SetRefDevice(mpModel->GetRefDevice()); @@ -171,7 +171,7 @@ void SdrObjEditView::ModelHasChanged() // TextEditObj changed? if (IsTextEdit()) { SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( mxTextEditObj.get() ); - if (pTextObj!=NULL) { + if (pTextObj!=nullptr) { sal_uIntPtr nOutlViewAnz=pTextEditOutliner->GetViewCount(); bool bAreaChg=false; bool bAnchorChg=false; @@ -233,7 +233,7 @@ void SdrObjEditView::ModelHasChanged() bAreaChg=true; } } - if (pTextEditOutlinerView!=NULL) { // check fill and anchor + if (pTextEditOutlinerView!=nullptr) { // check fill and anchor EVAnchorMode eOldAnchor=pTextEditOutlinerView->GetAnchorMode(); eNewAnchor=(EVAnchorMode)pTextObj->GetOutlinerViewAnchorMode(); bAnchorChg=eOldAnchor!=eNewAnchor; @@ -442,12 +442,12 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP // background Color aBackground(GetTextEditBackgroundColor(*this)); SdrTextObj* pText = dynamic_cast< SdrTextObj * >( mxTextEditObj.get() ); - bool bTextFrame=pText!=NULL && pText->IsTextFrame(); - bool bContourFrame=pText!=NULL && pText->IsContourTextFrame(); + bool bTextFrame=pText!=nullptr && pText->IsTextFrame(); + bool bContourFrame=pText!=nullptr && pText->IsContourTextFrame(); // create OutlinerView OutlinerView* pOutlView=pGivenView; pTextEditOutliner->SetUpdateMode(false); - if (pOutlView==NULL) pOutlView = new OutlinerView(pTextEditOutliner,pWin); + if (pOutlView==nullptr) pOutlView = new OutlinerView(pTextEditOutliner,pWin); else pOutlView->SetWindow(pWin); // disallow scrolling EVControlBits nStat=pOutlView->GetControlWord(); @@ -463,7 +463,7 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP pOutlView->SetBackgroundColor( aBackground ); pOutlView->setTiledRendering(GetModel()->isTiledRendering()); pOutlView->registerLibreOfficeKitCallback(GetModel()->getLibreOfficeKitCallback(), GetModel()->getLibreOfficeKitData()); - if (pText!=NULL) + if (pText!=nullptr) { pOutlView->SetAnchorMode((EVAnchorMode)(pText->GetOutlinerViewAnchorMode())); pTextEditOutliner->SetFixedCellHeight(static_cast<const SdrTextFixedCellHeightItem&>(pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); @@ -529,7 +529,7 @@ void SdrObjEditView::ImpChainingEventHdl() if (!pTxtUndo->IsDifferent()) { delete pTxtUndo; - pTxtUndo=NULL; + pTxtUndo=nullptr; } } @@ -588,16 +588,16 @@ IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,v OUString& rStr=pFI->GetRepresentation(); rStr.clear(); SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); - if (pTextObj!=NULL) { - Color* pTxtCol=NULL; - Color* pFldCol=NULL; + if (pTextObj!=nullptr) { + Color* pTxtCol=nullptr; + Color* pFldCol=nullptr; bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),true,pTxtCol,pFldCol,rStr); if (bOk) { - if (pTxtCol!=NULL) { + if (pTxtCol!=nullptr) { pFI->SetTextColor(*pTxtCol); delete pTxtCol; } - if (pFldCol!=NULL) { + if (pFldCol!=nullptr) { pFI->SetFieldColor(*pFldCol); delete pFldCol; } else { @@ -624,7 +624,7 @@ IMPL_LINK_NOARG_TYPED(SdrObjEditView, EndTextEditHdl, SdrUndoManager*, void) SdrUndoManager* SdrObjEditView::getSdrUndoManagerForEnhancedTextEdit() const { // default returns registered UndoManager - return GetModel() ? dynamic_cast< SdrUndoManager* >(GetModel()->GetSdrUndoManager()) : 0; + return GetModel() ? dynamic_cast< SdrUndoManager* >(GetModel()->GetSdrUndoManager()) : nullptr; } bool SdrObjEditView::SdrBeginTextEdit( @@ -636,7 +636,7 @@ bool SdrObjEditView::SdrBeginTextEdit( { SdrEndTextEdit(); - if( dynamic_cast< SdrTextObj* >( pObj ) == 0 ) + if( dynamic_cast< SdrTextObj* >( pObj ) == nullptr ) return false; // currently only possible with text objects if(bGrabFocus && pWin) @@ -645,7 +645,7 @@ bool SdrObjEditView::SdrBeginTextEdit( pWin->GrabFocus(); // to force the cursor into the edit view } - bTextEditDontDelete=bDontDeleteOutliner && pGivenOutliner!=NULL; + bTextEditDontDelete=bDontDeleteOutliner && pGivenOutliner!=nullptr; bTextEditOnlyOneView=bOnlyOneView; bTextEditNewObj=bIsNewObj; const sal_uInt32 nWinCount(PaintWindowCount()); @@ -701,7 +701,7 @@ bool SdrObjEditView::SdrBeginTextEdit( { OSL_FAIL("SdrObjEditView::SdrBeginTextEdit(): Old Outliner still exists."); delete pTextEditOutliner; - pTextEditOutliner = 0L; + pTextEditOutliner = nullptr; } if(!bBrk) @@ -710,7 +710,7 @@ bool SdrObjEditView::SdrBeginTextEdit( pTextEditPV=pPV; mxTextEditObj.reset( pObj ); pTextEditOutliner=pGivenOutliner; - if (pTextEditOutliner==NULL) + if (pTextEditOutliner==nullptr) pTextEditOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, *mxTextEditObj->GetModel() ); { @@ -718,7 +718,7 @@ bool SdrObjEditView::SdrBeginTextEdit( pTextEditOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() ); } - bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL; + bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==nullptr; aOldCalcFieldValueLink=pTextEditOutliner->GetCalcFieldValueHdl(); // FieldHdl has to be set by SdrBeginTextEdit, because this call an UpdateFields @@ -745,14 +745,14 @@ bool SdrObjEditView::SdrBeginTextEdit( if (pTextEditOutliner->GetViewCount()!=0) { OutlinerView* pTmpOLV=pTextEditOutliner->RemoveView(static_cast<size_t>(0)); - if(pTmpOLV!=NULL && pTmpOLV!=pGivenOutlinerView) + if(pTmpOLV!=nullptr && pTmpOLV!=pGivenOutlinerView) delete pTmpOLV; } // Determine EditArea via TakeTextEditArea. // TODO: This could theoretically be left out, because TakeTextRect() calculates the aTextEditArea, // but aMinTextEditArea has to happen, too (therefore leaving this in right now) - pTextObj->TakeTextEditArea(NULL,NULL,&aTextEditArea,&aMinTextEditArea); + pTextObj->TakeTextEditArea(nullptr,nullptr,&aTextEditArea,&aMinTextEditArea); Rectangle aTextRect; Rectangle aAnchorRect; @@ -811,7 +811,7 @@ bool SdrObjEditView::SdrBeginTextEdit( if(&rOutDev != pWin && OUTDEV_WINDOW == rOutDev.GetOutDevType()) { - OutlinerView* pOutlView = ImpMakeOutlinerView(static_cast<vcl::Window*>(&rOutDev), !bEmpty, 0L); + OutlinerView* pOutlView = ImpMakeOutlinerView(static_cast<vcl::Window*>(&rOutDev), !bEmpty, nullptr); pTextEditOutliner->InsertView(pOutlView, (sal_uInt16)i); } } @@ -840,7 +840,7 @@ bool SdrObjEditView::SdrBeginTextEdit( GetModel()->Broadcast(aHint); } - pTextEditOutliner->setVisualizedPage(0); + pTextEditOutliner->setVisualizedPage(nullptr); if( mxSelectionController.is() ) mxSelectionController->onSelectionHasChanged(); @@ -859,7 +859,7 @@ bool SdrObjEditView::SdrBeginTextEdit( // should not happen, delete it since it was probably forgotten somewhere OSL_ENSURE(false, "Deleting forgotten old TextEditUndoManager, should be checked (!)"); delete mpOldTextEditUndoManager; - mpOldTextEditUndoManager = 0; + mpOldTextEditUndoManager = nullptr; } mpOldTextEditUndoManager = pTextEditOutliner->SetUndoManager(pSdrUndoManager); @@ -880,35 +880,35 @@ bool SdrObjEditView::SdrBeginTextEdit( pTextEditOutliner->SetEndPasteOrDropHdl(Link<PasteOrDropInfos*,void>()); } } - if (pTextEditOutliner != NULL) + if (pTextEditOutliner != nullptr) { - pTextEditOutliner->setVisualizedPage(0); + pTextEditOutliner->setVisualizedPage(nullptr); } // something went wrong... if(!bDontDeleteOutliner) { - if(pGivenOutliner!=NULL) + if(pGivenOutliner!=nullptr) { delete pGivenOutliner; - pTextEditOutliner = NULL; + pTextEditOutliner = nullptr; } - if(pGivenOutlinerView!=NULL) + if(pGivenOutlinerView!=nullptr) { delete pGivenOutlinerView; - pGivenOutlinerView = NULL; + pGivenOutlinerView = nullptr; } } - if( pTextEditOutliner!=NULL ) + if( pTextEditOutliner!=nullptr ) { delete pTextEditOutliner; } - pTextEditOutliner=NULL; - pTextEditOutlinerView=NULL; - mxTextEditObj.reset(0); - pTextEditPV=NULL; - pTextEditWin=NULL; + pTextEditOutliner=nullptr; + pTextEditOutlinerView=nullptr; + mxTextEditObj.reset(nullptr); + pTextEditPV=nullptr; + pTextEditWin=nullptr; maHdlList.SetMoveOutside(false); return false; @@ -922,14 +922,14 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) SdrOutliner* pTEOutliner =pTextEditOutliner; OutlinerView* pTEOutlinerView=pTextEditOutlinerView; vcl::Cursor* pTECursorMerker=pTextEditCursorMerker; - SdrUndoManager* pUndoEditUndoManager = 0; + SdrUndoManager* pUndoEditUndoManager = nullptr; bool bNeedToUndoSavedRedoTextEdit(false); if (GetModel() && IsUndoEnabled() && pTEObj && pTEOutliner && !GetModel()->GetDisableTextEditUsesCommonUndoManager()) { // change back the UndoManager to the remembered original one ::svl::IUndoManager* pOriginal = pTEOutliner->SetUndoManager(mpOldTextEditUndoManager); - mpOldTextEditUndoManager = 0; + mpOldTextEditUndoManager = nullptr; if(pOriginal) { @@ -975,26 +975,26 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) GetModel()->Broadcast(aHint); } - mxTextEditObj.reset(0); - pTextEditPV=NULL; - pTextEditWin=NULL; - pTextEditOutliner=NULL; - pTextEditOutlinerView=NULL; - pTextEditCursorMerker=NULL; + mxTextEditObj.reset(nullptr); + pTextEditPV=nullptr; + pTextEditWin=nullptr; + pTextEditOutliner=nullptr; + pTextEditOutlinerView=nullptr; + pTextEditCursorMerker=nullptr; aTextEditArea=Rectangle(); - if (pTEOutliner!=NULL) + if (pTEOutliner!=nullptr) { bool bModified=pTEOutliner->IsModified(); - if (pTEOutlinerView!=NULL) + if (pTEOutlinerView!=nullptr) { pTEOutlinerView->HideCursor(); } - if (pTEObj!=NULL) + if (pTEObj!=nullptr) { pTEOutliner->CompleteOnlineSpelling(); - SdrUndoObjSetText* pTxtUndo = 0; + SdrUndoObjSetText* pTxtUndo = nullptr; if( bModified ) { @@ -1026,20 +1026,20 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) pTEObj->ActionChanged(); } - if (pTxtUndo!=NULL) + if (pTxtUndo!=nullptr) { pTxtUndo->AfterSetText(); if (!pTxtUndo->IsDifferent()) { delete pTxtUndo; - pTxtUndo=NULL; + pTxtUndo=nullptr; } } // check deletion of entire TextObj - SdrUndoAction* pDelUndo=NULL; + SdrUndoAction* pDelUndo=nullptr; bool bDelObj=false; SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( pTEObj ); - if (pTextObj!=NULL && bTextEditNewObj) + if (pTextObj!=nullptr && bTextEditNewObj) { bDelObj=pTextObj->IsTextFrame() && !pTextObj->HasText() && @@ -1056,13 +1056,13 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) } } } - if (pTxtUndo!=NULL) + if (pTxtUndo!=nullptr) { if( bUndo ) AddUndo(pTxtUndo); eRet=SDRENDTEXTEDIT_CHANGED; } - if (pDelUndo!=NULL) + if (pDelUndo!=nullptr) { if( bUndo ) { @@ -1073,8 +1073,8 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) delete pDelUndo; } eRet=SDRENDTEXTEDIT_DELETED; - DBG_ASSERT(pTEObj->GetObjList()!=NULL,"SdrObjEditView::SdrEndTextEdit(): Fatal: Object edited doesn't have an ObjList!"); - if (pTEObj->GetObjList()!=NULL) + DBG_ASSERT(pTEObj->GetObjList()!=nullptr,"SdrObjEditView::SdrEndTextEdit(): Fatal: Object edited doesn't have an ObjList!"); + if (pTEObj->GetObjList()!=nullptr) { pTEObj->GetObjList()->RemoveObject(pTEObj->GetOrdNum()); CheckMarked(); // remove selection immediately... @@ -1127,7 +1127,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) // and now the Outliner itself if (!bTextEditDontDelete) delete pTEOutliner; else pTEOutliner->Clear(); - if (pTEWin!=NULL) { + if (pTEWin!=nullptr) { pTEWin->SetCursor(pTECursorMerker); } maHdlList.SetMoveOutside(false); @@ -1189,11 +1189,11 @@ SdrPageView* SdrObjEditView::GetTextEditPageView() const OutlinerView* SdrObjEditView::ImpFindOutlinerView(vcl::Window* pWin) const { - if (pWin==NULL) return NULL; - if (pTextEditOutliner==NULL) return NULL; - OutlinerView* pNewView=NULL; + if (pWin==nullptr) return nullptr; + if (pTextEditOutliner==nullptr) return nullptr; + OutlinerView* pNewView=nullptr; sal_uIntPtr nWinCount=pTextEditOutliner->GetViewCount(); - for (sal_uIntPtr i=0; i<nWinCount && pNewView==NULL; i++) { + for (sal_uIntPtr i=0; i<nWinCount && pNewView==nullptr; i++) { OutlinerView* pView=pTextEditOutliner->GetView(i); if (pView->GetWindow()==pWin) pNewView=pView; } @@ -1202,12 +1202,12 @@ OutlinerView* SdrObjEditView::ImpFindOutlinerView(vcl::Window* pWin) const void SdrObjEditView::SetTextEditWin(vcl::Window* pWin) { - if(mxTextEditObj.is() && pWin!=NULL && pWin!=pTextEditWin) + if(mxTextEditObj.is() && pWin!=nullptr && pWin!=pTextEditWin) { OutlinerView* pNewView=ImpFindOutlinerView(pWin); - if (pNewView!=NULL && pNewView!=pTextEditOutlinerView) + if (pNewView!=nullptr && pNewView!=pTextEditOutlinerView) { - if (pTextEditOutlinerView!=NULL) + if (pTextEditOutlinerView!=nullptr) { pTextEditOutlinerView->HideCursor(); } @@ -1227,7 +1227,7 @@ bool SdrObjEditView::IsTextEditHit(const Point& rHit) const { Rectangle aEditArea; OutlinerView* pOLV=pTextEditOutliner->GetView(0); - if (pOLV!=NULL) + if (pOLV!=nullptr) { aEditArea.Union(pOLV->GetOutputArea()); } @@ -1256,7 +1256,7 @@ bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const if( pOLV ) { vcl::Window* pWin=pOLV->GetWindow(); - if (pText!=NULL && pText->IsTextFrame() && pOLV!=NULL && pWin!=NULL) { + if (pText!=nullptr && pText->IsTextFrame() && pOLV!=nullptr && pWin!=nullptr) { sal_uInt16 nPixSiz=pOLV->GetInvalidateMore(); Rectangle aEditArea(aMinTextEditArea); aEditArea.Union(pOLV->GetOutputArea()); @@ -1282,14 +1282,14 @@ TextChainCursorManager *SdrObjEditView::ImpHandleMotionThroughBoxesKeyInput( *bOutHandled = false; if (!mxTextEditObj.is()) - return NULL; + return nullptr; SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>(mxTextEditObj.get()); if (!pTextObj) - return NULL; + return nullptr; if (!pTextObj->GetNextLinkInChain() && !pTextObj->GetPrevLinkInChain()) - return NULL; + return nullptr; TextChainCursorManager *pCursorManager = new TextChainCursorManager(this, pTextObj); if( pCursorManager->HandleKeyEvent(rKEvt) ) { @@ -1327,7 +1327,7 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) ImpMoveCursorAfterChainingEvent(xCursorManager.get()); /* End chaining processing */ - if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin); + if (pWin!=nullptr && pWin!=pTextEditWin) SetTextEditWin(pWin); #ifdef DBG_UTIL if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty(); #endif @@ -1340,11 +1340,11 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) { - if (pTextEditOutlinerView!=NULL) { + if (pTextEditOutlinerView!=nullptr) { bool bPostIt=pTextEditOutliner->IsInSelectionMode(); if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); - if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); + if (pWin!=nullptr) aPt=pWin->PixelToLogic(aPt); else if (pTextEditWin!=nullptr) aPt=pTextEditWin->PixelToLogic(aPt); bPostIt=IsTextEditHit(aPt); } @@ -1361,7 +1361,7 @@ bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) MouseEvent aMEvt(aPixPos,rMEvt.GetClicks(),rMEvt.GetMode(), rMEvt.GetButtons(),rMEvt.GetModifier()); if (pTextEditOutlinerView->MouseButtonDown(aMEvt)) { - if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin); + if (pWin!=nullptr && pWin!=pTextEditWin) SetTextEditWin(pWin); #ifdef DBG_UTIL if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty(); #endif @@ -1375,11 +1375,11 @@ bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) { - if (pTextEditOutlinerView!=NULL) { + if (pTextEditOutlinerView!=nullptr) { bool bPostIt=pTextEditOutliner->IsInSelectionMode(); if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); - if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); + if (pWin!=nullptr) aPt=pWin->PixelToLogic(aPt); else if (pTextEditWin!=nullptr) aPt=pTextEditWin->PixelToLogic(aPt); bPostIt=IsTextEditHit(aPt); } @@ -1406,7 +1406,7 @@ bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { - if (pTextEditOutlinerView!=NULL) { + if (pTextEditOutlinerView!=nullptr) { bool bSelMode=pTextEditOutliner->IsInSelectionMode(); bool bPostIt=bSelMode; if (!bPostIt) { @@ -1445,13 +1445,13 @@ bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin) { // as long as OutlinerView returns a sal_Bool, it only gets CommandEventId::StartDrag - if (pTextEditOutlinerView!=NULL) + if (pTextEditOutlinerView!=nullptr) { if (rCEvt.GetCommand()==CommandEventId::StartDrag) { bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent(); if (!bPostIt && rCEvt.IsMouseEvent()) { Point aPt(rCEvt.GetMousePosPixel()); - if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); + if (pWin!=nullptr) aPt=pWin->PixelToLogic(aPt); else if (pTextEditWin!=nullptr) aPt=pTextEditWin->PixelToLogic(aPt); bPostIt=IsTextEditHit(aPt); } @@ -1467,7 +1467,7 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin) CommandEvent aCEvt(aPixPos,rCEvt.GetCommand(),rCEvt.IsMouseEvent()); // Command is void at the OutlinerView, sadly pTextEditOutlinerView->Command(aCEvt); - if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin); + if (pWin!=nullptr && pWin!=pTextEditWin) SetTextEditWin(pWin); #ifdef DBG_UTIL if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty(); #endif @@ -1489,7 +1489,7 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin) bool SdrObjEditView::ImpIsTextEditAllSelected() const { bool bRet=false; - if (pTextEditOutliner!=NULL && pTextEditOutlinerView!=NULL) + if (pTextEditOutliner!=nullptr && pTextEditOutlinerView!=nullptr) { if(SdrTextObj::HasTextImpl( pTextEditOutliner ) ) { @@ -1521,7 +1521,7 @@ void SdrObjEditView::ImpMakeTextCursorAreaVisible() { if (pTextEditOutlinerView!=nullptr && pTextEditWin!=nullptr) { vcl::Cursor* pCsr=pTextEditWin->GetCursor(); - if (pCsr!=NULL) { + if (pCsr!=nullptr) { Size aSiz(pCsr->GetSize()); if (aSiz.Width()!=0 && aSiz.Height()!=0) { MakeVisible(Rectangle(pCsr->GetPos(),aSiz),*pTextEditWin); @@ -1571,8 +1571,8 @@ bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) c if(IsTextEdit()) { - DBG_ASSERT(pTextEditOutlinerView!=NULL,"SdrObjEditView::GetAttributes(): pTextEditOutlinerView=NULL"); - DBG_ASSERT(pTextEditOutliner!=NULL,"SdrObjEditView::GetAttributes(): pTextEditOutliner=NULL"); + DBG_ASSERT(pTextEditOutlinerView!=nullptr,"SdrObjEditView::GetAttributes(): pTextEditOutlinerView=NULL"); + DBG_ASSERT(pTextEditOutliner!=nullptr,"SdrObjEditView::GetAttributes(): pTextEditOutliner=NULL"); // take care of bOnlyHardAttr(!) if(!bOnlyHardAttr && mxTextEditObj->GetStyleSheet()) @@ -1607,7 +1607,7 @@ bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) c bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { bool bRet=false; - bool bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is(); + bool bTextEdit=pTextEditOutlinerView!=nullptr && mxTextEditObj.is(); bool bAllTextSelected=ImpIsTextEditAllSelected(); const SfxItemSet* pSet=&rSet; @@ -1629,7 +1629,7 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) bool bHasEEFeatureItems=false; SfxItemIter aIter(rSet); const SfxPoolItem* pItem=aIter.FirstItem(); - while (!bHasEEFeatureItems && pItem!=NULL) + while (!bHasEEFeatureItems && pItem!=nullptr) { if (!IsInvalidItem(pItem)) { @@ -1750,7 +1750,7 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) SfxStyleSheet* SdrObjEditView::GetStyleSheet() const { - SfxStyleSheet* pSheet = 0; + SfxStyleSheet* pSheet = nullptr; if( mxSelectionController.is() ) { @@ -1779,7 +1779,7 @@ bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveH // if we are currently in edit mode we must also set the stylesheet // on all paragraphs in the Outliner for the edit view - if( NULL != pTextEditOutlinerView ) + if( nullptr != pTextEditOutlinerView ) { Outliner* pOutliner = pTextEditOutlinerView->GetOutliner(); @@ -1801,7 +1801,7 @@ void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pW if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW) { - OutlinerView* pOutlView=ImpMakeOutlinerView(static_cast<vcl::Window*>(pNewWin),false,NULL); + OutlinerView* pOutlView=ImpMakeOutlinerView(static_cast<vcl::Window*>(pNewWin),false,nullptr); pTextEditOutliner->InsertView(pOutlView); } } @@ -1824,7 +1824,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin) bool SdrObjEditView::IsTextEditInSelectionMode() const { - return pTextEditOutliner!=NULL && pTextEditOutliner->IsInSelectionMode(); + return pTextEditOutliner!=nullptr && pTextEditOutliner->IsInSelectionMode(); } @@ -1834,8 +1834,8 @@ bool SdrObjEditView::IsTextEditInSelectionMode() const bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin) { BrkMacroObj(); - if (pObj!=NULL && pPV!=NULL && pWin!=NULL && pObj->HasMacro()) { - nTol=ImpGetHitTolLogic(nTol,NULL); + if (pObj!=nullptr && pPV!=nullptr && pWin!=nullptr && pObj->HasMacro()) { + nTol=ImpGetHitTolLogic(nTol,nullptr); pMacroObj=pObj; pMacroPV=pPV; pMacroWin=pWin; @@ -1849,7 +1849,7 @@ bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, void SdrObjEditView::ImpMacroUp(const Point& rUpPos) { - if (pMacroObj!=NULL && bMacroDown) + if (pMacroObj!=nullptr && bMacroDown) { SdrObjMacroHitRec aHitRec; aHitRec.aPos=rUpPos; @@ -1865,7 +1865,7 @@ void SdrObjEditView::ImpMacroUp(const Point& rUpPos) void SdrObjEditView::ImpMacroDown(const Point& rDownPos) { - if (pMacroObj!=NULL && !bMacroDown) + if (pMacroObj!=nullptr && !bMacroDown) { SdrObjMacroHitRec aHitRec; aHitRec.aPos=rDownPos; @@ -1882,7 +1882,7 @@ void SdrObjEditView::ImpMacroDown(const Point& rDownPos) void SdrObjEditView::MovMacroObj(const Point& rPnt) { - if (pMacroObj!=NULL) { + if (pMacroObj!=nullptr) { SdrObjMacroHitRec aHitRec; aHitRec.aPos=rPnt; aHitRec.aDownPos=aMacroDownPos; @@ -1899,17 +1899,17 @@ void SdrObjEditView::MovMacroObj(const Point& rPnt) void SdrObjEditView::BrkMacroObj() { - if (pMacroObj!=NULL) { + if (pMacroObj!=nullptr) { ImpMacroUp(aMacroDownPos); - pMacroObj=NULL; - pMacroPV=NULL; - pMacroWin=NULL; + pMacroObj=nullptr; + pMacroPV=nullptr; + pMacroWin=nullptr; } } bool SdrObjEditView::EndMacroObj() { - if (pMacroObj!=NULL && bMacroDown) { + if (pMacroObj!=nullptr && bMacroDown) { ImpMacroUp(aMacroDownPos); SdrObjMacroHitRec aHitRec; aHitRec.aPos=aMacroDownPos; @@ -1920,9 +1920,9 @@ bool SdrObjEditView::EndMacroObj() aHitRec.bDown=true; aHitRec.pOut=pMacroWin.get(); bool bRet=pMacroObj->DoMacro(aHitRec); - pMacroObj=NULL; - pMacroPV=NULL; - pMacroWin=NULL; + pMacroObj=nullptr; + pMacroPV=nullptr; + pMacroWin=nullptr; return bRet; } else { BrkMacroObj(); @@ -2018,8 +2018,8 @@ sal_uInt16 SdrObjEditView::GetSelectionLevel() const sal_uInt16 nLevel = 0xFFFF; if( IsTextEdit() ) { - DBG_ASSERT(pTextEditOutlinerView!=NULL,"SdrObjEditView::GetAttributes(): pTextEditOutlinerView=NULL"); - DBG_ASSERT(pTextEditOutliner!=NULL,"SdrObjEditView::GetAttributes(): pTextEditOutliner=NULL"); + DBG_ASSERT(pTextEditOutlinerView!=nullptr,"SdrObjEditView::GetAttributes(): pTextEditOutlinerView=NULL"); + DBG_ASSERT(pTextEditOutliner!=nullptr,"SdrObjEditView::GetAttributes(): pTextEditOutliner=NULL"); if( pTextEditOutlinerView ) { //start and end position @@ -2120,7 +2120,7 @@ bool SdrObjEditView::TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rForma { OutlinerView* pOLV = GetTextEditOutlinerView(); - rFormatSet.reset( new SfxItemSet( GetModel()->GetItemPool(), GetFormatRangeImpl( pOLV != NULL ) ) ); + rFormatSet.reset( new SfxItemSet( GetModel()->GetItemPool(), GetFormatRangeImpl( pOLV != nullptr ) ) ); if( pOLV ) { rFormatSet->Put( pOLV->GetAttribs() ); @@ -2167,7 +2167,7 @@ static SfxItemSet CreatePaintSet( const sal_uInt16 *pRanges, SfxItemPool& rPool, void SdrObjEditView::ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats ) { - OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : 0; + OutlinerParaObject* pParaObj = pText ? pText->GetOutlinerParaObject() : nullptr; if(pParaObj) { SdrOutliner& rOutliner = rTextObj.ImpGetDrawOutliner(); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 3227bf331889..9efc087bfef5 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -69,11 +69,11 @@ using namespace ::com::sun::star; // Global data of the DrawingEngine SdrGlobalData::SdrGlobalData() : - pSysLocale(NULL), - pLocaleData(NULL), - pOutliner(NULL), - pDefaults(NULL), - pResMgr(NULL), + pSysLocale(nullptr), + pLocaleData(nullptr), + pOutliner(nullptr), + pDefaults(nullptr), + pResMgr(nullptr), nExchangeFormat(0) { if (!utl::ConfigManager::IsAvoidConfig()) @@ -409,7 +409,7 @@ SdrEngineDefaults::SdrEngineDefaults(): SdrEngineDefaults& SdrEngineDefaults::GetDefaults() { SdrGlobalData& rGlobalData=GetSdrGlobalData(); - if (rGlobalData.pDefaults==NULL) { + if (rGlobalData.pDefaults==nullptr) { rGlobalData.pDefaults=new SdrEngineDefaults; } return *rGlobalData.pDefaults; @@ -471,7 +471,7 @@ bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnl { bool bHas=false; bool bOnly=true; - bool bLookOnly=pbOnlyEE!=NULL; + bool bLookOnly=pbOnlyEE!=nullptr; SfxWhichIter aIter(rSet); sal_uInt16 nWhich=aIter.FirstWhich(); while (((bLookOnly && bOnly) || !bHas) && nWhich!=0) { @@ -486,7 +486,7 @@ bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnl nWhich=aIter.NextWhich(); } if (!bHas) bOnly=false; - if (pbOnlyEE!=NULL) *pbOnlyEE=bOnly; + if (pbOnlyEE!=nullptr) *pbOnlyEE=bOnly; return bHas; } @@ -584,7 +584,7 @@ bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions ) if(nCurAction > nActionCount) nCurAction = nActionCount; - return maLink.Call(NULL); + return maLink.Call(nullptr); } bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts ) @@ -592,13 +592,13 @@ bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts ) nSumCurAction += nAnzInserts; nCurInsert += nAnzInserts; - return maLink.Call(NULL); + return maLink.Call(nullptr); } bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales ) { nSumCurAction += nAnzRescales; - return maLink.Call(NULL); + return maLink.Call(nullptr); } void SvdProgressInfo::SetActionCount( sal_uIntPtr _nActionCount ) diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 394cc3781829..04d97c7c59a5 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -81,9 +81,9 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport( mpVD(VclPtr<VirtualDevice>::Create()), maScaleRect(rRect), mnMapScalingOfs(0), - mpLineAttr(0), - mpFillAttr(0), - mpTextAttr(0), + mpLineAttr(nullptr), + mpFillAttr(nullptr), + mpTextAttr(nullptr), mpModel(&rModel), mnLayer(nLay), maOldLineColor(), @@ -782,7 +782,7 @@ bool ImpSdrGDIMetaFileImport::CheckLastLineMerge(const basegfx::B2DPolygon& rSrc // #i73407# reformulation to use new B2DPolygon classes if(mbLastObjWasLine && (maOldLineColor == mpVD->GetLineColor()) && rSrcPoly.count()) { - SdrObject* pTmpObj = maTmpList.size() ? maTmpList[maTmpList.size() - 1] : 0; + SdrObject* pTmpObj = maTmpList.size() ? maTmpList[maTmpList.size() - 1] : nullptr; SdrPathObj* pLastPoly = dynamic_cast< SdrPathObj* >(pTmpObj); if(pLastPoly) @@ -848,14 +848,14 @@ bool ImpSdrGDIMetaFileImport::CheckLastPolyLineAndFillMerge(const basegfx::B2DPo // #i73407# reformulation to use new B2DPolygon classes if(mbLastObjWasPolyWithoutLine) { - SdrObject* pTmpObj = maTmpList.size() ? maTmpList[maTmpList.size() - 1] : 0; + SdrObject* pTmpObj = maTmpList.size() ? maTmpList[maTmpList.size() - 1] : nullptr; SdrPathObj* pLastPoly = dynamic_cast< SdrPathObj* >(pTmpObj); if(pLastPoly) { if(pLastPoly->GetPathPoly() == rPolyPolygon) { - SetAttributes(NULL); + SetAttributes(nullptr); if(!mbNoLine && mbNoFill) { @@ -1278,7 +1278,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaTextRectAction& rAct) GDIMetaFile aTemp; mpVD->AddTextRectActions(rAct.GetRect(), rAct.GetText(), rAct.GetStyle(), aTemp); - DoLoopActions(aTemp, 0, 0); + DoLoopActions(aTemp, nullptr, nullptr); } void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScalePartAction& rAct) diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index f06003b3a252..a14bda004bc3 100644 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -168,7 +168,7 @@ public: const GDIMetaFile& rMtf, SdrObjList& rDestList, size_t nInsPos = SAL_MAX_SIZE, - SvdProgressInfo* pProgrInfo = 0); + SvdProgressInfo* pProgrInfo = nullptr); }; #endif // INCLUDED_SVX_SOURCE_SVDRAW_SVDFMTF_HXX diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index cf771b170727..3b603b332ce3 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -49,16 +49,16 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size(); + sal_uIntPtr nPointCount=pPts==nullptr ? 0 : pPts->size(); if (nPointCount!=0) { - SdrGluePointList* pGPL=NULL; + SdrGluePointList* pGPL=nullptr; if (bConst) { const SdrGluePointList* pConstGPL=pObj->GetGluePointList(); pGPL=const_cast<SdrGluePointList*>(pConstGPL); } else { pGPL=pObj->ForceGluePointList(); } - if (pGPL!=NULL) + if (pGPL!=nullptr) { if(!bConst && IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); @@ -235,11 +235,11 @@ void SdrGlueEditView::DeleteMarkedGluePoints() SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size(); + sal_uIntPtr nPointCount=pPts==nullptr ? 0 : pPts->size(); if (nPointCount!=0) { SdrGluePointList* pGPL=pObj->ForceGluePointList(); - if (pGPL!=NULL) + if (pGPL!=nullptr) { if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); @@ -281,8 +281,8 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() SdrObject* pObj=pM->GetMarkedSdrObj(); SdrUShortCont* pPts=pM->GetMarkedGluePoints(); SdrGluePointList* pGPL=pObj->ForceGluePointList(); - sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size(); - if (nPointCount!=0 && pGPL!=NULL) + sal_uIntPtr nPointCount=pPts==nullptr ? 0 : pPts->size(); + if (nPointCount!=0 && pGPL!=nullptr) { if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); @@ -324,10 +324,10 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size(); + sal_uIntPtr nPointCount=pPts==nullptr ? 0 : pPts->size(); if (nPointCount!=0) { SdrGluePointList* pGPL=pObj->ForceGluePointList(); - if (pGPL!=NULL) + if (pGPL!=nullptr) { if( IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 31cb7cd797dd..4ec986e7f336 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -187,7 +187,7 @@ SdrEscapeDirection SdrGluePoint::EscAngleToDir(long nAngle) void SdrGluePoint::Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj) { - Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); + Point aPt(pObj!=nullptr ? GetAbsolutePos(*pObj) : GetPos()); RotatePoint(aPt,rRef,sn,cs); // rotate reference edge if(nAlign != (SdrAlign::HORZ_CENTER|SdrAlign::VERT_CENTER)) @@ -202,12 +202,12 @@ void SdrGluePoint::Rotate(const Point& rRef, long nAngle, double sn, double cs, if (nEscDir0&SdrEscapeDirection::RIGHT ) nEscDir1 |= EscAngleToDir(EscDirToAngle(SdrEscapeDirection::RIGHT )+nAngle); if (nEscDir0&SdrEscapeDirection::BOTTOM) nEscDir1 |= EscAngleToDir(EscDirToAngle(SdrEscapeDirection::BOTTOM)+nAngle); nEscDir=nEscDir1; - if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); + if (pObj!=nullptr) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); } void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj) { - Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); + Point aPt(pObj!=nullptr ? GetAbsolutePos(*pObj) : GetPos()); MirrorPoint(aPt,rRef1,rRef2); // mirror reference edge if(nAlign != (SdrAlign::HORZ_CENTER|SdrAlign::VERT_CENTER)) @@ -240,20 +240,20 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nAngle, c nEscDir1|=EscAngleToDir(nEW); } nEscDir=nEscDir1; - if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); + if (pObj!=nullptr) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); } void SdrGluePoint::Shear(const Point& rRef, long /*nAngle*/, double tn, bool bVShear, const SdrObject* pObj) { - Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); + Point aPt(pObj!=nullptr ? GetAbsolutePos(*pObj) : GetPos()); ShearPoint(aPt,rRef,tn,bVShear); - if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); + if (pObj!=nullptr) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); } void SdrGluePoint::Invalidate(vcl::Window& rWin, const SdrObject* pObj) const { bool bMapMerk=rWin.IsMapModeEnabled(); - Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); + Point aPt(pObj!=nullptr ? GetAbsolutePos(*pObj) : GetPos()); aPt=rWin.LogicToPixel(aPt); rWin.EnableMapMode(false); @@ -269,7 +269,7 @@ void SdrGluePoint::Invalidate(vcl::Window& rWin, const SdrObject* pObj) const bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const { - Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); + Point aPt(pObj!=nullptr ? GetAbsolutePos(*pObj) : GetPos()); Size aSiz=rOut.PixelToLogic(aGlueHalfSize); Rectangle aRect(aPt.X()-aSiz.Width(),aPt.Y()-aSiz.Height(),aPt.X()+aSiz.Width(),aPt.Y()+aSiz.Height()); return aRect.IsInside(rPnt); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 84a53dce82f0..10db049cecbb 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -270,9 +270,9 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal SdrHdl::SdrHdl(): - pObj(NULL), - pPV(NULL), - pHdlList(NULL), + pObj(nullptr), + pPV(nullptr), + pHdlList(nullptr), eKind(HDL_MOVE), nRotationAngle(0), nObjHdlNum(0), @@ -288,9 +288,9 @@ SdrHdl::SdrHdl(): } SdrHdl::SdrHdl(const Point& rPnt, SdrHdlKind eNewKind): - pObj(NULL), - pPV(NULL), - pHdlList(NULL), + pObj(nullptr), + pPV(nullptr), + pHdlList(nullptr), aPos(rPnt), eKind(eNewKind), nRotationAngle(0), @@ -577,7 +577,7 @@ void SdrHdl::CreateB2dIAObject() if (xManager.is()) { basegfx::B2DPoint aPosition(aPos.X(), aPos.Y()); - sdr::overlay::OverlayObject* pNewOverlayObject = NULL; + sdr::overlay::OverlayObject* pNewOverlayObject = nullptr; if (getenv ("SVX_DRAW_HANDLES") && (eKindOfMarker == Rect_7x7 || eKindOfMarker == Rect_9x9 || eKindOfMarker == Rect_11x11)) { double fSize = 7.0; @@ -684,7 +684,7 @@ sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject( const basegfx::B2DPoint& rPos, BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, OutputDevice& rOutDev, Point aMoveOutsideOffset) { - sdr::overlay::OverlayObject* pRetval = 0L; + sdr::overlay::OverlayObject* pRetval = nullptr; // support bigger sizes bool bForceBiggerSize(false); @@ -857,9 +857,9 @@ Pointer SdrHdl::GetPointer() const { PointerStyle ePtr=PointerStyle::Move; const bool bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT; - const bool bRot=pHdlList!=NULL && pHdlList->IsRotateShear(); - const bool bDis=pHdlList!=NULL && pHdlList->IsDistortShear(); - if (bSize && pHdlList!=NULL && (bRot || bDis)) { + const bool bRot=pHdlList!=nullptr && pHdlList->IsRotateShear(); + const bool bDis=pHdlList!=nullptr && pHdlList->IsDistortShear(); + if (bSize && pHdlList!=nullptr && (bRot || bDis)) { switch (eKind) { case HDL_UPLFT: case HDL_UPRGT: case HDL_LWLFT: case HDL_LWRGT: ePtr=bRot ? PointerStyle::Rotate : PointerStyle::RefHand; break; @@ -1127,8 +1127,8 @@ void SdrHdlColor::SetSize(const Size& rNew) SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad) : SdrHdl(rRef1, bGrad ? HDL_GRAD : HDL_TRNS) - , pColHdl1(NULL) - , pColHdl2(NULL) + , pColHdl1(nullptr) + , pColHdl2(nullptr) , a2ndPos(rRef2) , bGradient(bGrad) , bMoveSingleHandle(false) @@ -1490,7 +1490,7 @@ void ImpEdgeHdl::CreateB2dIAObject() { const SdrEdgeObj* pEdge = static_cast<SdrEdgeObj*>(pObj); - if(pEdge->GetConnectedNode(nObjHdlNum == 0) != NULL) + if(pEdge->GetConnectedNode(nObjHdlNum == 0) != nullptr) eColIndex = LightRed; if(nPPntNum < 2) @@ -1555,7 +1555,7 @@ void ImpEdgeHdl::SetLineCode(SdrEdgeLineCode eCode) Pointer ImpEdgeHdl::GetPointer() const { SdrEdgeObj* pEdge=dynamic_cast<SdrEdgeObj*>( pObj ); - if (pEdge==NULL) + if (pEdge==nullptr) return SdrHdl::GetPointer(); if (nObjHdlNum<=1) return Pointer(PointerStyle::MovePoint); @@ -1568,7 +1568,7 @@ Pointer ImpEdgeHdl::GetPointer() const bool ImpEdgeHdl::IsHorzDrag() const { SdrEdgeObj* pEdge=dynamic_cast<SdrEdgeObj*>( pObj ); - if (pEdge==NULL) + if (pEdge==nullptr) return false; if (nObjHdlNum<=1) return false; @@ -2006,7 +2006,7 @@ SdrHdl* SdrHdlList::GetFocusHdl() const if(mnFocusIndex < GetHdlCount()) return GetHdl(mnFocusIndex); else - return 0L; + return nullptr; } void SdrHdlList::SetFocusHdl(SdrHdl* pNew) @@ -2173,7 +2173,7 @@ void SdrHdlList::Sort() size_t SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const { - if (pHdl==NULL) + if (pHdl==nullptr) return SAL_MAX_SIZE; std::deque<SdrHdl*>::const_iterator it = std::find( aList.begin(), aList.end(), pHdl); if( it == aList.end() ) @@ -2183,7 +2183,7 @@ size_t SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const void SdrHdlList::AddHdl(SdrHdl* pHdl, bool bAtBegin) { - if (pHdl!=NULL) + if (pHdl!=nullptr) { if (bAtBegin) { @@ -2199,10 +2199,10 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl, bool bAtBegin) SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, bool bBack, bool bNext, SdrHdl* pHdl0) const { - SdrHdl* pRet=NULL; + SdrHdl* pRet=nullptr; const size_t nCount=GetHdlCount(); size_t nNum=bBack ? 0 : nCount; - while ((bBack ? nNum<nCount : nNum>0) && pRet==NULL) + while ((bBack ? nNum<nCount : nNum>0) && pRet==nullptr) { if (!bBack) nNum--; @@ -2225,8 +2225,8 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, bool bBack, bool bNext, SdrH SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const { - SdrHdl* pRet=NULL; - for (size_t i=0; i<GetHdlCount() && pRet==NULL; ++i) + SdrHdl* pRet=nullptr; + for (size_t i=0; i<GetHdlCount() && pRet==nullptr; ++i) { SdrHdl* pHdl=GetHdl(i); if (pHdl->GetKind()==eKind1) @@ -2250,8 +2250,8 @@ SdrCropHdl::SdrCropHdl( BitmapEx SdrCropHdl::GetHandlesBitmap() { - static BitmapEx* pModernBitmap = 0; - if( pModernBitmap == 0 ) + static BitmapEx* pModernBitmap = nullptr; + if( pModernBitmap == nullptr ) pModernBitmap = new BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr())); return *pModernBitmap; } @@ -2305,8 +2305,8 @@ void SdrCropHdl::CreateB2dIAObject() // first throw away old one GetRidOfIAObject(); - SdrMarkView* pView = pHdlList ? pHdlList->GetView() : 0; - SdrPageView* pPageView = pView ? pView->GetSdrPageView() : 0; + SdrMarkView* pView = pHdlList ? pHdlList->GetView() : nullptr; + SdrPageView* pPageView = pView ? pView->GetSdrPageView() : nullptr; if( pPageView && !pView->areMarkHandlesHidden() ) { @@ -2327,7 +2327,7 @@ void SdrCropHdl::CreateB2dIAObject() { basegfx::B2DPoint aPosition(aPos.X(), aPos.Y()); - sdr::overlay::OverlayObject* pOverlayObject = 0L; + sdr::overlay::OverlayObject* pOverlayObject = nullptr; // animate focused handles if(IsFocusHdl() && (pHdlList->GetFocusHdl() == this)) @@ -2420,8 +2420,8 @@ void translateRotationToMirroring(basegfx::B2DVector & scale, double * rotate) { void SdrCropViewHdl::CreateB2dIAObject() { GetRidOfIAObject(); - SdrMarkView* pView = pHdlList ? pHdlList->GetView() : 0; - SdrPageView* pPageView = pView ? pView->GetSdrPageView() : 0; + SdrMarkView* pView = pHdlList ? pHdlList->GetView() : nullptr; + SdrPageView* pPageView = pView ? pView->GetSdrPageView() : nullptr; if(!pPageView || pView->areMarkHandlesHidden()) { diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 90e9e38da989..ecd92f45b54b 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -100,7 +100,7 @@ public: ImpItemListRow() : eState(SfxItemState::UNKNOWN), nWhichId(0), - pType(NULL), + pType(nullptr), eItemType(ITEM_DONTKNOW), nVal(0), nMin(0), @@ -231,8 +231,8 @@ void _SdrItemBrowserControl::dispose() void _SdrItemBrowserControl::ImpCtor() { - pEditControl = NULL; - pAktChangeEntry = NULL; + pEditControl = nullptr; + pAktChangeEntry = nullptr; nLastWhichOfs = 0; nLastWhich = 0; nLastWhichOben = 0; // not implemented yet @@ -496,7 +496,7 @@ bool _SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos) BreakChangeEntry(); bool bRet = false; ImpItemListRow* pEntry=ImpGetEntry(nPos); - if (pEntry!=NULL && !pEntry->bComment) { + if (pEntry!=nullptr && !pEntry->bComment) { SetMode(MYBROWSEMODE & BrowserMode(~BrowserMode::KEEPHIGHLIGHT)); pEditControl=VclPtr<ImpItemEdit>::Create(&GetDataWindow(),this,0); Rectangle aRect(GetFieldRectPixel(nPos, ITEMBROWSER_VALUECOL_ID, false)); @@ -545,7 +545,7 @@ void _SdrItemBrowserControl::BreakChangeEntry() if (pEditControl!=nullptr) { pEditControl.disposeAndClear(); delete pAktChangeEntry; - pAktChangeEntry=NULL; + pAktChangeEntry=nullptr; vcl::Window* pParent=GetParent(); pParent->SetText(aWNamMerk); SetMode(MYBROWSEMODE); @@ -589,14 +589,14 @@ bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& r if (eState==SfxItemState::DEFAULT) { rpItem=&rSet.Get(nWhich); } - return (eState==SfxItemState::DEFAULT || eState==SfxItemState::SET) && rpItem!=NULL; + return (eState==SfxItemState::DEFAULT || eState==SfxItemState::SET) && rpItem!=nullptr; } bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) { rIndent=0; - if (pSet==NULL) return false; - const SfxPoolItem* pItem=NULL; + if (pSet==nullptr) return false; + const SfxPoolItem* pItem=nullptr; bool bRet = false; switch (nWhich) { case XATTR_LINEDASH : @@ -905,7 +905,7 @@ sal_uInt16 ImpSortWhich(sal_uInt16 nWhich) void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemSet* p2ndSet) { SetMode(MYBROWSEMODE & BrowserMode(~BrowserMode::KEEPHIGHLIGHT)); - if (pSet!=NULL) { + if (pSet!=nullptr) { sal_uInt16 nEntryNum=0; SfxWhichIter aIter(*pSet); const SfxItemPool* pPool=pSet->GetPool(); @@ -917,7 +917,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem // at this position in the Set. if (!bDontSortItems) nWhich=ImpSortWhich(nWhich); SfxItemState eState=pSet->GetItemState(nWhich); - if (p2ndSet!=NULL) { + if (p2ndSet!=nullptr) { SfxItemState e2ndState=p2ndSet->GetItemState(nWhich); if (eState==SfxItemState::DEFAULT) eState=SfxItemState::DISABLED; else if (e2ndState==SfxItemState::DEFAULT) eState=SfxItemState::DEFAULT; @@ -1098,13 +1098,13 @@ vcl::Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) } } - return 0L; + return nullptr; } void SdrItemBrowser::ForceParent() { vcl::Window* pWin=ImpGetViewWin(*pView); - if (pWin!=NULL) SetParent(pWin); + if (pWin!=nullptr) SetParent(pWin); } void SdrItemBrowser::SetDirty() @@ -1145,7 +1145,7 @@ IMPL_LINK_NOARG_TYPED(SdrItemBrowser, IdleHdl, Idle *, void) IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, _SdrItemBrowserControl&, rBrowse, void) { const ImpItemListRow* pEntry = rBrowse.GetAktChangeEntry(); - if (pEntry!=NULL) + if (pEntry!=nullptr) { SfxItemSet aSet(pView->GetModel()->GetItemPool()); pView->GetAttributes(aSet); diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index c2c92ea9d9e1..e26465dcc13c 100644 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -65,7 +65,7 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod { SdrObject* pObj = bUseZOrder ? rObjList.GetObj( nIdx ) : rObjList.GetObjectForNavigationPosition( nIdx ); - OSL_ASSERT( pObj != 0 ); + OSL_ASSERT( pObj != nullptr ); if( pObj ) ImpProcessObj( pObj, eMode, bUseZOrder ); } diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 53bddf9c4e8a..644b44958dbe 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -101,7 +101,7 @@ void SetOfByte::QueryValue( css::uno::Any & rAny ) const } SdrLayer::SdrLayer(SdrLayerID nNewID, const OUString& rNewName) : - maName(rNewName), pModel(NULL), nType(0), nID(nNewID) + maName(rNewName), pModel(nullptr), nType(0), nID(nNewID) { } @@ -111,7 +111,7 @@ void SdrLayer::SetStandardLayer(bool bStd) if (bStd) { maName = ImpGetResStr(STR_StandardLayerName); } - if (pModel!=NULL) { + if (pModel!=nullptr) { SdrHint aHint(HINT_LAYERCHG); pModel->Broadcast(aHint); pModel->SetChanged(); @@ -144,15 +144,15 @@ bool SdrLayer::operator==(const SdrLayer& rCmpLayer) const SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent): aLayer(), pParent(pNewParent), - pModel(NULL), + pModel(nullptr), maControlLayerName("Controls") { } SdrLayerAdmin::SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin): aLayer(), - pParent(NULL), - pModel(NULL), + pParent(nullptr), + pModel(nullptr), maControlLayerName("Controls") { *this = rSrcLayerAdmin; @@ -211,7 +211,7 @@ void SdrLayerAdmin::SetModel(SdrModel* pNewModel) void SdrLayerAdmin::Broadcast() const { - if (pModel!=NULL) { + if (pModel!=nullptr) { SdrHint aHint(HINT_LAYERORDERCHG); pModel->Broadcast(aHint); pModel->SetChanged(); @@ -256,7 +256,7 @@ SdrLayer* SdrLayerAdmin::NewStandardLayer(sal_uInt16 nPos) sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const { sal_uIntPtr nRet=SDRLAYER_NOTFOUND; - if (pLayer!=NULL) { + if (pLayer!=nullptr) { std::vector<SdrLayer*>::const_iterator it = std::find(aLayer.begin(), aLayer.end(), pLayer); if (it==aLayer.end()) { nRet=SDRLAYER_NOTFOUND; @@ -275,7 +275,7 @@ SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName, bool bInherited) const SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName, bool /*bInherited*/) const { sal_uInt16 i(0); - const SdrLayer* pLay = NULL; + const SdrLayer* pLay = nullptr; while(i < GetLayerCount() && !pLay) { @@ -297,15 +297,15 @@ SdrLayerID SdrLayerAdmin::GetLayerID(const OUString& rName, bool bInherited) con { SdrLayerID nRet=SDRLAYER_NOTFOUND; const SdrLayer* pLay=GetLayer(rName,bInherited); - if (pLay!=NULL) nRet=pLay->GetID(); + if (pLay!=nullptr) nRet=pLay->GetID(); return nRet; } const SdrLayer* SdrLayerAdmin::GetLayerPerID(sal_uInt16 nID) const { sal_uInt16 i=0; - const SdrLayer* pLay=NULL; - while (i<GetLayerCount() && pLay==NULL) { + const SdrLayer* pLay=nullptr; + while (i<GetLayerCount() && pLay==nullptr) { if (nID==GetLayer(i)->GetID()) pLay=GetLayer(i); else i++; } @@ -319,7 +319,7 @@ const SdrLayer* SdrLayerAdmin::GetLayerPerID(sal_uInt16 nID) const SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const { SetOfByte aSet; - bool bDown = (pParent == NULL); + bool bDown = (pParent == nullptr); sal_uInt16 j; for (j=0; j<GetLayerCount(); j++) { diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 407cd0fd55fb..a17bc051e037 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -48,9 +48,9 @@ void SdrMark::setTime() SdrMark::SdrMark(SdrObject* pNewObj, SdrPageView* pNewPageView) : mpSelectedSdrObject(pNewObj), mpPageView(pNewPageView), - mpPoints(0L), - mpLines(0L), - mpGluePoints(0L), + mpPoints(nullptr), + mpLines(nullptr), + mpGluePoints(nullptr), mbCon1(false), mbCon2(false), mnUser(0) @@ -65,11 +65,11 @@ SdrMark::SdrMark(SdrObject* pNewObj, SdrPageView* pNewPageView) SdrMark::SdrMark(const SdrMark& rMark) : ObjectUser(), mnTimeStamp(0), - mpSelectedSdrObject(0L), - mpPageView(0L), - mpPoints(0L), - mpLines(0L), - mpGluePoints(0L), + mpSelectedSdrObject(nullptr), + mpPageView(nullptr), + mpPoints(nullptr), + mpLines(nullptr), + mpGluePoints(nullptr), mbCon1(false), mbCon2(false), mnUser(0) @@ -105,7 +105,7 @@ void SdrMark::ObjectInDestruction(const SdrObject& rObject) (void) rObject; // avoid warnings OSL_ENSURE(mpSelectedSdrObject && mpSelectedSdrObject == &rObject, "SdrMark::ObjectInDestruction: called form object different from hosted one (!)"); OSL_ENSURE(mpSelectedSdrObject, "SdrMark::ObjectInDestruction: still selected SdrObject is deleted, deselect first (!)"); - mpSelectedSdrObject = 0L; + mpSelectedSdrObject = nullptr; } void SdrMark::SetMarkedSdrObj(SdrObject* pNewObj) @@ -137,7 +137,7 @@ SdrMark& SdrMark::operator=(const SdrMark& rMark) if(mpPoints) { delete mpPoints; - mpPoints = 0L; + mpPoints = nullptr; } } else @@ -157,7 +157,7 @@ SdrMark& SdrMark::operator=(const SdrMark& rMark) if(mpLines) { delete mpLines; - mpLines = 0L; + mpLines = nullptr; } } else @@ -177,7 +177,7 @@ SdrMark& SdrMark::operator=(const SdrMark& rMark) if(mpGluePoints) { delete mpGluePoints; - mpGluePoints = 0L; + mpGluePoints = nullptr; } } else @@ -199,13 +199,13 @@ bool SdrMark::operator==(const SdrMark& rMark) const { bool bRet(mpSelectedSdrObject == rMark.mpSelectedSdrObject && mpPageView == rMark.mpPageView && mbCon1 == rMark.mbCon1 && mbCon2 == rMark.mbCon2 && mnUser == rMark.mnUser); - if((mpPoints != 0L) != (rMark.mpPoints != 0L)) + if((mpPoints != nullptr) != (rMark.mpPoints != nullptr)) bRet = false; - if((mpLines != 0L) != (rMark.mpLines != 0L)) + if((mpLines != nullptr) != (rMark.mpLines != nullptr)) bRet = false; - if((mpGluePoints != 0L) != (rMark.mpGluePoints != 0L)) + if((mpGluePoints != nullptr) != (rMark.mpGluePoints != nullptr)) bRet = false; if(bRet && mpPoints && *mpPoints != *rMark.mpPoints) @@ -226,8 +226,8 @@ static bool ImpSdrMarkListSorter(SdrMark* const& lhs, SdrMark* const& rhs) { SdrObject* pObj1 = lhs->GetMarkedSdrObj(); SdrObject* pObj2 = rhs->GetMarkedSdrObj(); - SdrObjList* pOL1 = (pObj1) ? pObj1->GetObjList() : 0L; - SdrObjList* pOL2 = (pObj2) ? pObj2->GetObjList() : 0L; + SdrObjList* pOL1 = (pObj1) ? pObj1->GetObjList() : nullptr; + SdrObjList* pOL2 = (pObj2) ? pObj2->GetObjList() : nullptr; if (pOL1 == pOL2) { @@ -268,7 +268,7 @@ void SdrMarkList::ImpForceSort() for(std::vector<SdrMark*>::iterator it = maList.begin(); it != maList.end(); ) { SdrMark* pAkt = *it; - if(pAkt->GetMarkedSdrObj() == 0) + if(pAkt->GetMarkedSdrObj() == nullptr) { it = maList.erase( it ); delete pAkt; @@ -348,7 +348,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst) SdrMark* SdrMarkList::GetMark(size_t nNum) const { - return (nNum < maList.size()) ? maList[nNum] : NULL; + return (nNum < maList.size()) ? maList[nNum] : nullptr; } size_t SdrMarkList::FindObject(const SdrObject* pObj) const @@ -410,13 +410,13 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort) maList.push_back(pKopie); // now check if the sort is ok - const SdrObjList* pLastOL = pLastObj!=0L ? pLastObj->GetObjList() : 0L; - const SdrObjList* pNeuOL = pNeuObj !=0L ? pNeuObj ->GetObjList() : 0L; + const SdrObjList* pLastOL = pLastObj!=nullptr ? pLastObj->GetObjList() : nullptr; + const SdrObjList* pNeuOL = pNeuObj !=nullptr ? pNeuObj ->GetObjList() : nullptr; if(pLastOL == pNeuOL) { - const sal_uLong nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0); - const sal_uLong nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0); + const sal_uLong nLastNum(pLastObj!=nullptr ? pLastObj->GetOrdNum() : 0); + const sal_uLong nNeuNum(pNeuObj !=nullptr ? pNeuObj ->GetOrdNum() : 0); if(nNeuNum < nLastNum) { @@ -438,7 +438,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort) void SdrMarkList::DeleteMark(size_t nNum) { SdrMark* pMark = GetMark(nNum); - DBG_ASSERT(pMark!=0L,"DeleteMark: MarkEntry not found."); + DBG_ASSERT(pMark!=nullptr,"DeleteMark: MarkEntry not found."); if(pMark) { @@ -451,7 +451,7 @@ void SdrMarkList::DeleteMark(size_t nNum) void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, size_t nNum) { SdrMark* pMark = GetMark(nNum); - DBG_ASSERT(pMark!=0L,"ReplaceMark: MarkEntry not found."); + DBG_ASSERT(pMark!=nullptr,"ReplaceMark: MarkEntry not found."); if(pMark) { diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index becf1d5f9e56..7df403858ee3 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -110,8 +110,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe bool bUseExtColorTable, bool bLoadRefCounts) { mpImpl = new SdrModelImpl; - mpImpl->mpUndoManager=0; - mpImpl->mpUndoFactory=0; + mpImpl->mpUndoManager=nullptr; + mpImpl->mpUndoFactory=nullptr; mbInDestruction = false; aObjUnit=SdrEngineDefaults::GetMapFraction(); eObjUnit=SdrEngineDefaults::GetMapUnit(); @@ -119,27 +119,27 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe aUIScale=Fraction(1,1); nUIUnitKomma=0; bUIOnlyKomma=false; - pLayerAdmin=NULL; + pLayerAdmin=nullptr; pItemPool=pPool; bMyPool=false; m_pEmbeddedHelper=_pEmbeddedHelper; - pDrawOutliner=NULL; - pHitTestOutliner=NULL; - pRefOutDev=NULL; + pDrawOutliner=nullptr; + pHitTestOutliner=nullptr; + pRefOutDev=nullptr; mbTiledRendering = false; - mpLibreOfficeKitCallback = 0; - mpLibreOfficeKitData = 0; + mpLibreOfficeKitCallback = nullptr; + mpLibreOfficeKitData = nullptr; nProgressAkt=0; nProgressMax=0; nProgressOfs=0; - pDefaultStyleSheet=NULL; - mpDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj = 0; - pLinkManager=NULL; - pUndoStack=NULL; - pRedoStack=NULL; + pDefaultStyleSheet=nullptr; + mpDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj = nullptr; + pLinkManager=nullptr; + pUndoStack=nullptr; + pRedoStack=nullptr; nMaxUndoCount=16; mnUniqueCommentID=0; - pAktUndoGroup=NULL; + pAktUndoGroup=nullptr; nUndoLevel=0; mbUndoEnabled=true; nProgressPercent=0; @@ -161,13 +161,13 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe bReadOnly=false; nStreamNumberFormat=SvStreamEndian::BIG; nDefaultTabulator=0; - mpNumberFormatter = NULL; + mpNumberFormatter = nullptr; bTransparentTextFrames=false; bStarDrawPreviewMode = false; nStarDrawPreviewMasterPageNum = SDRPAGE_NOTFOUND; - mpForbiddenCharactersTable = NULL; + mpForbiddenCharactersTable = nullptr; mbModelLocked = false; - mpOutlinerCache = NULL; + mpOutlinerCache = nullptr; mbKernAsianPunctuation = false; mbAddExtLeading = false; mnHandoutPageCount = 0; @@ -188,9 +188,9 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe #endif bExtColorTable=bUseExtColorTable; - if ( pPool == NULL ) + if ( pPool == nullptr ) { - pItemPool=new SdrItemPool(0L, bLoadRefCounts); + pItemPool=new SdrItemPool(nullptr, bLoadRefCounts); // Outliner doesn't have its own Pool, so use the EditEngine's SfxItemPool* pOutlPool=EditEngine::CreatePool( bLoadRefCounts ); // OutlinerPool as SecondaryPool of SdrPool @@ -239,7 +239,7 @@ SdrModel::SdrModel(): maMaPag(), maPages() { - ImpCtor(NULL, NULL, false, LOADREFCOUNTS); + ImpCtor(nullptr, nullptr, false, LOADREFCOUNTS); } SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts): @@ -346,7 +346,7 @@ void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nCount) { if (nCount<1) nCount=1; nMaxUndoCount=nCount; - if (pUndoStack!=NULL) { + if (pUndoStack!=nullptr) { while (pUndoStack->size()>nMaxUndoCount) { delete pUndoStack->back(); pUndoStack->pop_back(); @@ -356,21 +356,21 @@ void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nCount) void SdrModel::ClearUndoBuffer() { - if (pUndoStack!=NULL) { + if (pUndoStack!=nullptr) { while (!pUndoStack->empty()) { delete pUndoStack->back(); pUndoStack->pop_back(); } delete pUndoStack; - pUndoStack=NULL; + pUndoStack=nullptr; } - if (pRedoStack!=NULL) { + if (pRedoStack!=nullptr) { while (!pRedoStack->empty()) { delete pRedoStack->back(); pRedoStack->pop_back(); } delete pRedoStack; - pRedoStack=NULL; + pRedoStack=nullptr; } } @@ -393,13 +393,13 @@ bool SdrModel::Undo() } else { - SfxUndoAction* pDo = HasUndoActions() ? pUndoStack->front() : NULL; - if(pDo!=NULL) + SfxUndoAction* pDo = HasUndoActions() ? pUndoStack->front() : nullptr; + if(pDo!=nullptr) { const bool bWasUndoEnabled = mbUndoEnabled; mbUndoEnabled = false; pDo->Undo(); - if(pRedoStack==NULL) + if(pRedoStack==nullptr) pRedoStack=new std::deque<SfxUndoAction*>; SfxUndoAction* p = pUndoStack->front(); pUndoStack->pop_front(); @@ -419,13 +419,13 @@ bool SdrModel::Redo() } else { - SfxUndoAction* pDo = HasRedoActions() ? pRedoStack->front() : NULL; - if(pDo!=NULL) + SfxUndoAction* pDo = HasRedoActions() ? pRedoStack->front() : nullptr; + if(pDo!=nullptr) { const bool bWasUndoEnabled = mbUndoEnabled; mbUndoEnabled = false; pDo->Redo(); - if(pUndoStack==NULL) + if(pUndoStack==nullptr) pUndoStack=new std::deque<SfxUndoAction*>; SfxUndoAction* p = pRedoStack->front(); pRedoStack->pop_front(); @@ -445,8 +445,8 @@ bool SdrModel::Repeat(SfxRepeatTarget& rView) } else { - SfxUndoAction* pDo = HasUndoActions() ? pUndoStack->front() : NULL; - if(pDo!=NULL) + SfxUndoAction* pDo = HasUndoActions() ? pUndoStack->front() : nullptr; + if(pDo!=nullptr) { if(pDo->CanRepeat(rView)) { @@ -460,7 +460,7 @@ bool SdrModel::Repeat(SfxRepeatTarget& rView) void SdrModel::ImpPostUndoAction(SdrUndoAction* pUndo) { - DBG_ASSERT( mpImpl->mpUndoManager == 0, "svx::SdrModel::ImpPostUndoAction(), method not supported with application undo manager!" ); + DBG_ASSERT( mpImpl->mpUndoManager == nullptr, "svx::SdrModel::ImpPostUndoAction(), method not supported with application undo manager!" ); if( IsUndoEnabled() ) { if (aUndoLink.IsSet()) @@ -469,7 +469,7 @@ void SdrModel::ImpPostUndoAction(SdrUndoAction* pUndo) } else { - if (pUndoStack==NULL) + if (pUndoStack==nullptr) pUndoStack=new std::deque<SfxUndoAction*>; pUndoStack->push_front(pUndo); while (pUndoStack->size()>nMaxUndoCount) @@ -477,7 +477,7 @@ void SdrModel::ImpPostUndoAction(SdrUndoAction* pUndo) delete pUndoStack->back(); pUndoStack->pop_back(); } - if (pRedoStack!=NULL) + if (pRedoStack!=nullptr) pRedoStack->clear(); } } @@ -496,7 +496,7 @@ void SdrModel::BegUndo() } else if( IsUndoEnabled() ) { - if(pAktUndoGroup==NULL) + if(pAktUndoGroup==nullptr) { pAktUndoGroup = new SdrUndoGroup(*this); nUndoLevel=1; @@ -562,7 +562,7 @@ void SdrModel::EndUndo() } else { - if(pAktUndoGroup!=NULL && IsUndoEnabled()) + if(pAktUndoGroup!=nullptr && IsUndoEnabled()) { nUndoLevel--; if(nUndoLevel==0) @@ -570,14 +570,14 @@ void SdrModel::EndUndo() if(pAktUndoGroup->GetActionCount()!=0) { SdrUndoAction* pUndo=pAktUndoGroup; - pAktUndoGroup=NULL; + pAktUndoGroup=nullptr; ImpPostUndoAction(pUndo); } else { // was empty delete pAktUndoGroup; - pAktUndoGroup=NULL; + pAktUndoGroup=nullptr; } } } @@ -630,7 +630,7 @@ void SdrModel::AddUndo(SdrUndoAction* pUndo) } else { - if (pAktUndoGroup!=NULL) + if (pAktUndoGroup!=nullptr) { pAktUndoGroup->AddAction(pUndo); } @@ -783,10 +783,10 @@ SdrOutliner& SdrModel::GetChainingOutliner(const SdrTextObj* pObj) const const SdrTextObj* SdrModel::GetFormattingTextObj() const { - if (pDrawOutliner!=NULL) { + if (pDrawOutliner!=nullptr) { return pDrawOutliner->GetTextObj(); } - return NULL; + return nullptr; } void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit ) @@ -898,7 +898,7 @@ uno::Reference<embed::XStorage> SdrModel::GetDocumentStorage() const if (!xSBD.is()) { SAL_WARN("svx", "no UNO model"); - return 0; + return nullptr; } return xSBD->getDocumentStorage(); } @@ -911,13 +911,13 @@ SdrModel::GetDocumentStream( OUString const& rURL, if (!xStorage.is()) { SAL_WARN("svx", "no storage?"); - return 0; + return nullptr; } try { uno::Reference<io::XStream> const xStream( ::comphelper::OStorageHelper::GetStreamAtPackageURL( xStorage, rURL, embed::ElementModes::READ, rProxy)); - return (xStream.is()) ? xStream->getInputStream() : 0; + return (xStream.is()) ? xStream->getInputStream() : nullptr; } catch (container::NoSuchElementException const&) { @@ -927,7 +927,7 @@ SdrModel::GetDocumentStream( OUString const& rURL, { SAL_WARN("svx", "exception: '" << e.Message << "'"); } - return 0; + return nullptr; } // convert template attributes from the string into "hard" attributes @@ -1462,7 +1462,7 @@ SdrPage* SdrModel::RemovePage(sal_uInt16 nPgNum) SdrPage* pPg=maPages[nPgNum]; maPages.erase(maPages.begin()+nPgNum); PageListChanged(); - if (pPg!=NULL) { + if (pPg!=nullptr) { pPg->SetInserted(false); } bPagNumsDirty=true; @@ -1476,7 +1476,7 @@ SdrPage* SdrModel::RemovePage(sal_uInt16 nPgNum) void SdrModel::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) { SdrPage* pPg=maPages[nPgNum]; - if (pPg!=NULL) { + if (pPg!=nullptr) { maPages.erase(maPages.begin()+nPgNum); // shortcut to avoid two broadcasts PageListChanged(); pPg->SetInserted(false); @@ -1542,7 +1542,7 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) SdrPage* pPg=maMaPag[nPgNum]; maMaPag.erase(maMaPag.begin()+nPgNum); MasterPageListChanged(); - if (pPg!=NULL) { + if (pPg!=nullptr) { pPg->SetInserted(false); maMaPag.insert(maMaPag.begin()+nNewPos,pPg); MasterPageListChanged(); @@ -1704,14 +1704,14 @@ void SdrModel::Merge(SdrModel& rSourceModel, for (sal_uInt16 i=nSrcMasterPageAnz; i>0;) { i--; if (pMasterNeed[i]) { - SdrPage* pPg=NULL; + SdrPage* pPg=nullptr; if (bTreadSourceAsConst) { const SdrPage* pPg1=rSourceModel.GetMasterPage(i); pPg=pPg1->Clone(); } else { pPg=rSourceModel.RemoveMasterPage(i); } - if (pPg!=NULL) { + if (pPg!=nullptr) { // Now append all of them to the end of the DstModel. // Don't use InsertMasterPage(), because everything is // inconsistent until all are in. @@ -1734,14 +1734,14 @@ void SdrModel::Merge(SdrModel& rSourceModel, sal_uInt16 nMergeCount=sal_uInt16(std::abs((long)((long)nFirstPageNum-nLastPageNum))+1); if (nDestPos>GetPageCount()) nDestPos=GetPageCount(); while (nMergeCount>0) { - SdrPage* pPg=NULL; + SdrPage* pPg=nullptr; if (bTreadSourceAsConst) { const SdrPage* pPg1=rSourceModel.GetPage(nSourcePos); pPg=pPg1->Clone(); } else { pPg=rSourceModel.RemovePage(nSourcePos); } - if (pPg!=NULL) { + if (pPg!=nullptr) { InsertPage(pPg,nDestPos); if (bUndo) AddUndo(GetSdrUndoFactory().CreateUndoNewPage(*pPg)); @@ -1850,7 +1850,7 @@ void SdrModel::setLock( bool bLock ) void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSet, SdrModel* pNewModel ) { - assert(pNewModel != 0); + assert(pNewModel != nullptr); if( pSourceSet && pDestSet && (pSourceSet != pDestSet ) ) { SfxWhichIter aWhichIter(*pSourceSet); @@ -1861,7 +1861,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe { if(SfxItemState::SET == pSourceSet->GetItemState(nWhich, false, &pPoolItem)) { - const SfxPoolItem* pResultItem = NULL; + const SfxPoolItem* pResultItem = nullptr; switch( nWhich ) { @@ -1957,7 +1957,7 @@ void SdrModel::ReformatAllTextObjects() SdrOutliner* SdrModel::createOutliner( sal_uInt16 nOutlinerMode ) { - if( NULL == mpOutlinerCache ) + if( nullptr == mpOutlinerCache ) mpOutlinerCache = new SdrOutlinerCache(this); return mpOutlinerCache->createOutliner( nOutlinerMode ); @@ -1994,13 +1994,13 @@ SvxNumType SdrModel::GetPageNumType() const const SdrPage* SdrModel::GetPage(sal_uInt16 nPgNum) const { DBG_ASSERT(nPgNum < maPages.size(), "SdrModel::GetPage: Access out of range (!)"); - return nPgNum < maPages.size() ? maPages[nPgNum] : NULL; + return nPgNum < maPages.size() ? maPages[nPgNum] : nullptr; } SdrPage* SdrModel::GetPage(sal_uInt16 nPgNum) { DBG_ASSERT(nPgNum < maPages.size(), "SdrModel::GetPage: Access out of range (!)"); - return nPgNum < maPages.size() ? maPages[nPgNum] : NULL; + return nPgNum < maPages.size() ? maPages[nPgNum] : nullptr; } sal_uInt16 SdrModel::GetPageCount() const @@ -2092,9 +2092,9 @@ const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId() SdrHint::SdrHint(SdrHintKind eNewHint) -: mpPage(0L), - mpObj(0L), - mpObjList(0L), +: mpPage(nullptr), + mpObj(nullptr), + mpObjList(nullptr), meHint(eNewHint) { } diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index ec449b1691ad..eaf6f6246d3f 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -132,8 +132,8 @@ void SdrMarkView::ImpClearVars() meEditMode=SDREDITMODE_EDIT; meEditMode0=SDREDITMODE_EDIT; mbDesignMode=false; - mpMarkedObj=NULL; - mpMarkedPV=NULL; + mpMarkedObj=nullptr; + mpMarkedPV=nullptr; mbForceFrameHandles=false; mbPlusHdlAlways=false; mnFrameHandlesLimit=50; @@ -155,9 +155,9 @@ void SdrMarkView::ImpClearVars() SdrMarkView::SdrMarkView(SdrModel* pModel1, OutputDevice* pOut) : SdrSnapView(pModel1,pOut), - mpMarkObjOverlay(0L), - mpMarkPointsOverlay(0L), - mpMarkGluePointsOverlay(0L), + mpMarkObjOverlay(nullptr), + mpMarkPointsOverlay(nullptr), + mpMarkGluePointsOverlay(nullptr), maHdlList(this), mpSdrViewSelection(new sdr::ViewSelection()) { @@ -204,7 +204,7 @@ void SdrMarkView::ModelHasChanged() mbMrkPntDirty=true; UndirtyMrkPnt(); SdrView* pV=static_cast<SdrView*>(this); - if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) { + if (pV!=nullptr && !pV->IsDragObj() && !pV->IsInsObjPoint()) { AdjustMarkHdl(); } } @@ -317,7 +317,7 @@ bool SdrMarkView::BegMarkObj(const Point& rPnt, bool bUnmark) { BrkAction(); - DBG_ASSERT(0L == mpMarkObjOverlay, "SdrMarkView::BegMarkObj: There exists a mpMarkObjOverlay (!)"); + DBG_ASSERT(nullptr == mpMarkObjOverlay, "SdrMarkView::BegMarkObj: There exists a mpMarkObjOverlay (!)"); basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y()); mpMarkObjOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark); @@ -366,7 +366,7 @@ void SdrMarkView::BrkMarkObj() { DBG_ASSERT(mpMarkObjOverlay, "SdrSnapView::MovSetPageOrg: no ImplPageOriginOverlay (!)"); delete mpMarkObjOverlay; - mpMarkObjOverlay = 0L; + mpMarkObjOverlay = nullptr; } } @@ -378,7 +378,7 @@ bool SdrMarkView::BegMarkPoints(const Point& rPnt, bool bUnmark) { BrkAction(); - DBG_ASSERT(0L == mpMarkPointsOverlay, "SdrMarkView::BegMarkObj: There exists a mpMarkPointsOverlay (!)"); + DBG_ASSERT(nullptr == mpMarkPointsOverlay, "SdrMarkView::BegMarkObj: There exists a mpMarkPointsOverlay (!)"); basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y()); mpMarkPointsOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark); @@ -432,7 +432,7 @@ void SdrMarkView::BrkMarkPoints() { DBG_ASSERT(mpMarkPointsOverlay, "SdrSnapView::MovSetPageOrg: no ImplPageOriginOverlay (!)"); delete mpMarkPointsOverlay; - mpMarkPointsOverlay = 0L; + mpMarkPointsOverlay = nullptr; } } @@ -444,7 +444,7 @@ bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, bool bUnmark) { BrkAction(); - DBG_ASSERT(0L == mpMarkGluePointsOverlay, "SdrMarkView::BegMarkObj: There exists a mpMarkGluePointsOverlay (!)"); + DBG_ASSERT(nullptr == mpMarkGluePointsOverlay, "SdrMarkView::BegMarkObj: There exists a mpMarkGluePointsOverlay (!)"); basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y()); mpMarkGluePointsOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark); @@ -498,7 +498,7 @@ void SdrMarkView::BrkMarkGluePoints() { DBG_ASSERT(mpMarkGluePointsOverlay, "SdrSnapView::MovSetPageOrg: no ImplPageOriginOverlay (!)"); delete mpMarkGluePointsOverlay; - mpMarkGluePointsOverlay = 0L; + mpMarkGluePointsOverlay = nullptr; } } @@ -610,7 +610,7 @@ void SdrMarkView::SetMarkHandles() bool bSaveOldFocus(false); sal_uInt32 nSavePolyNum(0L), nSavePointNum(0L); SdrHdlKind eSaveKind(HDL_MOVE); - SdrObject* pSaveObj = NULL; + SdrObject* pSaveObj = nullptr; if(pSaveOldFocusHdl && pSaveOldFocusHdl->GetObj() @@ -628,8 +628,8 @@ void SdrMarkView::SetMarkHandles() maHdlList.Clear(); maHdlList.SetRotateShear(meDragMode==SDRDRAG_ROTATE); maHdlList.SetDistortShear(meDragMode==SDRDRAG_SHEAR); - mpMarkedObj=NULL; - mpMarkedPV=NULL; + mpMarkedObj=nullptr; + mpMarkedPV=nullptr; // are handles enabled at all? Create only then if(!areMarkHandlesHidden()) @@ -653,13 +653,13 @@ void SdrMarkView::SetMarkHandles() { mpMarkedPV=GetSdrPageViewOfMarkedByIndex(0); - for (size_t nMarkNum=0; nMarkNum<nMarkCount && (mpMarkedPV!=NULL || !bFrmHdl); ++nMarkNum) + for (size_t nMarkNum=0; nMarkNum<nMarkCount && (mpMarkedPV!=nullptr || !bFrmHdl); ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); if (mpMarkedPV!=pM->GetPageView()) { - mpMarkedPV=NULL; + mpMarkedPV=nullptr; } } } @@ -825,7 +825,7 @@ void SdrMarkView::SetMarkHandles() if (bPoly) { - bool bSelected=pMrkPnts!=NULL + bool bSelected=pMrkPnts!=nullptr && pMrkPnts->find( sal_uInt16(i-nSiz0) ) != pMrkPnts->end(); pHdl->SetSelected(bSelected); if (mbPlusHdlAlways || bSelected) @@ -834,7 +834,7 @@ void SdrMarkView::SetMarkHandles() for (sal_uInt32 nPlusNum=0; nPlusNum<nPlusAnz; nPlusNum++) { SdrHdl* pPlusHdl=pObj->GetPlusHdl(*pHdl,nPlusNum); - if (pPlusHdl!=NULL) + if (pPlusHdl!=nullptr) { pPlusHdl->SetObj(pObj); pPlusHdl->SetPageView(pPV); @@ -856,10 +856,10 @@ void SdrMarkView::SetMarkHandles() SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); const SdrUShortCont* pMrkGlue=pM->GetMarkedGluePoints(); - if (pMrkGlue!=NULL) + if (pMrkGlue!=nullptr) { const SdrGluePointList* pGPL=pObj->GetGluePointList(); - if (pGPL!=NULL) + if (pGPL!=nullptr) { for(SdrUShortCont::const_iterator it = pMrkGlue->begin(); it != pMrkGlue->end(); ++it) { @@ -1081,7 +1081,7 @@ bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { if(maHdlList.GetHdlCount()) { - SdrHdl* pMouseOverHdl = 0; + SdrHdl* pMouseOverHdl = nullptr; if( !rMEvt.IsLeaveWindow() && pWin ) { Point aMDPos( pWin->PixelToLogic( rMEvt.GetPosPixel() ) ); @@ -1136,7 +1136,7 @@ void SdrMarkView::ForceRefToMarked() long nObjDst=0; long nOutHgt=0; OutputDevice* pOut=GetFirstOutputDevice(); - if (pOut!=NULL) { + if (pOut!=nullptr) { // minimum length: 50 pixels nMinLen=pOut->PixelToLogic(Size(0,50)).Height(); // 20 pixels distance to the Obj for the reference point @@ -1170,9 +1170,9 @@ void SdrMarkView::ForceRefToMarked() long nY1=aCenter.Y()-(nHgt+1)/2; long nY2=nY1+nHgt; - if (pOut!=NULL && nMinLen>nOutHgt) nMinLen=nOutHgt; // TODO: maybe shorten this a little + if (pOut!=nullptr && nMinLen>nOutHgt) nMinLen=nOutHgt; // TODO: maybe shorten this a little - if (pOut!=NULL) { // now move completely into the visible area + if (pOut!=nullptr) { // now move completely into the visible area if (nY1<nOutMin) { nY1=nOutMin; if (nY2<nY1+nMinLen) nY2=nY1+nMinLen; @@ -1245,7 +1245,7 @@ bool SdrPageView::IsObjSelectable(SdrObject *pObj) const // have to be deselected, though. const SdrObjList* pOOL=pObj->GetObjList(); const SdrObjList* pVOL=GetObjList(); - while (pOOL!=NULL && pOOL!=pVOL) { + while (pOOL!=nullptr && pOOL!=pVOL) { pOOL=pOOL->GetUpList(); } bRaus=pOOL!=pVOL; @@ -1269,7 +1269,7 @@ void SdrMarkView::CheckMarked() { if (!IsGluePointEditMode()) { // selected glue points only in GlueEditMode SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - if (pPts!=NULL) { + if (pPts!=nullptr) { pPts->clear(); } } @@ -1336,17 +1336,17 @@ bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const return false; } } - return pPV==NULL || pPV->IsObjMarkable(pObj); + return pPV==nullptr || pPV->IsObjMarkable(pObj); } bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const { bool bRet=false; - nTol=ImpGetHitTolLogic(nTol,NULL); + nTol=ImpGetHitTolLogic(nTol,nullptr); Point aPt(rPnt); for (size_t nm=0; nm<GetMarkedObjectCount() && !bRet; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); - bRet = 0 != CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),SdrSearchOptions::NONE,0); + bRet = nullptr != CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),SdrSearchOptions::NONE,nullptr); } return bRet; } @@ -1366,7 +1366,7 @@ bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, bool bToggle, bool bDee { SdrObject* pObj; SdrPageView* pPV; - nTol=ImpGetHitTolLogic(nTol,NULL); + nTol=ImpGetHitTolLogic(nTol,nullptr); SdrSearchOptions nOptions=SdrSearchOptions::PICKMARKABLE; if (bDeep) nOptions=nOptions|SdrSearchOptions::DEEP; bool bRet=PickObj(rPnt,(sal_uInt16)nTol,pObj,pPV,nOptions); @@ -1393,17 +1393,17 @@ bool SdrMarkView::MarkNextObj(bool bPrev) if (nMarkCount!=0) { nChgMarkNum=bPrev ? 0 : nMarkCount-1; SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum); - OSL_ASSERT(pM!=NULL); - if (pM->GetMarkedSdrObj() != NULL) + OSL_ASSERT(pM!=nullptr); + if (pM->GetMarkedSdrObj() != nullptr) nSearchObjNum = pM->GetMarkedSdrObj()->GetNavigationPosition(); } - SdrObject* pMarkObj=NULL; + SdrObject* pMarkObj=nullptr; SdrObjList* pSearchObjList=pPageView->GetObjList(); const size_t nObjCount = pSearchObjList->GetObjCount(); if (nObjCount!=0) { if (nSearchObjNum>nObjCount) nSearchObjNum=nObjCount; - while (pMarkObj==NULL && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjCount))) + while (pMarkObj==nullptr && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjCount))) { if (!bPrev) nSearchObjNum--; @@ -1435,46 +1435,46 @@ bool SdrMarkView::MarkNextObj(bool bPrev) bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) { SortMarkedObjects(); - nTol=ImpGetHitTolLogic(nTol,NULL); + nTol=ImpGetHitTolLogic(nTol,nullptr); Point aPt(rPnt); - SdrMark* pTopMarkHit=NULL; - SdrMark* pBtmMarkHit=NULL; + SdrMark* pTopMarkHit=nullptr; + SdrMark* pBtmMarkHit=nullptr; size_t nTopMarkHit=0; size_t nBtmMarkHit=0; // find topmost of the selected objects that is hit by rPnt const size_t nMarkCount=GetMarkedObjectCount(); - for (size_t nm=nMarkCount; nm>0 && pTopMarkHit==NULL;) { + for (size_t nm=nMarkCount; nm>0 && pTopMarkHit==nullptr;) { --nm; SdrMark* pM=GetSdrMarkByIndex(nm); - if(CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),SdrSearchOptions::NONE,0)) + if(CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),SdrSearchOptions::NONE,nullptr)) { pTopMarkHit=pM; nTopMarkHit=nm; } } // nothing found, in this case, just select an object - if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol)); + if (pTopMarkHit==nullptr) return MarkObj(rPnt,sal_uInt16(nTol)); SdrObject* pTopObjHit=pTopMarkHit->GetMarkedSdrObj(); SdrObjList* pObjList=pTopObjHit->GetObjList(); SdrPageView* pPV=pTopMarkHit->GetPageView(); // find lowermost of the selected objects that is hit by rPnt // and is placed on the same PageView as pTopMarkHit - for (size_t nm=0; nm<nMarkCount && pBtmMarkHit==NULL; ++nm) { + for (size_t nm=0; nm<nMarkCount && pBtmMarkHit==nullptr; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrPageView* pPV2=pM->GetPageView(); - if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pPV2,SdrSearchOptions::NONE,0)) + if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pPV2,SdrSearchOptions::NONE,nullptr)) { pBtmMarkHit=pM; nBtmMarkHit=nm; } } - if (pBtmMarkHit==NULL) { pBtmMarkHit=pTopMarkHit; nBtmMarkHit=nTopMarkHit; } + if (pBtmMarkHit==nullptr) { pBtmMarkHit=pTopMarkHit; nBtmMarkHit=nTopMarkHit; } SdrObject* pBtmObjHit=pBtmMarkHit->GetMarkedSdrObj(); const size_t nObjCount = pObjList->GetObjCount(); size_t nSearchBeg = 0; - E3dScene* pScene = NULL; + E3dScene* pScene = nullptr; SdrObject* pObjHit = (bPrev) ? pBtmObjHit : pTopObjHit; bool bRemap = dynamic_cast< const E3dCompoundObject* >(pObjHit) != nullptr && static_cast<E3dCompoundObject*>(pObjHit)->IsAOrdNumRemapCandidate(pScene); @@ -1503,8 +1503,8 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) } size_t no=nSearchBeg; - SdrObject* pFndObj=NULL; - while (pFndObj==NULL && ((!bPrev && no>0) || (bPrev && no<nObjCount))) { + SdrObject* pFndObj=nullptr; + while (pFndObj==nullptr && ((!bPrev && no>0) || (bPrev && no<nObjCount))) { if (!bPrev) no--; SdrObject* pObj; @@ -1517,7 +1517,7 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) pObj = pObjList->GetObj(no); } - if (CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pObj,pPV,SdrSearchOptions::TESTMARKABLE,0)) + if (CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pObj,pPV,SdrSearchOptions::TESTMARKABLE,nullptr)) { if (TryToFindMarkedObject(pObj)==SAL_MAX_SIZE) { pFndObj=pObj; @@ -1527,14 +1527,14 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) } if (bPrev) no++; } - if (pFndObj!=NULL) + if (pFndObj!=nullptr) { GetMarkedObjectListWriteAccess().DeleteMark(bPrev?nBtmMarkHit:nTopMarkHit); GetMarkedObjectListWriteAccess().InsertEntry(SdrMark(pFndObj,pPV)); MarkListHasChanged(); AdjustMarkHdl(); } - return pFndObj!=NULL; + return pFndObj!=nullptr; } bool SdrMarkView::MarkObj(const Rectangle& rRect, bool bUnmark) @@ -1581,7 +1581,7 @@ bool SdrMarkView::MarkObj(const Rectangle& rRect, bool bUnmark) void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark, bool bImpNoSetMarkHdl) { - if (pObj!=NULL && pPV!=NULL && IsObjMarkable(pObj, pPV)) { + if (pObj!=nullptr && pPV!=nullptr && IsObjMarkable(pObj, pPV)) { BrkAction(); if (!bUnmark) { @@ -1625,14 +1625,14 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT { if(((nOptions & SdrSearchOptions::IMPISMASTER) && pObj->IsNotVisibleAsMaster()) || (!pObj->IsVisible())) { - return NULL; + return nullptr; } const bool bCheckIfMarkable(nOptions & SdrSearchOptions::TESTMARKABLE); const bool bDeep(nOptions & SdrSearchOptions::DEEP); const bool bOLE(dynamic_cast< const SdrOle2Obj* >(pObj) != nullptr); const bool bTXT(dynamic_cast<const SdrTextObj*>( pObj) != nullptr && static_cast<SdrTextObj*>(pObj)->IsTextFrame()); - SdrObject* pRet=NULL; + SdrObject* pRet=nullptr; Rectangle aRect(pObj->GetCurrentBoundRect()); // hack for calc grid sync aRect += pObj->GetGridOffset(); @@ -1656,7 +1656,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT { SdrObjList* pOL=pObj->GetSubList(); - if (pOL!=NULL && pOL->GetObjCount()!=0) + if (pOL!=nullptr && pOL->GetObjCount()!=0) { SdrObject* pTmpObj; // adjustment hit point for virtual objects @@ -1680,7 +1680,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT } } - if (!bDeep && pRet!=NULL) + if (!bDeep && pRet!=nullptr) { pRet=pObj; } @@ -1690,21 +1690,21 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const { - return (*this).CheckSingleSdrObjectHit(rPnt,nTol,pOL,pPV,nOptions,pMVisLay,rpRootObj,NULL); + return (*this).CheckSingleSdrObjectHit(rPnt,nTol,pOL,pPV,nOptions,pMVisLay,rpRootObj,nullptr); } SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const { - SdrObject* pRet=NULL; - rpRootObj=NULL; - if (pOL!=NULL) + SdrObject* pRet=nullptr; + rpRootObj=nullptr; + if (pOL!=nullptr) { bool bBack(nOptions & SdrSearchOptions::BACKWARD); bool bRemap(pOL->GetOwnerObj() && dynamic_cast< const E3dScene* >(pOL->GetOwnerObj()) != nullptr); - E3dScene* pRemapScene = (bRemap ? static_cast<E3dScene*>(pOL->GetOwnerObj()) : 0L); + E3dScene* pRemapScene = (bRemap ? static_cast<E3dScene*>(pOL->GetOwnerObj()) : nullptr); const size_t nObjCount=pOL->GetObjCount(); size_t nObjNum=bBack ? 0 : nObjCount; - while (pRet==NULL && (bBack ? nObjNum<nObjCount : nObjNum>0)) { + while (pRet==nullptr && (bBack ? nObjNum<nObjCount : nObjNum>0)) { if (!bBack) nObjNum--; SdrObject* pObj; @@ -1718,16 +1718,16 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT } if (nOptions & SdrSearchOptions::BEFOREMARK) { - if ((pMarkList)!=NULL) + if ((pMarkList)!=nullptr) { if ((*pMarkList).FindObject(pObj)!=SAL_MAX_SIZE) { - return NULL; + return nullptr; } } } pRet=CheckSingleSdrObjectHit(rPnt,nTol,pObj,pPV,nOptions,pMVisLay); - if (pRet!=NULL) rpRootObj=pObj; + if (pRet!=nullptr) rpRootObj=pObj; if (bBack) nObjNum++; } } @@ -1736,16 +1736,16 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions) const { - return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL); + return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,nullptr); } bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions, SdrObject** ppRootObj, bool* pbHitPassDirect) const { // TODO: lacks a Pass2,Pass3 SortMarkedObjects(); - if (ppRootObj!=NULL) *ppRootObj=NULL; - if (pbHitPassDirect!=NULL) *pbHitPassDirect=true; - rpObj=NULL; - rpPV=NULL; + if (ppRootObj!=nullptr) *ppRootObj=nullptr; + if (pbHitPassDirect!=nullptr) *pbHitPassDirect=true; + rpObj=nullptr; + rpPV=nullptr; bool bWholePage(nOptions & SdrSearchOptions::WHOLEPAGE); bool bMarked(nOptions & SdrSearchOptions::MARKED); bool bMasters=!bMarked && bool(nOptions & SdrSearchOptions::ALSOONMASTER); @@ -1755,11 +1755,11 @@ bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP bool bBoundCheckOn2ndPass(nOptions & SdrSearchOptions::PASS2BOUND); (void)bBoundCheckOn2ndPass;// n.i. bool bCheckNearestOn3rdPass(nOptions & SdrSearchOptions::PASS3NEAREST); (void)bCheckNearestOn3rdPass;// n.i. #endif - if (nTol<0) nTol=ImpGetHitTolLogic(nTol,NULL); + if (nTol<0) nTol=ImpGetHitTolLogic(nTol,nullptr); Point aPt(rPnt); - SdrObject* pObj=NULL; - SdrObject* pHitObj=NULL; - SdrPageView* pPV=NULL; + SdrObject* pObj=nullptr; + SdrObject* pHitObj=nullptr; + SdrPageView* pPV=nullptr; if (!bBack && static_cast<const SdrObjEditView*>(this)->IsTextEditFrameHit(rPnt)) { pObj=static_cast<const SdrObjEditView*>(this)->GetTextEditObject(); pHitObj=pObj; @@ -1768,12 +1768,12 @@ bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP if (bMarked) { const size_t nMrkAnz=GetMarkedObjectCount(); size_t nMrkNum=bBack ? 0 : nMrkAnz; - while (pHitObj==NULL && (bBack ? nMrkNum<nMrkAnz : nMrkNum>0)) { + while (pHitObj==nullptr && (bBack ? nMrkNum<nMrkAnz : nMrkNum>0)) { if (!bBack) nMrkNum--; SdrMark* pM=GetSdrMarkByIndex(nMrkNum); pObj=pM->GetMarkedSdrObj(); pPV=pM->GetPageView(); - pHitObj=CheckSingleSdrObjectHit(aPt,nTol,pObj,pPV,nOptions,NULL); + pHitObj=CheckSingleSdrObjectHit(aPt,nTol,pObj,pPV,nOptions,nullptr); if (bBack) nMrkNum++; } } @@ -1794,18 +1794,18 @@ bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList(); if (bExtraPassForWholePage) nPgAnz++; // First search in AktObjList, then on the entire page sal_uInt16 nPgNum=bBack ? 0 : nPgAnz; - while (pHitObj==NULL && (bBack ? nPgNum<nPgAnz : nPgNum>0)) { + while (pHitObj==nullptr && (bBack ? nPgNum<nPgAnz : nPgNum>0)) { SdrSearchOptions nTmpOptions=nOptions; if (!bBack) nPgNum--; - const SetOfByte* pMVisLay=NULL; - SdrObjList* pObjList=NULL; - if (pbHitPassDirect!=NULL) *pbHitPassDirect = true; + const SetOfByte* pMVisLay=nullptr; + SdrObjList* pObjList=nullptr; + if (pbHitPassDirect!=nullptr) *pbHitPassDirect = true; if (nPgNum>=nPgAnz-1 || (bExtraPassForWholePage && nPgNum>=nPgAnz-2)) { pObjList=pPV->GetObjList(); if (bExtraPassForWholePage && nPgNum==nPgAnz-2) { pObjList=pPage; - if (pbHitPassDirect!=NULL) *pbHitPassDirect = false; + if (pbHitPassDirect!=nullptr) *pbHitPassDirect = false; } } else @@ -1815,7 +1815,7 @@ bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP pMVisLay = &pPage->TRG_GetMasterPageVisibleLayers(); pObjList = &rMasterPage; - if (pbHitPassDirect!=NULL) *pbHitPassDirect = false; + if (pbHitPassDirect!=nullptr) *pbHitPassDirect = false; nTmpOptions=nTmpOptions | SdrSearchOptions::IMPISMASTER; } pHitObj=CheckSingleSdrObjectHit(aPt,nTol,pObjList,pPV,nTmpOptions,pMVisLay,pObj,&(GetMarkedObjectList())); @@ -1823,37 +1823,37 @@ bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP } } } - if (pHitObj!=NULL) { - if (ppRootObj!=NULL) *ppRootObj=pObj; + if (pHitObj!=nullptr) { + if (ppRootObj!=nullptr) *ppRootObj=pObj; if (nOptions & SdrSearchOptions::DEEP) pObj=pHitObj; if (nOptions & SdrSearchOptions::TESTTEXTEDIT) { if (!pObj->HasTextEdit() || pPV->GetLockedLayers().IsSet(pObj->GetLayer())) { - pObj=NULL; + pObj=nullptr; } } - if (pObj!=NULL && (nOptions & SdrSearchOptions::TESTMACRO)) { + if (pObj!=nullptr && (nOptions & SdrSearchOptions::TESTMACRO)) { SdrObjMacroHitRec aHitRec; aHitRec.aPos=aPt; aHitRec.aDownPos=aPt; aHitRec.nTol=nTol; aHitRec.pVisiLayer=&pPV->GetVisibleLayers(); aHitRec.pPageView=pPV; - if (!pObj->HasMacro() || !pObj->IsMacroHit(aHitRec)) pObj=NULL; + if (!pObj->HasMacro() || !pObj->IsMacroHit(aHitRec)) pObj=nullptr; } - if (pObj!=NULL && (nOptions & SdrSearchOptions::WITHTEXT) && pObj->GetOutlinerParaObject()==NULL) pObj=NULL; - if (pObj!=NULL && (nOptions & SdrSearchOptions::TESTTEXTAREA) && pPV) + if (pObj!=nullptr && (nOptions & SdrSearchOptions::WITHTEXT) && pObj->GetOutlinerParaObject()==nullptr) pObj=nullptr; + if (pObj!=nullptr && (nOptions & SdrSearchOptions::TESTTEXTAREA) && pPV) { - if(!SdrObjectPrimitiveHit(*pObj, aPt, 0, *pPV, 0, true)) + if(!SdrObjectPrimitiveHit(*pObj, aPt, 0, *pPV, nullptr, true)) { - pObj = 0; + pObj = nullptr; } } - if (pObj!=NULL) { + if (pObj!=nullptr) { rpObj=pObj; rpPV=pPV; } } - return rpObj!=NULL; + return rpObj!=nullptr; } bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions) const @@ -1861,8 +1861,8 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie SortMarkedObjects(); bool bBoundCheckOn2ndPass(nOptions & SdrSearchOptions::PASS2BOUND); bool bCheckNearestOn3rdPass(nOptions & SdrSearchOptions::PASS3NEAREST); - rpObj=NULL; - rpPV=NULL; + rpObj=nullptr; + rpPV=nullptr; Point aPt(rPnt); sal_uInt16 nTol=(sal_uInt16)mnHitTolLog; bool bFnd=false; @@ -1872,15 +1872,15 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrPageView* pPV=pM->GetPageView(); SdrObject* pObj=pM->GetMarkedSdrObj(); - bFnd = 0 != CheckSingleSdrObjectHit(aPt,nTol,pObj,pPV,SdrSearchOptions::TESTMARKABLE,0); + bFnd = nullptr != CheckSingleSdrObjectHit(aPt,nTol,pObj,pPV,SdrSearchOptions::TESTMARKABLE,nullptr); if (bFnd) { rpObj=pObj; rpPV=pPV; } } if ((bBoundCheckOn2ndPass || bCheckNearestOn3rdPass) && !bFnd) { - SdrObject* pBestObj=NULL; - SdrPageView* pBestPV=NULL; + SdrObject* pBestObj=nullptr; + SdrPageView* pBestPV=nullptr; sal_uIntPtr nBestDist=ULONG_MAX; for (size_t nMarkNum=nMarkCount; nMarkNum>0 && !bFnd;) { --nMarkNum; @@ -1911,7 +1911,7 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie if (bCheckNearestOn3rdPass && !bFnd) { rpObj=pBestObj; rpPV=pBestPV; - bFnd=pBestObj!=NULL; + bFnd=pBestObj!=nullptr; } } return bFnd; @@ -1922,7 +1922,7 @@ void SdrMarkView::UnmarkAllObj(SdrPageView* pPV) { if (GetMarkedObjectCount()!=0) { BrkAction(); - if (pPV!=NULL) + if (pPV!=nullptr) { GetMarkedObjectListWriteAccess().DeletePageView(*pPV); } @@ -1930,8 +1930,8 @@ void SdrMarkView::UnmarkAllObj(SdrPageView* pPV) { GetMarkedObjectListWriteAccess().Clear(); } - mpMarkedObj=NULL; - mpMarkedPV=NULL; + mpMarkedObj=nullptr; + mpMarkedPV=nullptr; MarkListHasChanged(); AdjustMarkHdl(); } diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 61b241c3c4f6..beb13620e84d 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -76,7 +76,7 @@ bool SdrMarkView::HasMarkedPoints() const for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedPoints(); - bRet=pPts!=NULL && !pPts->empty(); + bRet=pPts!=nullptr && !pPts->empty(); } } } @@ -93,7 +93,7 @@ sal_uIntPtr SdrMarkView::GetMarkedPointCount() const for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedPoints(); - if (pPts!=NULL) nCount+=pPts->size(); + if (pPts!=nullptr) nCount+=pPts->size(); } } } @@ -102,7 +102,7 @@ sal_uIntPtr SdrMarkView::GetMarkedPointCount() const bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const { - return !ImpIsFrameHandles() && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj(); + return !ImpIsFrameHandles() && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=nullptr && rHdl.GetObj()->IsPolyObj(); } bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) @@ -112,17 +112,17 @@ bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) { - if (pHdl==NULL || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE) + if (pHdl==nullptr || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE) return false; if (pHdl->IsSelected() != bUnmark) return false; SdrObject* pObj=pHdl->GetObj(); - if (pObj==NULL || !pObj->IsPolyObj()) + if (pObj==nullptr || !pObj->IsPolyObj()) return false; - if (pMark==NULL) + if (pMark==nullptr) { const size_t nMarkNum=TryToFindMarkedObject(pObj); if (nMarkNum==SAL_MAX_SIZE) @@ -157,7 +157,7 @@ bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) for (sal_uInt32 i=0; i<nCount; i++) { SdrHdl* pPlusHdl=pObj->GetPlusHdl(*pHdl,i); - if (pPlusHdl!=NULL) + if (pPlusHdl!=nullptr) { pPlusHdl->SetObj(pObj); pPlusHdl->SetPageView(pMark->GetPageView()); @@ -212,9 +212,9 @@ bool SdrMarkView::MarkPoints(const Rectangle* pRect, bool bUnmark) ForceUndirtyMrkPnt(); bool bChgd=false; SortMarkedObjects(); - const SdrObject* pObj0=NULL; - const SdrPageView* pPV0=NULL; - SdrMark* pM=NULL; + const SdrObject* pObj0=nullptr; + const SdrPageView* pPV0=nullptr; + SdrMark* pM=nullptr; maHdlList.Sort(); const size_t nHdlAnz=maHdlList.GetHdlCount(); for (size_t nHdlNum=nHdlAnz; nHdlNum>0;) { @@ -223,7 +223,7 @@ bool SdrMarkView::MarkPoints(const Rectangle* pRect, bool bUnmark) if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) { const SdrObject* pObj=pHdl->GetObj(); const SdrPageView* pPV=pHdl->GetPageView(); - if (pObj!=pObj0 || pPV!=pPV0 || pM==NULL) { // This section is for optimization, + if (pObj!=pObj0 || pPV!=pPV0 || pM==nullptr) { // This section is for optimization, const size_t nMarkNum=TryToFindMarkedObject(pObj); // so ImpMarkPoint() doesn't always if (nMarkNum!=SAL_MAX_SIZE) { // have to search the object in the MarkList. pM=GetSdrMarkByIndex(nMarkNum); @@ -236,11 +236,11 @@ bool SdrMarkView::MarkPoints(const Rectangle* pRect, bool bUnmark) OSL_FAIL("SdrMarkView::MarkPoints(const Rectangle* pRect): Selected object not found."); } #endif - pM=NULL; + pM=nullptr; } } Point aPos(pHdl->GetPos()); - if (pM!=NULL && (pRect==NULL || pRect->IsInside(aPos))) { + if (pM!=nullptr && (pRect==nullptr || pRect->IsInside(aPos))) { if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=true; } } @@ -319,7 +319,7 @@ void SdrMarkView::UndirtyMrkPnt() const const SdrObject* pObj=pM->GetMarkedSdrObj(); // PolyPoints SdrUShortCont* pPts=pM->GetMarkedPoints(); - if (pPts!=NULL) { + if (pPts!=nullptr) { if (pObj->IsPolyObj()) { // Remove invalid selected points, that is, all // entries above the number of points in the object. @@ -346,8 +346,8 @@ void SdrMarkView::UndirtyMrkPnt() const // GluePoints pPts=pM->GetMarkedGluePoints(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); - if (pPts!=NULL) { - if (pGPL!=NULL) { + if (pPts!=nullptr) { + if (pGPL!=nullptr) { // Remove invalid selected glue points, that is, all entries // (IDs) that aren't contained in the GluePointList of the // object @@ -362,7 +362,7 @@ void SdrMarkView::UndirtyMrkPnt() const ++it; } } else { - if (pPts!=NULL && !pPts->empty()) { + if (pPts!=nullptr && !pPts->empty()) { pPts->clear(); // object doesn't have any glue points (any more) bChg=true; } @@ -410,7 +410,7 @@ bool SdrMarkView::HasMarkedGluePoints() const for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - bRet=pPts!=NULL && !pPts->empty(); + bRet=pPts!=nullptr && !pPts->empty(); } return bRet; } @@ -427,13 +427,13 @@ bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark) const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - if (bUnmark && pRect==NULL) { // UnmarkAll - if (pPts!=NULL && !pPts->empty()) { + if (bUnmark && pRect==nullptr) { // UnmarkAll + if (pPts!=nullptr && !pPts->empty()) { pPts->clear(); bChgd=true; } } else { - if (pGPL!=NULL && (pPts!=NULL || !bUnmark)) { + if (pGPL!=nullptr && (pPts!=nullptr || !bUnmark)) { sal_uInt16 nGPAnz=pGPL->GetCount(); for (sal_uInt16 nGPNum=0; nGPNum<nGPAnz; nGPNum++) { const SdrGluePoint& rGP=(*pGPL)[nGPNum]; @@ -442,8 +442,8 @@ bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark) if(rGP.IsUserDefined()) { Point aPos(rGP.GetAbsolutePos(*pObj)); - if (pRect==NULL || pRect->IsInside(aPos)) { - if (pPts==NULL) + if (pRect==nullptr || pRect->IsInside(aPos)) { + if (pPts==nullptr) pPts=pM->ForceMarkedGluePoints(); bool bContains = pPts->find( rGP.GetId() ) != pPts->end(); if (!bUnmark && !bContains) { @@ -471,13 +471,13 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16 { SdrObject* pObj0=rpObj; sal_uInt16 nId0=rnId; - rpObj=NULL; rpPV=NULL; rnId=0; + rpObj=nullptr; rpPV=nullptr; rnId=0; if (!IsGluePointEditMode()) return false; bool bBack(nOptions & SdrSearchOptions::BACKWARD); bool bNext(nOptions & SdrSearchOptions::NEXT); OutputDevice* pOut=mpActualOutDev.get(); - if (pOut==NULL) pOut=GetFirstOutputDevice(); - if (pOut==NULL) return false; + if (pOut==nullptr) pOut=GetFirstOutputDevice(); + if (pOut==nullptr) return false; SortMarkedObjects(); const size_t nMarkCount=GetMarkedObjectCount(); size_t nMarkNum=bBack ? 0 : nMarkCount; @@ -492,7 +492,7 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16 SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); - if (pGPL!=NULL) { + if (pGPL!=nullptr) { sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0); if (nNum!=SDRGLUEPOINT_NOTFOUND) { @@ -519,12 +519,12 @@ bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const Sdr if (!IsGluePointEditMode()) return false; ForceUndirtyMrkPnt(); bool bChgd=false; - if (pObj!=NULL) { + if (pObj!=nullptr) { const size_t nMarkPos=TryToFindMarkedObject(pObj); if (nMarkPos!=SAL_MAX_SIZE) { SdrMark* pM=GetSdrMarkByIndex(nMarkPos); SdrUShortCont* pPts=bUnmark ? pM->GetMarkedGluePoints() : pM->ForceMarkedGluePoints(); - if (pPts!=NULL) { + if (pPts!=nullptr) { bool bContains = pPts->find( nId ) != pPts->end(); if (!bUnmark && !bContains) { bChgd=true; @@ -554,7 +554,7 @@ bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const if (nPos!=SAL_MAX_SIZE) { const SdrMark* pM=GetSdrMarkByIndex(nPos); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - if (pPts!=NULL) { + if (pPts!=nullptr) { bRet = pPts->find( nId ) != pPts->end(); } } @@ -571,7 +571,7 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) cons pHdl->GetKind()==HDL_GLUE && pHdl->GetObjHdlNum()==nId ) return pHdl; } - return NULL; + return nullptr; } bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, bool /*bPrev*/) diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 6f217513cf93..04acaef39c32 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -205,7 +205,7 @@ static bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape ) // and translation executed, too. SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemSet& rOriginalSet) { - SdrObject* pRetval = 0L; + SdrObject* pRetval = nullptr; const bool bShadow(static_cast<const SdrOnOffItem&>(rOriginalSet.Get(SDRATTR_SHADOW)).GetValue()); if(bShadow) @@ -443,7 +443,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectFromCustomShape() const } SdrObject* pRenderedCustomShape = mXRenderedCustomShape.is() ? GetSdrObjectFromXShape( mXRenderedCustomShape ) - : NULL; + : nullptr; return pRenderedCustomShape; } @@ -837,7 +837,7 @@ TYPEINIT1(SdrObjCustomShape,SdrTextObj); SdrObjCustomShape::SdrObjCustomShape() : SdrTextObj(), fObjectRotation( 0.0 ), - mpLastShadowGeometry(0L) + mpLastShadowGeometry(nullptr) { bClosedObj = true; // custom shapes may be filled bTextFrame = true; @@ -875,7 +875,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) } MSO_SPT eSpType = EnhancedCustomShapeTypeNames::Get( sShapeType ); - const sal_Int32* pDefData = NULL; + const sal_Int32* pDefData = nullptr; const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType ); if ( pDefCustomShape ) pDefData = pDefCustomShape->pDefData; @@ -1144,7 +1144,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons bIsDefaultGeometry = true; } } - else if ( pDefCustomShape && ( ( pDefCustomShape->nVertices == 0 ) || ( pDefCustomShape->pVertices == 0 ) ) ) + else if ( pDefCustomShape && ( ( pDefCustomShape->nVertices == 0 ) || ( pDefCustomShape->pVertices == nullptr ) ) ) bIsDefaultGeometry = true; } break; @@ -1214,7 +1214,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons } } } - else if ( pDefCustomShape && ( ( pDefCustomShape->nElements == 0 ) || ( pDefCustomShape->pElements == 0 ) ) ) + else if ( pDefCustomShape && ( ( pDefCustomShape->nElements == 0 ) || ( pDefCustomShape->pElements == nullptr ) ) ) bIsDefaultGeometry = true; } break; @@ -1275,7 +1275,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons bIsDefaultGeometry = true; } } - else if ( pDefCustomShape && ( ( pDefCustomShape->nCalculation == 0 ) || ( pDefCustomShape->pCalculation == 0 ) ) ) + else if ( pDefCustomShape && ( ( pDefCustomShape->nCalculation == 0 ) || ( pDefCustomShape->pCalculation == nullptr ) ) ) bIsDefaultGeometry = true; } break; @@ -1303,7 +1303,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons bIsDefaultGeometry = true; } } - else if ( pDefCustomShape && ( ( pDefCustomShape->nTextRect == 0 ) || ( pDefCustomShape->pTextRect == 0 ) ) ) + else if ( pDefCustomShape && ( ( pDefCustomShape->nTextRect == 0 ) || ( pDefCustomShape->pTextRect == nullptr ) ) ) bIsDefaultGeometry = true; } break; @@ -1332,7 +1332,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons bIsDefaultGeometry = true; } } - else if ( pDefCustomShape && ( ( pDefCustomShape->nHandles == 0 ) || ( pDefCustomShape->pHandles == 0 ) ) ) + else if ( pDefCustomShape && ( ( pDefCustomShape->nHandles == 0 ) || ( pDefCustomShape->pHandles == nullptr ) ) ) bIsDefaultGeometry = true; } break; @@ -1875,7 +1875,7 @@ SdrGluePointList* SdrObjCustomShape::ForceGluePointList() } else { - return 0L; + return nullptr; } } @@ -1890,7 +1890,7 @@ sal_uInt32 SdrObjCustomShape::GetHdlCount() const SdrHdl* SdrObjCustomShape::GetHdl( sal_uInt32 nHdlNum ) const { - SdrHdl* pH = NULL; + SdrHdl* pH = nullptr; const sal_uInt32 nBasicHdlCount(SdrTextObj::GetHdlCount()); if ( nHdlNum < nBasicHdlCount ) @@ -1939,7 +1939,7 @@ bool SdrObjCustomShape::beginSpecialDrag(SdrDragStat& rDrag) const else { const SdrHdl* pHdl2 = rDrag.GetHdl(); - const SdrHdlKind eHdl((pHdl2 == NULL) ? HDL_MOVE : pHdl2->GetKind()); + const SdrHdlKind eHdl((pHdl2 == nullptr) ? HDL_MOVE : pHdl2->GetKind()); switch( eHdl ) { @@ -2105,7 +2105,7 @@ void SdrObjCustomShape::DragMoveCustomShapeHdl( const Point& rDestination, bool SdrObjCustomShape::applySpecialDrag(SdrDragStat& rDrag) { const SdrHdl* pHdl = rDrag.GetHdl(); - const SdrHdlKind eHdl((pHdl == NULL) ? HDL_MOVE : pHdl->GetKind()); + const SdrHdlKind eHdl((pHdl == nullptr) ? HDL_MOVE : pHdl->GetKind()); switch(eHdl) { @@ -2374,7 +2374,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, rOutliner.SetUpdateMode(true); // TODO: add the optimization with bPortionInfoChecked again. OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); - if( pOutlinerParaObject != NULL ) + if( pOutlinerParaObject != nullptr ) { rOutliner.SetText(*pOutlinerParaObject); rOutliner.SetFixedCellHeight(static_cast<const SdrTextFixedCellHeightItem&>(GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); @@ -2579,7 +2579,7 @@ void SdrObjCustomShape::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Recta Size aAnkSiz(aViewInit.GetSize()); aAnkSiz.Width()--; aAnkSiz.Height()--; // because GetSize() adds 1 Size aMaxSiz(1000000,1000000); - if (pModel!=NULL) { + if (pModel!=nullptr) { Size aTmpSiz(pModel->GetMaxObjSize()); if (aTmpSiz.Width()!=0) aMaxSiz.Width()=aTmpSiz.Width(); if (aTmpSiz.Height()!=0) aMaxSiz.Height()=aTmpSiz.Height(); @@ -2648,9 +2648,9 @@ void SdrObjCustomShape::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Recta if(SDRTEXTVERTADJUST_BLOCK != eVAdj ) aPaperMin.Height() = 0; - if (pPaperMin!=NULL) *pPaperMin=aPaperMin; - if (pPaperMax!=NULL) *pPaperMax=aPaperMax; - if (pViewInit!=NULL) *pViewInit=aViewInit; + if (pPaperMin!=nullptr) *pPaperMin=aPaperMin; + if (pPaperMax!=nullptr) *pPaperMax=aPaperMax; + if (pViewInit!=nullptr) *pViewInit=aViewInit; } void SdrObjCustomShape::EndTextEdit( SdrOutliner& rOutl ) { @@ -2743,7 +2743,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe } else { - rOutliner.SetTextObj( NULL ); + rOutliner.SetTextObj( nullptr ); } if (pEdtOutl && !bNoEditText && pPara) delete pPara; @@ -2871,8 +2871,8 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const SdrObject* SdrObjCustomShape::DoConvertToPolyObj(bool bBezier, bool bAddText) const { // #i37011# - SdrObject* pRetval = 0L; - SdrObject* pRenderedCustomShape = 0L; + SdrObject* pRetval = nullptr; + SdrObject* pRenderedCustomShape = nullptr; if ( !mXRenderedCustomShape.is() ) { @@ -3223,9 +3223,9 @@ bool SdrObjCustomShape::doConstructOrthogonal(const OUString& rName) // #i37011# centralize throw-away of render geometry void SdrObjCustomShape::InvalidateRenderGeometry() { - mXRenderedCustomShape = 0L; + mXRenderedCustomShape = nullptr; SdrObject::Free( mpLastShadowGeometry ); - mpLastShadowGeometry = 0L; + mpLastShadowGeometry = nullptr; } void SdrObjCustomShape::impl_setUnoShape(const uno::Reference<uno::XInterface>& rxUnoShape) @@ -3234,7 +3234,7 @@ void SdrObjCustomShape::impl_setUnoShape(const uno::Reference<uno::XInterface>& // The shape engine is created with _current_ shape. This means we // _must_ reset it when the shape changes. - mxCustomShapeEngine.set(0); + mxCustomShapeEngine.set(nullptr); } OUString SdrObjCustomShape::GetCustomShapeName() diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index c2ed3bad1ae0..d02a1b53a20f 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -154,9 +154,9 @@ void SdrObjUserCall::Changed(const SdrObject& /*rObj*/, SdrUserCallType /*eType* } SdrObjMacroHitRec::SdrObjMacroHitRec() : - pOut(NULL), - pVisiLayer(NULL), - pPageView(NULL), + pOut(nullptr), + pVisiLayer(nullptr), + pPageView(nullptr), nTol(0), bDown(false) {} @@ -175,7 +175,7 @@ SdrObjUserData::SdrObjUserData(const SdrObjUserData& rData) : SdrObjUserData::~SdrObjUserData() {} SdrObjGeoData::SdrObjGeoData(): - pGPL(NULL), + pGPL(nullptr), bMovProt(false), bSizProt(false), bNoPrint(false), @@ -302,18 +302,18 @@ TYPEINIT1(SdrObject,SfxListener); SdrObject::SdrObject() : mpImpl(new Impl), - mpProperties(0L) - ,mpViewContact(0L) - ,pObjList(NULL) - ,pPage(NULL) - ,pModel(NULL) - ,pUserCall(NULL) - ,pPlusData(NULL) + mpProperties(nullptr) + ,mpViewContact(nullptr) + ,pObjList(nullptr) + ,pPage(nullptr) + ,pModel(nullptr) + ,pUserCall(nullptr) + ,pPlusData(nullptr) ,nOrdNum(0) - ,pGrabBagItem(NULL) + ,pGrabBagItem(nullptr) ,mnNavigationPosition(SAL_MAX_UINT32) ,mnLayerID(0) - ,mpSvxShape( NULL ) + ,mpSvxShape( nullptr ) ,maWeakUnoShape() ,mbDoNotInsertIntoPageAutomatically(false) { @@ -382,13 +382,13 @@ SdrObject::~SdrObject() if(mpProperties) { delete mpProperties; - mpProperties = 0L; + mpProperties = nullptr; } if(mpViewContact) { delete mpViewContact; - mpViewContact = 0L; + mpViewContact = nullptr; } delete mpImpl; @@ -396,8 +396,8 @@ SdrObject::~SdrObject() void SdrObject::Free( SdrObject*& _rpObject ) { - SdrObject* pObject = _rpObject; _rpObject = NULL; - if ( pObject == NULL ) + SdrObject* pObject = _rpObject; _rpObject = nullptr; + if ( pObject == nullptr ) // nothing to do return; @@ -420,7 +420,7 @@ void SdrObject::SetRectsDirty(bool bNotMyself) SetBoundRectDirty(); bSnapRectDirty=true; } - if (pObjList!=NULL) { + if (pObjList!=nullptr) { pObjList->SetRectsDirty(); } } @@ -431,7 +431,7 @@ void SdrObject::SetModel(SdrModel* pNewModel) { if(pPage->GetModel() != pNewModel) { - pPage = NULL; + pPage = nullptr; } } @@ -459,9 +459,9 @@ void SdrObject::SetPage(SdrPage* pNewPage) SdrPage* pOldPage = pPage; pPage=pNewPage; - if (pPage!=NULL) { + if (pPage!=nullptr) { SdrModel* pMod=pPage->GetModel(); - if (pMod!=pModel && pMod!=NULL) { + if (pMod!=pModel && pMod!=nullptr) { SetModel(pMod); }} @@ -475,13 +475,13 @@ void SdrObject::SetPage(SdrPage* pNewPage) { SvxShape* const pShape(getSvxShape()); if (pShape && !pShape->HasSdrObjectOwnership()) - setUnoShape(NULL); + setUnoShape(nullptr); } } // init global static itempool -SdrItemPool* SdrObject::mpGlobalItemPool = NULL; +SdrItemPool* SdrObject::mpGlobalItemPool = nullptr; SdrItemPool& SdrObject::GetGlobalDrawObjectItemPool() { @@ -520,7 +520,7 @@ void SdrObject::SetRelativeHeightRelation( sal_Int16 eValue ) const double* SdrObject::GetRelativeWidth( ) const { if (!mpImpl->mnRelativeWidth) - return NULL; + return nullptr; return &mpImpl->mnRelativeWidth.get(); } @@ -533,7 +533,7 @@ sal_Int16 SdrObject::GetRelativeWidthRelation() const const double* SdrObject::GetRelativeHeight( ) const { if (!mpImpl->mnRelativeHeight) - return NULL; + return nullptr; return &mpImpl->mnRelativeHeight.get(); } @@ -586,7 +586,7 @@ void SdrObject::getMergedHierarchyLayerSet(SetOfByte& rSet) const { rSet.Set(GetLayer()); SdrObjList* pOL=GetSubList(); - if (pOL!=NULL) { + if (pOL!=nullptr) { const size_t nObjCount = pOL->GetObjCount(); for (size_t nObjNum = 0; nObjNum<nObjCount; ++nObjNum) { pOL->GetObj(nObjNum)->getMergedHierarchyLayerSet(rSet); @@ -609,24 +609,24 @@ void SdrObject::SetLayer(SdrLayerID nLayer) void SdrObject::AddListener(SfxListener& rListener) { ImpForcePlusData(); - if (pPlusData->pBroadcast==NULL) pPlusData->pBroadcast=new SfxBroadcaster; + if (pPlusData->pBroadcast==nullptr) pPlusData->pBroadcast=new SfxBroadcaster; rListener.StartListening(*pPlusData->pBroadcast); } void SdrObject::RemoveListener(SfxListener& rListener) { - if (pPlusData!=NULL && pPlusData->pBroadcast!=NULL) { + if (pPlusData!=nullptr && pPlusData->pBroadcast!=nullptr) { rListener.EndListening(*pPlusData->pBroadcast); if (!pPlusData->pBroadcast->HasListeners()) { delete pPlusData->pBroadcast; - pPlusData->pBroadcast=NULL; + pPlusData->pBroadcast=nullptr; } } } const SfxBroadcaster* SdrObject::GetBroadcaster() const { - return pPlusData!=NULL ? pPlusData->pBroadcast : NULL; + return pPlusData!=nullptr ? pPlusData->pBroadcast : nullptr; } void SdrObject::AddReference(SdrVirtObj& rVrtObj) @@ -641,17 +641,17 @@ void SdrObject::DelReference(SdrVirtObj& rVrtObj) bool SdrObject::IsGroupObject() const { - return GetSubList()!=NULL; + return GetSubList()!=nullptr; } SdrObjList* SdrObject::GetSubList() const { - return NULL; + return nullptr; } SdrObject* SdrObject::GetUpGroup() const { - return pObjList!=NULL ? pObjList->GetOwnerObj() : NULL; + return pObjList!=nullptr ? pObjList->GetOwnerObj() : nullptr; } void SdrObject::SetName(const OUString& rStr) @@ -788,7 +788,7 @@ OUString SdrObject::GetDescription() const sal_uInt32 SdrObject::GetOrdNum() const { - if (pObjList!=NULL) { + if (pObjList!=nullptr) { if (pObjList->IsObjOrdNumsDirty()) { pObjList->RecalcObjOrdNums(); } @@ -804,7 +804,7 @@ void SdrObject::SetOrdNum(sal_uInt32 nNum) void SdrObject::GetGrabBagItem(css::uno::Any& rVal) const { - if (pGrabBagItem != NULL) + if (pGrabBagItem != nullptr) pGrabBagItem->QueryValue(rVal); else { uno::Sequence<beans::PropertyValue> aValue(0); @@ -814,7 +814,7 @@ void SdrObject::GetGrabBagItem(css::uno::Any& rVal) const void SdrObject::SetGrabBagItem(const css::uno::Any& rVal) { - if (pGrabBagItem == NULL) + if (pGrabBagItem == nullptr) pGrabBagItem = new SfxGrabBagItem; pGrabBagItem->PutValue(rVal, 0); @@ -825,7 +825,7 @@ void SdrObject::SetGrabBagItem(const css::uno::Any& rVal) sal_uInt32 SdrObject::GetNavigationPosition() { - if (pObjList!=NULL && pObjList->RecalcNavigationPositions()) + if (pObjList!=nullptr && pObjList->RecalcNavigationPositions()) { return mnNavigationPosition; } @@ -972,13 +972,13 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj) if(mpProperties) { delete mpProperties; - mpProperties = 0L; + mpProperties = nullptr; } if(mpViewContact) { delete mpViewContact; - mpViewContact = 0L; + mpViewContact = nullptr; } // The Clone() method uses the local copy constructor from the individual @@ -1002,18 +1002,18 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj) bSnapRectDirty=true; bNotMasterCachable=rObj.bNotMasterCachable; delete pPlusData; - pPlusData=NULL; - if (rObj.pPlusData!=NULL) { + pPlusData=nullptr; + if (rObj.pPlusData!=nullptr) { pPlusData=rObj.pPlusData->Clone(this); } - if (pPlusData!=NULL && pPlusData->pBroadcast!=NULL) { + if (pPlusData!=nullptr && pPlusData->pBroadcast!=nullptr) { delete pPlusData->pBroadcast; // broadcaster isn't copied - pPlusData->pBroadcast=NULL; + pPlusData->pBroadcast=nullptr; } delete pGrabBagItem; - pGrabBagItem=NULL; - if (rObj.pGrabBagItem!=NULL) + pGrabBagItem=nullptr; + if (rObj.pGrabBagItem!=nullptr) pGrabBagItem=static_cast< SfxGrabBagItem* >( rObj.pGrabBagItem->Clone() ); aGridOffset = rObj.aGridOffset; @@ -1067,7 +1067,7 @@ void SdrObject::ImpForcePlusData() OUString SdrObject::GetAngleStr(long nAngle, bool bNoDegChar) const { OUString aStr; - if (pModel!=NULL) { + if (pModel!=nullptr) { SdrModel::TakeAngleStr(nAngle,aStr,bNoDegChar); } return aStr; @@ -1076,7 +1076,7 @@ OUString SdrObject::GetAngleStr(long nAngle, bool bNoDegChar) const OUString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, bool bNoUnitChars) const { OUString aStr; - if (pModel!=NULL) { + if (pModel!=nullptr) { pModel->TakeMetricStr(nVal,aStr,bNoUnitChars); } return aStr; @@ -1108,7 +1108,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const { // no text and no text animation pClone->SetMergedItem(SdrTextAniKindItem(SDRTEXTANI_NONE)); - pClone->SetOutlinerParaObject(0); + pClone->SetOutlinerParaObject(nullptr); } const SdrEdgeObj* pEdgeObj = dynamic_cast< const SdrEdgeObj* >(this); @@ -1186,7 +1186,7 @@ sal_uInt32 SdrObject::GetHdlCount() const SdrHdl* SdrObject::GetHdl(sal_uInt32 nHdlNum) const { - SdrHdl* pH=NULL; + SdrHdl* pH=nullptr; const Rectangle& rR=GetSnapRect(); switch (nHdlNum) { case 0: pH=new SdrHdl(rR.TopLeft(), HDL_UPLFT); break; @@ -1208,7 +1208,7 @@ sal_uInt32 SdrObject::GetPlusHdlCount(const SdrHdl& /*rHdl*/) const SdrHdl* SdrObject::GetPlusHdl(const SdrHdl& /*rHdl*/, sal_uInt32 /*nPlNum*/) const { - return 0L; + return nullptr; } void SdrObject::AddToHdlList(SdrHdlList& rHdlList) const @@ -1216,7 +1216,7 @@ void SdrObject::AddToHdlList(SdrHdlList& rHdlList) const sal_uInt32 nCount=GetHdlCount(); for (sal_uInt32 i=0L; i<nCount; i++) { SdrHdl* pHdl=GetHdl(i); - if (pHdl!=NULL) { + if (pHdl!=nullptr) { rHdlList.AddHdl(pHdl); } } @@ -1233,9 +1233,9 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const Rectangle aTmpRect(GetSnapRect()); Rectangle aRect(aTmpRect); const SdrHdl* pHdl=rDrag.GetHdl(); - SdrHdlKind eHdl=pHdl==NULL ? HDL_MOVE : pHdl->GetKind(); + SdrHdlKind eHdl=pHdl==nullptr ? HDL_MOVE : pHdl->GetKind(); bool bEcke=(eHdl==HDL_UPLFT || eHdl==HDL_UPRGT || eHdl==HDL_LWLFT || eHdl==HDL_LWRGT); - bool bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); + bool bOrtho=rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho(); bool bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho(); Point aPos(rDrag.GetNow()); bool bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT || eHdl==HDL_LWLFT); @@ -1319,7 +1319,7 @@ bool SdrObject::beginSpecialDrag(SdrDragStat& rDrag) const { const SdrHdl* pHdl = rDrag.GetHdl(); - SdrHdlKind eHdl = (pHdl == NULL) ? HDL_MOVE : pHdl->GetKind(); + SdrHdlKind eHdl = (pHdl == nullptr) ? HDL_MOVE : pHdl->GetKind(); if(eHdl==HDL_UPLFT || eHdl==HDL_UPPER || eHdl==HDL_UPRGT || eHdl==HDL_LEFT || eHdl==HDL_RIGHT || eHdl==HDL_LWLFT || @@ -1506,7 +1506,7 @@ void SdrObject::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear void SdrObject::Move(const Size& rSiz) { if (rSiz.Width()!=0 || rSiz.Height()!=0) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcMove(rSiz); SetChanged(); BroadcastObjectChange(); @@ -1528,7 +1528,7 @@ void SdrObject::Resize(const Point& rRef, const Fraction& xFact, const Fraction& mpImpl->meRelativeHeightRelation = text::RelOrientation::PAGE_FRAME; mpImpl->mnRelativeHeight.reset(); } - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcResize(rRef,xFact,yFact); SetChanged(); BroadcastObjectChange(); @@ -1538,7 +1538,7 @@ void SdrObject::Resize(const Point& rRef, const Fraction& xFact, const Fraction& void SdrObject::Crop(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcCrop(rRef, xFact, yFact); SetChanged(); BroadcastObjectChange(); @@ -1548,7 +1548,7 @@ void SdrObject::Crop(const Point& rRef, const Fraction& xFact, const Fraction& y void SdrObject::Rotate(const Point& rRef, long nAngle, double sn, double cs) { if (nAngle!=0) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcRotate(rRef,nAngle,sn,cs); SetChanged(); BroadcastObjectChange(); @@ -1558,7 +1558,7 @@ void SdrObject::Rotate(const Point& rRef, long nAngle, double sn, double cs) void SdrObject::Mirror(const Point& rRef1, const Point& rRef2) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcMirror(rRef1,rRef2); SetChanged(); BroadcastObjectChange(); @@ -1568,7 +1568,7 @@ void SdrObject::Mirror(const Point& rRef1, const Point& rRef2) void SdrObject::Shear(const Point& rRef, long nAngle, double tn, bool bVShear) { if (nAngle!=0) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcShear(rRef,nAngle,tn,bVShear); SetChanged(); BroadcastObjectChange(); @@ -1586,7 +1586,7 @@ void SdrObject::NbcSetRelativePos(const Point& rPnt) void SdrObject::SetRelativePos(const Point& rPnt) { if (rPnt!=GetRelativePos()) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcSetRelativePos(rPnt); SetChanged(); BroadcastObjectChange(); @@ -1614,7 +1614,7 @@ void SdrObject::NbcSetAnchorPos(const Point& rPnt) void SdrObject::SetAnchorPos(const Point& rPnt) { if (rPnt!=aAnchor) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcSetAnchorPos(rPnt); SetChanged(); BroadcastObjectChange(); @@ -1658,7 +1658,7 @@ void SdrObject::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly void SdrObject::SetSnapRect(const Rectangle& rRect) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcSetSnapRect(rRect); SetChanged(); BroadcastObjectChange(); @@ -1667,7 +1667,7 @@ void SdrObject::SetSnapRect(const Rectangle& rRect) void SdrObject::SetLogicRect(const Rectangle& rRect) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcSetLogicRect(rRect); SetChanged(); BroadcastObjectChange(); @@ -1711,7 +1711,7 @@ Point SdrObject::GetPoint(sal_uInt32 /*i*/) const void SdrObject::SetPoint(const Point& rPnt, sal_uInt32 i) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcSetPoint(rPnt, i); SetChanged(); BroadcastObjectChange(); @@ -1792,7 +1792,7 @@ void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/) void SdrObject::SetOutlinerParaObject(OutlinerParaObject* pTextObject) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcSetOutlinerParaObject(pTextObject); SetChanged(); BroadcastObjectChange(); @@ -1807,7 +1807,7 @@ void SdrObject::NbcSetOutlinerParaObject(OutlinerParaObject* /*pTextObject*/) OutlinerParaObject* SdrObject::GetOutlinerParaObject() const { - return NULL; + return nullptr; } void SdrObject::NbcReformatText() @@ -1816,7 +1816,7 @@ void SdrObject::NbcReformatText() void SdrObject::ReformatText() { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcReformatText(); SetChanged(); BroadcastObjectChange(); @@ -1842,7 +1842,7 @@ SdrObject* SdrObject::CheckMacroHit(const SdrObjMacroHitRec& rRec) const return SdrObjectPrimitiveHit(*this, rRec.aPos, rRec.nTol, *rRec.pPageView, rRec.pVisiLayer, false); } - return 0; + return nullptr; } Pointer SdrObject::GetMacroPointer(const SdrObjMacroHitRec&) const @@ -1880,7 +1880,7 @@ OUString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec&) const bool SdrObject::IsMacroHit(const SdrObjMacroHitRec& rRec) const { - return CheckMacroHit(rRec) != NULL; + return CheckMacroHit(rRec) != nullptr; } @@ -1902,16 +1902,16 @@ void SdrObject::SaveGeoData(SdrObjGeoData& rGeo) const rGeo.mnLayerID = mnLayerID; // user-defined glue points - if (pPlusData!=NULL && pPlusData->pGluePoints!=NULL) { - if (rGeo.pGPL!=NULL) { + if (pPlusData!=nullptr && pPlusData->pGluePoints!=nullptr) { + if (rGeo.pGPL!=nullptr) { *rGeo.pGPL=*pPlusData->pGluePoints; } else { rGeo.pGPL=new SdrGluePointList(*pPlusData->pGluePoints); } } else { - if (rGeo.pGPL!=NULL) { + if (rGeo.pGPL!=nullptr) { delete rGeo.pGPL; - rGeo.pGPL=NULL; + rGeo.pGPL=nullptr; } } } @@ -1929,17 +1929,17 @@ void SdrObject::RestGeoData(const SdrObjGeoData& rGeo) mnLayerID = rGeo.mnLayerID; // user-defined glue points - if (rGeo.pGPL!=NULL) { + if (rGeo.pGPL!=nullptr) { ImpForcePlusData(); - if (pPlusData->pGluePoints!=NULL) { + if (pPlusData->pGluePoints!=nullptr) { *pPlusData->pGluePoints=*rGeo.pGPL; } else { pPlusData->pGluePoints=new SdrGluePointList(*rGeo.pGPL); } } else { - if (pPlusData!=NULL && pPlusData->pGluePoints!=NULL) { + if (pPlusData!=nullptr && pPlusData->pGluePoints!=nullptr) { delete pPlusData->pGluePoints; - pPlusData->pGluePoints=NULL; + pPlusData->pGluePoints=nullptr; } } } @@ -1953,7 +1953,7 @@ SdrObjGeoData* SdrObject::GetGeoData() const void SdrObject::SetGeoData(const SdrObjGeoData& rGeo) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); RestGeoData(rGeo); SetChanged(); BroadcastObjectChange(); @@ -2020,7 +2020,7 @@ void SdrObject::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClear void SdrObject::ApplyNotPersistAttr(const SfxItemSet& rAttr) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcApplyNotPersistAttr(rAttr); SetChanged(); BroadcastObjectChange(); @@ -2033,7 +2033,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) const Rectangle& rLogic=GetLogicRect(); Point aRef1(rSnap.Center()); Point aRef2(aRef1); aRef2.Y()++; - const SfxPoolItem *pPoolItem=NULL; + const SfxPoolItem *pPoolItem=nullptr; if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,true,&pPoolItem)==SfxItemState::SET) { aRef1.X()=static_cast<const SdrTransformRef1XItem*>(pPoolItem)->GetValue(); } @@ -2141,12 +2141,12 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) if (rAttr.GetItemState(SDRATTR_LAYERID,true,&pPoolItem)==SfxItemState::SET) { nLayer=static_cast<const SdrLayerIdItem*>(pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_LAYERNAME,true,&pPoolItem)==SfxItemState::SET && pModel!=NULL) { + if (rAttr.GetItemState(SDRATTR_LAYERNAME,true,&pPoolItem)==SfxItemState::SET && pModel!=nullptr) { OUString aLayerName=static_cast<const SdrLayerNameItem*>(pPoolItem)->GetValue(); - const SdrLayerAdmin* pLayAd=pPage!=NULL ? &pPage->GetLayerAdmin() : pModel!=NULL ? &pModel->GetLayerAdmin() : NULL; - if (pLayAd!=NULL) { + const SdrLayerAdmin* pLayAd=pPage!=nullptr ? &pPage->GetLayerAdmin() : pModel!=nullptr ? &pModel->GetLayerAdmin() : nullptr; + if (pLayAd!=nullptr) { const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, true); - if (pLayer!=NULL) { + if (pLayer!=nullptr) { nLayer=pLayer->GetID(); } } @@ -2219,10 +2219,10 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const } lcl_SetItem(rAttr,bMerge,SdrLayerIdItem(GetLayer())); - const SdrLayerAdmin* pLayAd=pPage!=NULL ? &pPage->GetLayerAdmin() : pModel!=NULL ? &pModel->GetLayerAdmin() : NULL; - if (pLayAd!=NULL) { + const SdrLayerAdmin* pLayAd=pPage!=nullptr ? &pPage->GetLayerAdmin() : pModel!=nullptr ? &pModel->GetLayerAdmin() : nullptr; + if (pLayAd!=nullptr) { const SdrLayer* pLayer=pLayAd->GetLayerPerID(GetLayer()); - if (pLayer!=NULL) { + if (pLayer!=nullptr) { lcl_SetItem(rAttr,bMerge,SdrLayerNameItem(pLayer->GetName())); } } @@ -2308,15 +2308,15 @@ SdrGluePoint SdrObject::GetCornerGluePoint(sal_uInt16 nPosNum) const const SdrGluePointList* SdrObject::GetGluePointList() const { - if (pPlusData!=NULL) return pPlusData->pGluePoints; - return NULL; + if (pPlusData!=nullptr) return pPlusData->pGluePoints; + return nullptr; } SdrGluePointList* SdrObject::ForceGluePointList() { ImpForcePlusData(); - if (pPlusData->pGluePoints==NULL) { + if (pPlusData->pGluePoints==nullptr) { pPlusData->pGluePoints=new SdrGluePointList; } return pPlusData->pGluePoints; @@ -2326,7 +2326,7 @@ void SdrObject::SetGlueReallyAbsolute(bool bOn) { // First a const call to see whether there are any glue points. // Force const call! - if (GetGluePointList()!=NULL) { + if (GetGluePointList()!=nullptr) { SdrGluePointList* pGPL=ForceGluePointList(); pGPL->SetReallyAbsolute(bOn,*this); } @@ -2336,7 +2336,7 @@ void SdrObject::NbcRotateGluePoints(const Point& rRef, long nAngle, double sn, d { // First a const call to see whether there are any glue points. // Force const call! - if (GetGluePointList()!=NULL) { + if (GetGluePointList()!=nullptr) { SdrGluePointList* pGPL=ForceGluePointList(); pGPL->Rotate(rRef,nAngle,sn,cs,this); } @@ -2346,7 +2346,7 @@ void SdrObject::NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2) { // First a const call to see whether there are any glue points. // Force const call! - if (GetGluePointList()!=NULL) { + if (GetGluePointList()!=nullptr) { SdrGluePointList* pGPL=ForceGluePointList(); pGPL->Mirror(rRef1,rRef2,this); } @@ -2356,7 +2356,7 @@ void SdrObject::NbcShearGluePoints(const Point& rRef, long nAngle, double tn, bo { // First a const call to see whether there are any glue points. // Force const call! - if (GetGluePointList()!=NULL) { + if (GetGluePointList()!=nullptr) { SdrGluePointList* pGPL=ForceGluePointList(); pGPL->Shear(rRef,nAngle,tn,bVShear,this); } @@ -2372,7 +2372,7 @@ void SdrObject::DisconnectFromNode(bool /*bTail1*/) SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const { - return NULL; + return nullptr; } @@ -2442,8 +2442,8 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas { SfxItemSet aSet(pRet->GetMergedItemSet()); drawing::FillStyle eOldFillStyle = static_cast<const XFillStyleItem&>(aSet.Get(XATTR_FILLSTYLE)).GetValue(); - SdrPathObj* aLinePolygonPart = NULL; - SdrPathObj* aLineHairlinePart = NULL; + SdrPathObj* aLinePolygonPart = nullptr; + SdrPathObj* aLineHairlinePart = nullptr; bool bBuildGroup(false); if(aMergedLineFillPolyPolygon.count()) @@ -2662,7 +2662,7 @@ SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const SdrObject* SdrObject::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { - return NULL; + return nullptr; } @@ -2675,7 +2675,7 @@ void SdrObject::SetInserted(bool bIns) if (bIns) SendUserCall(SDRUSERCALL_INSERTED,aBoundRect0); else SendUserCall(SDRUSERCALL_REMOVED,aBoundRect0); - if (pPlusData!=NULL && pPlusData->pBroadcast!=NULL) { + if (pPlusData!=nullptr && pPlusData->pBroadcast!=nullptr) { SdrHint aHint(*this); aHint.SetKind(bIns?HINT_OBJINSERTED:HINT_OBJREMOVED); pPlusData->pBroadcast->Broadcast(aHint); @@ -2711,7 +2711,7 @@ void SdrObject::SetPrintable(bool bPrn) { bNoPrint=!bPrn; SetChanged(); - if (IsInserted() && pModel!=NULL) + if (IsInserted() && pModel!=nullptr) { SdrHint aHint(*this); pModel->Broadcast(aHint); @@ -2725,7 +2725,7 @@ void SdrObject::SetVisible(bool bVisible) { mbVisible = bVisible; SetChanged(); - if (IsInserted() && pModel!=NULL) + if (IsInserted() && pModel!=nullptr) { SdrHint aHint(*this); pModel->Broadcast(aHint); @@ -2737,13 +2737,13 @@ void SdrObject::SetVisible(bool bVisible) sal_uInt16 SdrObject::GetUserDataCount() const { - if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return 0; + if (pPlusData==nullptr || pPlusData->pUserDataList==nullptr) return 0; return pPlusData->pUserDataList->GetUserDataCount(); } SdrObjUserData* SdrObject::GetUserData(sal_uInt16 nNum) const { - if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return NULL; + if (pPlusData==nullptr || pPlusData->pUserDataList==nullptr) return nullptr; return &pPlusData->pUserDataList->GetUserData(nNum); } @@ -2769,7 +2769,7 @@ void SdrObject::DeleteUserData(sal_uInt16 nNum) pPlusData->pUserDataList->DeleteUserData(nNum); if (nCount==1) { delete pPlusData->pUserDataList; - pPlusData->pUserDataList=NULL; + pPlusData->pUserDataList=nullptr; } } else { OSL_FAIL("SdrObject::DeleteUserData(): Invalid Index."); @@ -2784,7 +2784,7 @@ void SdrObject::SetUserCall(SdrObjUserCall* pUser) void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect) const { - SdrObject* pGroup = NULL; + SdrObject* pGroup = nullptr; if( pObjList && pObjList->GetListKind() == SDROBJLIST_GROUPOBJ ) pGroup = pObjList->GetOwnerObj(); @@ -2842,7 +2842,7 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR pGroup != pObjList->GetOwnerObj() ) pGroup = pObjList->GetOwnerObj(); else - pGroup = NULL; + pGroup = nullptr; } // notify our UNO shape listeners @@ -2880,7 +2880,7 @@ void SdrObject::impl_setUnoShape( const uno::Reference< uno::XInterface >& _rxUn // make sure there is no stale impl. pointer if the UNO // shape was destroyed meanwhile (remember we only hold weak // reference to it!) - mpSvxShape = 0; + mpSvxShape = nullptr; } return; } @@ -2920,7 +2920,7 @@ SvxShape* SdrObject::getSvxShape() #endif //#113608#, make sure mpSvxShape is always synchronized with maWeakUnoShape if ( mpSvxShape && !xShape.is() ) - mpSvxShape = NULL; + mpSvxShape = nullptr; return mpSvxShape; } @@ -2931,7 +2931,7 @@ css::uno::Reference< css::uno::XInterface > SdrObject::getUnoShape() uno::Reference< uno::XInterface > xShape( getWeakUnoShape() ); if( !xShape.is() ) { - OSL_ENSURE( mpSvxShape == NULL, "SdrObject::getUnoShape: XShape already dead, but still an IMPL pointer!" ); + OSL_ENSURE( mpSvxShape == nullptr, "SdrObject::getUnoShape: XShape already dead, but still an IMPL pointer!" ); if ( pPage ) { uno::Reference< uno::XInterface > xPage( pPage->getUnoPage() ); @@ -3152,11 +3152,11 @@ SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNe { nInventor=nInvent; nIdentifier=nIdent; - pNewObj=NULL; + pNewObj=nullptr; pPage=pNewPage; pModel=pNewModel; - pObj=NULL; - pNewData=NULL; + pObj=nullptr; + pNewData=nullptr; } SdrObject* SdrObjFactory::CreateObjectFromFactory( sal_uInt32 nInventor, sal_uInt16 nIdentifier, SdrPage* pPage, SdrModel* pModel ) @@ -3166,7 +3166,7 @@ SdrObject* SdrObjFactory::CreateObjectFromFactory( sal_uInt32 nInventor, sal_uIn SdrLinkList& rLL = ImpGetUserMakeObjHdl(); unsigned n = rLL.GetLinkCount(); unsigned i = 0; - SdrObject* pObj = NULL; + SdrObject* pObj = nullptr; while (i < n && !pObj) { rLL.GetLink(i).Call(pFact.get()); @@ -3182,7 +3182,7 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S if (!pModel && pPage) pModel = pPage->GetModel(); - SdrObject* pObj = NULL; + SdrObject* pObj = nullptr; if (nInvent == SdrInventor) { @@ -3230,7 +3230,7 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S if (!pObj) { // Well, if no one wants it... - return NULL; + return nullptr; } if (pPage) @@ -3244,9 +3244,9 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S SdrObject* SdrObjFactory::MakeNewObject( sal_uInt32 nInventor, sal_uInt16 nIdentifier, const Rectangle& rSnapRect, SdrPage* pPage ) { - SdrModel* pModel = pPage ? pPage->GetModel() : NULL; + SdrModel* pModel = pPage ? pPage->GetModel() : nullptr; - SdrObject* pObj = NULL; + SdrObject* pObj = nullptr; bool bSetSnapRect = true; @@ -3317,7 +3317,7 @@ SdrObject* SdrObjFactory::MakeNewObject( if (!pObj) { // Well, if no one wants it... - return NULL; + return nullptr; } if (pPage) diff --git a/svx/source/svdraw/svdobjplusdata.cxx b/svx/source/svdraw/svdobjplusdata.cxx index 91ec34d7145a..b021e3723994 100644 --- a/svx/source/svdraw/svdobjplusdata.cxx +++ b/svx/source/svdraw/svdobjplusdata.cxx @@ -16,9 +16,9 @@ #include <vcl/outdev.hxx> SdrObjPlusData::SdrObjPlusData(): - pBroadcast(NULL), - pUserDataList(NULL), - pGluePoints(NULL) + pBroadcast(nullptr), + pUserDataList(nullptr), + pGluePoints(nullptr) { } @@ -32,13 +32,13 @@ SdrObjPlusData::~SdrObjPlusData() SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const { SdrObjPlusData* pNeuPlusData=new SdrObjPlusData; - if (pUserDataList!=NULL) { + if (pUserDataList!=nullptr) { sal_uInt16 nCount=pUserDataList->GetUserDataCount(); if (nCount!=0) { pNeuPlusData->pUserDataList=new SdrObjUserDataList; for (sal_uInt16 i=0; i<nCount; i++) { SdrObjUserData* pNeuUserData=pUserDataList->GetUserData(i).Clone(pObj1); - if (pNeuUserData!=NULL) { + if (pNeuUserData!=nullptr) { pNeuPlusData->pUserDataList->AppendUserData(pNeuUserData); } else { OSL_FAIL("SdrObjPlusData::Clone(): UserData.Clone() returns NULL."); @@ -46,7 +46,7 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const } } } - if (pGluePoints!=NULL) pNeuPlusData->pGluePoints=new SdrGluePointList(*pGluePoints); + if (pGluePoints!=nullptr) pNeuPlusData->pGluePoints=new SdrGluePointList(*pGluePoints); // MtfAnimator isn't copied either // #i68101# diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index b7f6b5e5874d..aac0488f37b5 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -302,7 +302,7 @@ SdrHdl* SdrCaptionObj::GetHdl(sal_uInt32 nHdlNum) const } else { - return 0L; + return nullptr; } } } @@ -338,7 +338,7 @@ bool SdrCaptionObj::beginSpecialDrag(SdrDragStat& rDrag) const Point aHit(rDrag.GetStart()); - if(rDrag.GetPageView() && SdrObjectPrimitiveHit(*this, aHit, 0, *rDrag.GetPageView(), 0, false)) + if(rDrag.GetPageView() && SdrObjectPrimitiveHit(*this, aHit, 0, *rDrag.GetPageView(), nullptr, false)) { return true; } @@ -685,7 +685,7 @@ const Point& SdrCaptionObj::GetTailPos() const void SdrCaptionObj::SetTailPos(const Point& rPos) { if (aTailPoly.GetSize()==0 || aTailPoly[0]!=rPos) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcSetTailPos(rPos); SetChanged(); BroadcastObjectChange(); @@ -746,15 +746,15 @@ SdrObject* SdrCaptionObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier, bAddText); SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), false, bBezier); - SdrObject* pRet=(pTail!=NULL) ? pTail : pRect; - if (pTail!=NULL && pRect!=NULL) { + SdrObject* pRet=(pTail!=nullptr) ? pTail : pRect; + if (pTail!=nullptr && pRect!=nullptr) { bool bInsRect = true; bool bInsTail = true; SdrObjList* pOL=pTail->GetSubList(); - if (pOL!=NULL) { pRet=pRect; bInsTail = false; } - if (pOL==NULL) pOL=pRect->GetSubList(); - if (pOL!=NULL) { pRet=pRect; bInsRect = false; } - if (pOL==NULL) { + if (pOL!=nullptr) { pRet=pRect; bInsTail = false; } + if (pOL==nullptr) pOL=pRect->GetSubList(); + if (pOL!=nullptr) { pRet=pRect; bInsRect = false; } + if (pOL==nullptr) { SdrObjGroup* pGrp=new SdrObjGroup; pOL=pGrp->GetSubList(); pRet=pGrp; diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index d0716bd841cc..7f99164f541e 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -399,7 +399,7 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const nHdlNum += 2L; } - SdrHdl* pH = NULL; + SdrHdl* pH = nullptr; Point aPnt; SdrHdlKind eLocalKind(HDL_MOVE); sal_uInt32 nPNum(0); @@ -639,7 +639,7 @@ void ImpCircUser::SetCreateParams(SdrDragStat& rStat) if (nWdt!=0) aP.X()=aP.X()*nHgt/nWdt; } nStart=NormAngle360(GetAngle(aP)); - if (rStat.GetView()!=NULL && rStat.GetView()->IsAngleSnapEnabled()) { + if (rStat.GetView()!=nullptr && rStat.GetView()->IsAngleSnapEnabled()) { long nSA=rStat.GetView()->GetSnapAngle(); if (nSA!=0) { // angle snapping nStart+=nSA/2; @@ -660,7 +660,7 @@ void ImpCircUser::SetCreateParams(SdrDragStat& rStat) aP.X()=BigMulDiv(aP.X(),nHgt,nWdt); } nEnd=NormAngle360(GetAngle(aP)); - if (rStat.GetView()!=NULL && rStat.GetView()->IsAngleSnapEnabled()) { + if (rStat.GetView()!=nullptr && rStat.GetView()->IsAngleSnapEnabled()) { long nSA=rStat.GetView()->GetSnapAngle(); if (nSA!=0) { // angle snapping nEnd+=nSA/2; @@ -676,7 +676,7 @@ void ImpCircUser::SetCreateParams(SdrDragStat& rStat) void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat) const { ImpCircUser* pU=static_cast<ImpCircUser*>(rStat.GetUser()); - if (pU==NULL) { + if (pU==nullptr) { pU=new ImpCircUser; rStat.SetUser(pU); } @@ -746,7 +746,7 @@ bool SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) ImpSetCircInfoToAttr(); if (bRet) { delete pU; - rStat.SetUser(NULL); + rStat.SetUser(nullptr); } return bRet; } @@ -755,7 +755,7 @@ void SdrCircObj::BrkCreate(SdrDragStat& rStat) { ImpCircUser* pU=static_cast<ImpCircUser*>(rStat.GetUser()); delete pU; - rStat.SetUser(NULL); + rStat.SetUser(nullptr); } bool SdrCircObj::BckCreate(SdrDragStat& rStat) diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index a1e42f3a3edf..e7556d4ca866 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -56,7 +56,7 @@ SdrObjConnection::~SdrObjConnection() void SdrObjConnection::ResetVars() { - pObj=NULL; + pObj=nullptr; nConId=0; nXDist=0; nYDist=0; @@ -71,7 +71,7 @@ void SdrObjConnection::ResetVars() bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const { bool bRet = false; - if (pObj!=NULL) { // one object has to be docked already! + if (pObj!=nullptr) { // one object has to be docked already! if (bAutoVertex) { rGP=pObj->GetVertexGluePoint(nConId); bRet = true; @@ -80,7 +80,7 @@ bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const bRet = true; } else { const SdrGluePointList* pGPL=pObj->GetGluePointList(); - if (pGPL!=NULL) { + if (pGPL!=nullptr) { sal_uInt16 nNum=pGPL->FindGluePoint(nConId); if (nNum!=SDRGLUEPOINT_NOTFOUND) { rGP=(*pGPL)[nNum]; @@ -417,8 +417,8 @@ SdrGluePoint SdrEdgeObj::GetVertexGluePoint(sal_uInt16 nNum) const if (nPointCount>0) { Point aOfs = GetSnapRect().Center(); - if (nNum==2 && GetConnectedNode(true)==NULL) aPt=(*pEdgeTrack)[0]; - else if (nNum==3 && GetConnectedNode(false)==NULL) aPt=(*pEdgeTrack)[nPointCount-1]; + if (nNum==2 && GetConnectedNode(true)==nullptr) aPt=(*pEdgeTrack)[0]; + else if (nNum==3 && GetConnectedNode(false)==nullptr) aPt=(*pEdgeTrack)[nPointCount-1]; else { if ((nPointCount & 1) ==1) { aPt=(*pEdgeTrack)[nPointCount/2]; @@ -445,19 +445,19 @@ SdrGluePoint SdrEdgeObj::GetCornerGluePoint(sal_uInt16 nNum) const const SdrGluePointList* SdrEdgeObj::GetGluePointList() const { - return NULL; // no user defined glue points for connectors + return nullptr; // no user defined glue points for connectors } SdrGluePointList* SdrEdgeObj::ForceGluePointList() { - return NULL; // no user defined glue points for connectors + return nullptr; // no user defined glue points for connectors } void SdrEdgeObj::ConnectToNode(bool bTail1, SdrObject* pObj) { SdrObjConnection& rCon=GetConnection(bTail1); DisconnectFromNode(bTail1); - if (pObj!=NULL) { + if (pObj!=nullptr) { pObj->AddListener(*this); rCon.pObj=pObj; @@ -471,16 +471,16 @@ void SdrEdgeObj::ConnectToNode(bool bTail1, SdrObject* pObj) void SdrEdgeObj::DisconnectFromNode(bool bTail1) { SdrObjConnection& rCon=GetConnection(bTail1); - if (rCon.pObj!=NULL) { + if (rCon.pObj!=nullptr) { rCon.pObj->RemoveListener(*this); - rCon.pObj=NULL; + rCon.pObj=nullptr; } } SdrObject* SdrEdgeObj::GetConnectedNode(bool bTail1) const { SdrObject* pObj=GetConnection(bTail1).pObj; - if (pObj!=NULL && (pObj->GetPage()!=pPage || !pObj->IsInserted())) pObj=NULL; + if (pObj!=nullptr && (pObj->GetPage()!=pPage || !pObj->IsInserted())) pObj=nullptr; return pObj; } @@ -489,9 +489,9 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const bool bRet = false; const SdrObjConnection& rCon=GetConnection(bTail1); sal_uInt16 nPointCount=pEdgeTrack->GetPointCount(); - if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPointCount!=0) { + if (rCon.pObj!=nullptr && rCon.pObj->GetPage()==pPage && nPointCount!=0) { const SdrGluePointList* pGPL=rCon.pObj->GetGluePointList(); - sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); + sal_uInt16 nConAnz=pGPL==nullptr ? 0 : pGPL->GetCount(); sal_uInt16 nGesAnz=nConAnz+8; Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[sal_uInt16(nPointCount-1)]); for (sal_uInt16 i=0; i<nGesAnz && !bRet; i++) { @@ -579,7 +579,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() mbSuppressed = false; } - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect(); SetRectsDirty(); *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo); ImpSetEdgeInfoToAttr(); // copy values from aEdgeInfo into the pool @@ -596,7 +596,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() SdrEscapeDirection SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) { - if (pObj==NULL) return SdrEscapeDirection::ALL; + if (pObj==nullptr) return SdrEscapeDirection::ALL; Rectangle aR(pObj->GetSnapRect()); long dxl=rPt.X()-aR.Left(); long dyo=rPt.Y()-aR.Top(); @@ -714,8 +714,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& } // #i54102# To allow interactive preview, do also if not inserted - bool bCon1=rCon1.pObj!=NULL && rCon1.pObj->GetPage()==pPage; - bool bCon2=rCon2.pObj!=NULL && rCon2.pObj->GetPage()==pPage; + bool bCon1=rCon1.pObj!=nullptr && rCon1.pObj->GetPage()==pPage; + bool bCon2=rCon2.pObj!=nullptr && rCon2.pObj->GetPage()==pPage; const SfxItemSet& rSet = GetObjectItemSet(); @@ -799,7 +799,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& if ((nEsc1&nE1) && (nEsc2&nE2)) { sal_uIntPtr nQual=0; SdrEdgeInfoRec aInfo; - if (pInfo!=NULL) aInfo=*pInfo; + if (pInfo!=nullptr) aInfo=*pInfo; XPolygon aXP(ImpCalcEdgeTrack(aPt1,nA1,aBoundRect1,aBewareRect1,aPt2,nA2,aBoundRect2,aBewareRect2,&nQual,&aInfo)); if (nQual<nBestQual) { aBestXP=aXP; @@ -815,7 +815,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& } if (bAuto1) rCon1.nConId=nBestAuto1; if (bAuto2) rCon2.nConId=nBestAuto2; - if (pInfo!=NULL) *pInfo=aBestInfo; + if (pInfo!=nullptr) *pInfo=aBestInfo; return aBestXP; } @@ -836,7 +836,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec bool bUnt2=nAngle2==27000; bool bHor2=bLks2 || bRts2; bool bVer2=bObn2 || bUnt2; - bool bInfo=pInfo!=NULL; + bool bInfo=pInfo!=nullptr; if (bInfo) { pInfo->cOrthoForm=0; pInfo->nAngle1=nAngle1; @@ -856,7 +856,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec XPolygon aXP(2); aXP[0]=rPt1; aXP[1]=rPt2; - if (pnQuality!=NULL) { + if (pnQuality!=nullptr) { *pnQuality=std::abs(rPt1.X()-rPt2.X())+std::abs(rPt1.Y()-rPt2.Y()); } return aXP; @@ -874,7 +874,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec if (bObn2) aXP[2].Y()=aBewareRect2.Top(); //-=500; if (bLks2) aXP[2].X()=aBewareRect2.Left(); //-=500; if (bUnt2) aXP[2].Y()=aBewareRect2.Bottom(); //+=500; - if (pnQuality!=NULL) { + if (pnQuality!=nullptr) { long nQ=std::abs(aXP[1].X()-aXP[0].X())+std::abs(aXP[1].Y()-aXP[0].Y()); nQ+=std::abs(aXP[2].X()-aXP[1].X())+std::abs(aXP[2].Y()-aXP[1].Y()); nQ+=std::abs(aXP[3].X()-aXP[2].X())+std::abs(aXP[3].Y()-aXP[2].Y()); @@ -1263,7 +1263,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } sal_uInt16 nPointCount=aXP1.GetPointCount(); char cForm; - if (bInfo || pnQuality!=NULL) { + if (bInfo || pnQuality!=nullptr) { if (nPointCount==2) cForm='I'; else if (nPointCount==3) cForm='L'; else if (nPointCount==4) { // Z or U @@ -1308,7 +1308,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec { cForm = 0; } - if (pnQuality!=NULL) { + if (pnQuality!=nullptr) { sal_uIntPtr nQual=0; sal_uIntPtr nQual0=nQual; // prevent overruns bool bOverflow = false; @@ -1565,16 +1565,16 @@ line (CL). The number of object margins per object varies between 0 and 3: void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { const SfxSimpleHint* pSimple = dynamic_cast<const SfxSimpleHint*>(&rHint); - sal_uIntPtr nId=pSimple==0 ? 0 : pSimple->GetId(); + sal_uIntPtr nId=pSimple==nullptr ? 0 : pSimple->GetId(); bool bDataChg=nId==SFX_HINT_DATACHANGED; bool bDying=nId==SFX_HINT_DYING; - bool bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC; - bool bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC; + bool bObj1=aCon1.pObj!=nullptr && aCon1.pObj->GetBroadcaster()==&rBC; + bool bObj2=aCon2.pObj!=nullptr && aCon2.pObj->GetBroadcaster()==&rBC; if (bDying && (bObj1 || bObj2)) { // catch Dying, so AttrObj doesn't start broadcasting // about an alleged change of template - if (bObj1) aCon1.pObj=NULL; - if (bObj2) aCon2.pObj=NULL; + if (bObj1) aCon1.pObj=nullptr; + if (bObj2) aCon2.pObj=nullptr; return; } if ( bObj1 || bObj2 ) @@ -1594,7 +1594,7 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) (pSdrHint && pSdrHint->GetKind()==HINT_OBJREMOVED)) { // broadcasting only, if on the same page - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect(); ImpDirtyEdgeTrack(); // only redraw here, object hasn't actually changed @@ -1611,13 +1611,13 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) */ void SdrEdgeObj::Reformat() { - if( NULL != aCon1.pObj ) + if( nullptr != aCon1.pObj ) { SfxSimpleHint aHint( SFX_HINT_DATACHANGED ); Notify( *const_cast<SfxBroadcaster*>(aCon1.pObj->GetBroadcaster()), aHint ); } - if( NULL != aCon2.pObj ) + if( nullptr != aCon2.pObj ) { SfxSimpleHint aHint( SFX_HINT_DATACHANGED ); Notify( *const_cast<SfxBroadcaster*>(aCon2.pObj->GetBroadcaster()), aHint ); @@ -1638,8 +1638,8 @@ SdrEdgeObj& SdrEdgeObj::operator=(const SdrEdgeObj& rObj) bEdgeTrackDirty=rObj.bEdgeTrackDirty; aCon1 =rObj.aCon1; aCon2 =rObj.aCon2; - aCon1.pObj=NULL; - aCon2.pObj=NULL; + aCon1.pObj=nullptr; + aCon2.pObj=nullptr; aEdgeInfo=rObj.aEdgeInfo; return *this; } @@ -1745,15 +1745,15 @@ sal_uInt32 SdrEdgeObj::GetHdlCount() const SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const { - SdrHdl* pHdl=NULL; + SdrHdl* pHdl=nullptr; sal_uInt32 nPointCount(pEdgeTrack->GetPointCount()); if (nPointCount!=0) { if (nHdlNum==0) { pHdl=new ImpEdgeHdl((*pEdgeTrack)[0],HDL_POLY); - if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(); + if (aCon1.pObj!=nullptr && aCon1.bBestVertex) pHdl->Set1PixMore(); } else if (nHdlNum==1) { pHdl=new ImpEdgeHdl((*pEdgeTrack)[sal_uInt16(nPointCount-1)],HDL_POLY); - if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(); + if (aCon2.pObj!=nullptr && aCon2.bBestVertex) pHdl->Set1PixMore(); } else { SdrEdgeKind eKind=static_cast<const SdrEdgeKindItem&>(GetObjectItem(SDRATTR_EDGEKIND)).GetValue(); if (eKind==SDREDGE_ORTHOLINES || eKind==SDREDGE_BEZIER) { @@ -1789,18 +1789,18 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const pHdl->SetPos(aPos); } else { delete pHdl; - pHdl=NULL; + pHdl=nullptr; } } else if (eKind==SDREDGE_THREELINES) { sal_uInt32 nNum(nHdlNum); - if (GetConnectedNode(true)==NULL) nNum++; + if (GetConnectedNode(true)==nullptr) nNum++; Point aPos((*pEdgeTrack)[(sal_uInt16)nNum-1]); pHdl=new ImpEdgeHdl(aPos,HDL_POLY); if (nNum==2) static_cast<ImpEdgeHdl*>(pHdl)->SetLineCode(OBJ1LINE2); if (nNum==3) static_cast<ImpEdgeHdl*>(pHdl)->SetLineCode(OBJ2LINE2); } } - if (pHdl!=NULL) { + if (pHdl!=nullptr) { pHdl->SetPointNum(nHdlNum); } } @@ -1877,7 +1877,7 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat) // if found, officially connect to it; ImpFindConnector only // sets pObj hard SdrObject* pNewConnection = pDraggedOne->pObj; - pDraggedOne->pObj = 0; + pDraggedOne->pObj = nullptr; ConnectToNode(bDragA, pNewConnection); } @@ -2029,7 +2029,7 @@ bool SdrEdgeObj::BegCreate(SdrDragStat& rDragStat) pEdgeTrack->SetPointCount(2); (*pEdgeTrack)[0]=rDragStat.GetStart(); (*pEdgeTrack)[1]=rDragStat.GetNow(); - if (rDragStat.GetPageView()!=NULL) { + if (rDragStat.GetPageView()!=nullptr) { ImpFindConnector(rDragStat.GetStart(),*rDragStat.GetPageView(),aCon1,this); ConnectToNode(true,aCon1.pObj); } @@ -2041,7 +2041,7 @@ bool SdrEdgeObj::MovCreate(SdrDragStat& rDragStat) { sal_uInt16 nMax=pEdgeTrack->GetPointCount(); (*pEdgeTrack)[nMax-1]=rDragStat.GetNow(); - if (rDragStat.GetPageView()!=NULL) { + if (rDragStat.GetPageView()!=nullptr) { ImpFindConnector(rDragStat.GetNow(),*rDragStat.GetPageView(),aCon2,this); rDragStat.GetView()->SetConnectMarker(aCon2,*rDragStat.GetPageView()); } @@ -2059,7 +2059,7 @@ bool SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd) if (bOk) { ConnectToNode(true,aCon1.pObj); ConnectToNode(false,aCon2.pObj); - if (rDragStat.GetView()!=NULL) { + if (rDragStat.GetView()!=nullptr) { rDragStat.GetView()->HideConnectMarker(); } ImpSetEdgeInfoToAttr(); // copy values from aEdgeInfo into the pool @@ -2070,7 +2070,7 @@ bool SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd) bool SdrEdgeObj::BckCreate(SdrDragStat& rDragStat) { - if (rDragStat.GetView()!=NULL) { + if (rDragStat.GetView()!=nullptr) { rDragStat.GetView()->HideConnectMarker(); } return false; @@ -2078,7 +2078,7 @@ bool SdrEdgeObj::BckCreate(SdrDragStat& rDragStat) void SdrEdgeObj::BrkCreate(SdrDragStat& rDragStat) { - if (rDragStat.GetView()!=NULL) { + if (rDragStat.GetView()!=nullptr) { rDragStat.GetView()->HideConnectMarker(); } } @@ -2098,8 +2098,8 @@ Pointer SdrEdgeObj::GetCreatePointer() const bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut) { rCon.ResetVars(); - if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); - if (pOut==NULL) return false; + if (pOut==nullptr) pOut=rPV.GetView().GetFirstOutputDevice(); + if (pOut==nullptr) return false; SdrObjList* pOL=rPV.GetObjList(); const SetOfByte& rVisLayer=rPV.GetVisibleLayers(); // sensitive area of connectors is twice as large as the one of the handles @@ -2122,7 +2122,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO no--; SdrObject* pObj=pOL->GetObj(no); if (rVisLayer.IsSet(pObj->GetLayer()) && pObj->IsVisible() && // only visible objects - (pThis==NULL || pObj!=static_cast<SdrObject const *>(pThis)) && // don't connect it to itself + (pThis==nullptr || pObj!=static_cast<SdrObject const *>(pThis)) && // don't connect it to itself pObj->IsNode()) { Rectangle aObjBound(pObj->GetCurrentBoundRect()); @@ -2133,7 +2133,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO // After those come Vertex, Corner and center (Best), all prioritized equally. // Finally, a HitTest for the object. const SdrGluePointList* pGPL=pObj->GetGluePointList(); - sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); + sal_uInt16 nConAnz=pGPL==nullptr ? 0 : pGPL->GetCount(); sal_uInt16 nGesAnz=nConAnz+9; bool bUserFnd = false; sal_uIntPtr nBestDist=0xFFFFFFFF; @@ -2285,8 +2285,8 @@ void SdrEdgeObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs) else { // handle start and end point if not connected - bool bCon1=aCon1.pObj!=NULL && aCon1.pObj->GetPage()==pPage; - bool bCon2=aCon2.pObj!=NULL && aCon2.pObj->GetPage()==pPage; + bool bCon1=aCon1.pObj!=nullptr && aCon1.pObj->GetPage()==pPage; + bool bCon2=aCon2.pObj!=nullptr && aCon2.pObj->GetPage()==pPage; if(!bCon1 && pEdgeTrack) { @@ -2316,8 +2316,8 @@ void SdrEdgeObj::NbcMirror(const Point& rRef1, const Point& rRef2) else { // handle start and end point if not connected - bool bCon1=aCon1.pObj!=NULL && aCon1.pObj->GetPage()==pPage; - bool bCon2=aCon2.pObj!=NULL && aCon2.pObj->GetPage()==pPage; + bool bCon1=aCon1.pObj!=nullptr && aCon1.pObj->GetPage()==pPage; + bool bCon2=aCon2.pObj!=nullptr && aCon2.pObj->GetPage()==pPage; if(!bCon1 && pEdgeTrack) { @@ -2347,8 +2347,8 @@ void SdrEdgeObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShea else { // handle start and end point if not connected - bool bCon1=aCon1.pObj!=NULL && aCon1.pObj->GetPage()==pPage; - bool bCon2=aCon2.pObj!=NULL && aCon2.pObj->GetPage()==pPage; + bool bCon1=aCon1.pObj!=nullptr && aCon1.pObj->GetPage()==pPage; + bool bCon2=aCon2.pObj!=nullptr && aCon2.pObj->GetPage()==pPage; if(!bCon1 && pEdgeTrack) { @@ -2459,14 +2459,14 @@ void SdrEdgeObj::RestGeoData(const SdrObjGeoData& rGeo) SdrTextObj::RestGeoData(rGeo); const SdrEdgeObjGeoData& rEGeo=static_cast<const SdrEdgeObjGeoData&>(rGeo); if (aCon1.pObj!=rEGeo.aCon1.pObj) { - if (aCon1.pObj!=NULL) aCon1.pObj->RemoveListener(*this); + if (aCon1.pObj!=nullptr) aCon1.pObj->RemoveListener(*this); aCon1=rEGeo.aCon1; - if (aCon1.pObj!=NULL) aCon1.pObj->AddListener(*this); + if (aCon1.pObj!=nullptr) aCon1.pObj->AddListener(*this); } if (aCon2.pObj!=rEGeo.aCon2.pObj) { - if (aCon2.pObj!=NULL) aCon2.pObj->RemoveListener(*this); + if (aCon2.pObj!=nullptr) aCon2.pObj->RemoveListener(*this); aCon2=rEGeo.aCon2; - if (aCon2.pObj!=NULL) aCon2.pObj->AddListener(*this); + if (aCon2.pObj!=nullptr) aCon2.pObj->AddListener(*this); } *pEdgeTrack =*rEGeo.pEdgeTrack; bEdgeTrackDirty=rEGeo.bEdgeTrackDirty; @@ -2512,7 +2512,7 @@ void SdrEdgeObj::SetTailPoint( bool bTail, const Point& rPt ) */ void SdrEdgeObj::setGluePointIndex( bool bTail, sal_Int32 nIndex /* = -1 */ ) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect(); SdrObjConnection& rConn1 = GetConnection( bTail ); @@ -2526,8 +2526,8 @@ void SdrEdgeObj::setGluePointIndex( bool bTail, sal_Int32 nIndex /* = -1 */ ) // for user defined glue points we have // to get the id for this index first - const SdrGluePointList* pList = rConn1.GetObject() ? rConn1.GetObject()->GetGluePointList() : NULL; - if( pList == NULL || SDRGLUEPOINT_NOTFOUND == pList->FindGluePoint((sal_uInt16)nIndex) ) + const SdrGluePointList* pList = rConn1.GetObject() ? rConn1.GetObject()->GetGluePointList() : nullptr; + if( pList == nullptr || SDRGLUEPOINT_NOTFOUND == pList->FindGluePoint((sal_uInt16)nIndex) ) return; } else if( nIndex < 0 ) diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index fef7e7847e18..cea2d2d8fea1 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -99,7 +99,7 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a // to interpret included links may fail. // Alternatively the path may be set at the result after this call when it is known // that it is a SVG graphic, but only because no one yet tried to interpret it. - rGF.ImportGraphic( aGraphic, aFileName, *pInStrm, nFilter, NULL, GraphicFilterImportFlags::NONE, &aFilterData ); + rGF.ImportGraphic( aGraphic, aFileName, *pInStrm, nFilter, nullptr, GraphicFilterImportFlags::NONE, &aFilterData ); } return aGraphic; } @@ -120,7 +120,7 @@ public: const OUString& rMimeType, const css::uno::Any & rValue ) override; void DataChanged( const Graphic& rGraphic ); - bool Connect() { return 0 != GetRealObject(); } + bool Connect() { return nullptr != GetRealObject(); } void UpdateAsynchron(); void RemoveGraphicUpdater(); @@ -197,7 +197,7 @@ void SAL_CALL SdrGraphicUpdater::run() SdrGraphicLink::SdrGraphicLink(SdrGrafObj& rObj) : ::sfx2::SvBaseLink( ::SfxLinkUpdateMode::ONCALL, SotClipboardFormatId::SVXB ) , rGrafObj( rObj ) -, pGraphicUpdater( NULL ) +, pGraphicUpdater( nullptr ) { SetSynchron( false ); } @@ -215,18 +215,18 @@ void SdrGraphicLink::DataChanged( const Graphic& rGraphic ) void SdrGraphicLink::RemoveGraphicUpdater() { - pGraphicUpdater = NULL; + pGraphicUpdater = nullptr; } ::sfx2::SvBaseLink::UpdateResult SdrGraphicLink::DataChanged( const OUString& rMimeType, const css::uno::Any & rValue ) { SdrModel* pModel = rGrafObj.GetModel(); - sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0; + sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : nullptr; if( pLinkManager && rValue.hasValue() ) { - sfx2::LinkManager::GetDisplayNames( this, 0, &rGrafObj.aFileName, 0, &rGrafObj.aFilterName ); + sfx2::LinkManager::GetDisplayNames( this, nullptr, &rGrafObj.aFileName, nullptr, &rGrafObj.aFilterName ); Graphic aGraphic; if( sfx2::LinkManager::GetGraphicFromAny( rMimeType, rValue, aGraphic )) @@ -247,7 +247,7 @@ void SdrGraphicLink::Closed() { // close connection; set pLink of the object to NULL, as link instance is just about getting destructed. rGrafObj.ForceSwapIn(); - rGrafObj.pGraphicLink=NULL; + rGrafObj.pGraphicLink=nullptr; rGrafObj.ReleaseGraphicLink(); SvBaseLink::Closed(); } @@ -334,11 +334,11 @@ TYPEINIT1(SdrGrafObj,SdrRectObj); SdrGrafObj::SdrGrafObj() : SdrRectObj(), - pGraphicLink ( NULL ), + pGraphicLink ( nullptr ), bMirrored ( false ) { pGraphic = new GraphicObject; - mpReplacementGraphic = 0; + mpReplacementGraphic = nullptr; pGraphic->SetSwapStreamHdl( LINK(this, SdrGrafObj, ImpSwapHdl) ); onGraphicChanged(); @@ -358,11 +358,11 @@ SdrGrafObj::SdrGrafObj() SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) : SdrRectObj ( rRect ), - pGraphicLink ( NULL ), + pGraphicLink ( nullptr ), bMirrored ( false ) { pGraphic = new GraphicObject( rGrf ); - mpReplacementGraphic = 0; + mpReplacementGraphic = nullptr; pGraphic->SetSwapStreamHdl( LINK(this, SdrGrafObj, ImpSwapHdl) ); onGraphicChanged(); @@ -382,11 +382,11 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) SdrGrafObj::SdrGrafObj( const Graphic& rGrf ) : SdrRectObj(), - pGraphicLink ( NULL ), + pGraphicLink ( nullptr ), bMirrored ( false ) { pGraphic = new GraphicObject( rGrf ); - mpReplacementGraphic = 0; + mpReplacementGraphic = nullptr; pGraphic->SetSwapStreamHdl( LINK(this, SdrGrafObj, ImpSwapHdl) ); onGraphicChanged(); @@ -415,7 +415,7 @@ void SdrGrafObj::SetGraphicObject( const GraphicObject& rGrfObj ) { *pGraphic = rGrfObj; delete mpReplacementGraphic; - mpReplacementGraphic = 0; + mpReplacementGraphic = nullptr; pGraphic->SetSwapStreamHdl( LINK(this, SdrGrafObj, ImpSwapHdl) ); pGraphic->SetUserData(); mbIsPreview = false; @@ -453,7 +453,7 @@ void SdrGrafObj::NbcSetGraphic( const Graphic& rGrf ) { pGraphic->SetGraphic( rGrf ); delete mpReplacementGraphic; - mpReplacementGraphic = 0; + mpReplacementGraphic = nullptr; pGraphic->SetUserData(); mbIsPreview = false; onGraphicChanged(); @@ -590,15 +590,15 @@ void SdrGrafObj::ForceSwapIn() const void SdrGrafObj::ImpLinkAnmeldung() { - sfx2::LinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL; + sfx2::LinkManager* pLinkManager = pModel != nullptr ? pModel->GetLinkManager() : nullptr; - if( pLinkManager != NULL && pGraphicLink == NULL ) + if( pLinkManager != nullptr && pGraphicLink == nullptr ) { if (!aFileName.isEmpty()) { pGraphicLink = new SdrGraphicLink( *this ); pLinkManager->InsertFileLink( - *pGraphicLink, OBJECT_CLIENT_GRF, aFileName, (aFilterName.isEmpty() ? NULL : &aFilterName)); + *pGraphicLink, OBJECT_CLIENT_GRF, aFileName, (aFilterName.isEmpty() ? nullptr : &aFilterName)); pGraphicLink->Connect(); } } @@ -606,13 +606,13 @@ void SdrGrafObj::ImpLinkAnmeldung() void SdrGrafObj::ImpLinkAbmeldung() { - sfx2::LinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL; + sfx2::LinkManager* pLinkManager = pModel != nullptr ? pModel->GetLinkManager() : nullptr; - if( pLinkManager != NULL && pGraphicLink!=NULL) + if( pLinkManager != nullptr && pGraphicLink!=nullptr) { // When using Remove, the *pGraphicLink is implicitly deleted pLinkManager->Remove( pGraphicLink ); - pGraphicLink=NULL; + pGraphicLink=nullptr; } } @@ -944,8 +944,8 @@ void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) void SdrGrafObj::SetPage( SdrPage* pNewPage ) { - bool bRemove = pNewPage == NULL && pPage != NULL; - bool bInsert = pNewPage != NULL && pPage == NULL; + bool bRemove = pNewPage == nullptr && pPage != nullptr; + bool bInsert = pNewPage != nullptr && pPage == nullptr; if( bRemove ) { @@ -953,7 +953,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage ) if( pGraphic->IsAnimated()) pGraphic->StopAnimation(); - if( pGraphicLink != NULL ) + if( pGraphicLink != nullptr ) ImpLinkAbmeldung(); } @@ -994,7 +994,7 @@ void SdrGrafObj::SetModel( SdrModel* pNewModel ) ForceSwapIn(); } - if( pGraphicLink != NULL ) + if( pGraphicLink != nullptr ) ImpLinkAbmeldung(); } @@ -1046,7 +1046,7 @@ GDIMetaFile SdrGrafObj::getMetafileFromEmbeddedSvg() const SdrObject* SdrGrafObj::DoConvertToPolyObj(bool bBezier, bool bAddText ) const { - SdrObject* pRetval = NULL; + SdrObject* pRetval = nullptr; GraphicType aGraphicType(GetGraphicType()); GDIMetaFile aMtf; @@ -1306,7 +1306,7 @@ IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* ) else if( pO->IsInSwapIn() ) { // can be loaded from the original document stream later - if( pModel != NULL ) + if( pModel != nullptr ) { if( pGraphic->HasUserData() ) { @@ -1317,9 +1317,9 @@ IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* ) std::unique_ptr<SvStream> const pStream( (xStream.is()) ? ::utl::UcbStreamHelper::CreateStream(xStream) - : 0 ); + : nullptr ); - if( pStream != 0 ) + if( pStream != nullptr ) { Graphic aGraphic; @@ -1346,7 +1346,7 @@ IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* ) if(!GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, aUserData, *pStream, - GRFILTER_FORMAT_DONTKNOW, NULL, GraphicFilterImportFlags::NONE, pFilterData.get())) + GRFILTER_FORMAT_DONTKNOW, nullptr, GraphicFilterImportFlags::NONE, pFilterData.get())) { const OUString aNewUserData( pGraphic->GetUserData() ); pGraphic->SetGraphic( aGraphic ); diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 7adae6656e4c..679b42842d5a 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -72,7 +72,7 @@ TYPEINIT1(SdrObjGroup,SdrObject); SdrObjGroup::SdrObjGroup() { - pSub=new SdrObjList(NULL,NULL); + pSub=new SdrObjList(nullptr,nullptr); pSub->SetOwnerObj(this); pSub->SetListKind(SDROBJLIST_GROUPOBJ); bRefPoint=false; @@ -511,7 +511,7 @@ void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt) void SdrObjGroup::SetSnapRect(const Rectangle& rRect) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); Rectangle aOld(GetSnapRect()); long nMulX=rRect.Right()-rRect.Left(); long nDivX=aOld.Right()-aOld.Left(); @@ -543,7 +543,7 @@ void SdrObjGroup::SetLogicRect(const Rectangle& rRect) void SdrObjGroup::Move(const Size& rSiz) { if (rSiz.Width()!=0 || rSiz.Height()!=0) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); MovePoint(aRefPoint,rSiz); if (pSub->GetObjCount()!=0) { // first move the connectors, then everything else @@ -587,7 +587,7 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio NbcMirrorGluePoints(aRef1,aRef2); } } - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); ResizePoint(aRefPoint,rRef,xFact,yFact); if (pSub->GetObjCount()!=0) { // move the connectors first, everything else afterwards @@ -617,7 +617,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nAngle, double sn, double cs) { if (nAngle!=0) { SetGlueReallyAbsolute(true); - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); RotatePoint(aRefPoint,rRef,sn,cs); // move the connectors first, everything else afterwards SdrObjList* pOL=pSub; @@ -642,7 +642,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nAngle, double sn, double cs) void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) { SetGlueReallyAbsolute(true); - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); MirrorPoint(aRefPoint,rRef1,rRef2); // implementation missing in SvdEtc! // move the connectors first, everything else afterwards SdrObjList* pOL=pSub; @@ -667,7 +667,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nAngle, double tn, bool bVShear) { if (nAngle!=0) { SetGlueReallyAbsolute(true); - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); ShearPoint(aRefPoint,rRef,tn); // move the connectors first, everything else afterwards SdrObjList* pOL=pSub; @@ -691,7 +691,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nAngle, double tn, bool bVShear) void SdrObjGroup::SetAnchorPos(const Point& rPnt) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); bool bChg=aAnchor!=rPnt; aAnchor=rPnt; Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y()); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index baec88151335..130710e740a9 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -423,7 +423,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& if (rPol.eUsedTextVPos==SDRMEASURETEXT_VERTICALCENTERED) { OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject(); - if (pOutlinerParaObject!=NULL && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1) + if (pOutlinerParaObject!=nullptr && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1) { bBrkLine=true; // dashed line if there's only on paragraph. } @@ -587,13 +587,13 @@ bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, { const SvxFieldData* pField=rField.GetField(); const SdrMeasureField* pMeasureField=dynamic_cast<const SdrMeasureField*>( pField ); - if (pMeasureField!=NULL) { + if (pMeasureField!=nullptr) { rRet = TakeRepresentation(pMeasureField->GetMeasureFieldKind()); - if (rpFldColor!=NULL) { + if (rpFldColor!=nullptr) { if (!bEdit) { delete rpFldColor; - rpFldColor=NULL; + rpFldColor=nullptr; } } return true; @@ -608,7 +608,7 @@ void SdrMeasureObj::UndirtyText() const { SdrOutliner& rOutliner=ImpGetDrawOutliner(); OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject(); - if(pOutlinerParaObject==NULL) + if(pOutlinerParaObject==nullptr) { rOutliner.QuickInsertField(SvxFieldItem(SdrMeasureField(SDRMEASUREFIELD_ROTA90BLANCS), EE_FEATURE_FIELD), ESelection(0,0)); rOutliner.QuickInsertField(SvxFieldItem(SdrMeasureField(SDRMEASUREFIELD_VALUE), EE_FEATURE_FIELD),ESelection(0,1)); @@ -910,7 +910,7 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c const SdrHdl* pHdl=rDrag.GetHdl(); sal_uInt32 nHdlNum(pHdl->GetObjHdlNum()); - bool bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); + bool bOrtho=rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho(); bool bBigOrtho=bOrtho && rDrag.GetView()->IsBigOrtho(); bool bBelow=rRec.bBelowRefEdge; Point aPt(rDrag.GetNow()); @@ -985,7 +985,7 @@ bool SdrMeasureObj::MovCreate(SdrDragStat& rStat) SdrView* pView=rStat.GetView(); aPt1=rStat.GetStart(); aPt2=rStat.GetNow(); - if (pView!=NULL && pView->IsCreate1stPointAsCenter()) { + if (pView!=nullptr && pView->IsCreate1stPointAsCenter()) { aPt1+=aPt1; aPt1-=rStat.Now(); } @@ -1477,7 +1477,7 @@ void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons if(aNewPt1 != aPt1 || aNewPt2 != aPt2) { // set model values and broadcast - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); aPt1 = aNewPt1; aPt2 = aNewPt2; diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 9735c4868041..64a07c6a1f09 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -266,7 +266,7 @@ uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream() if (!m_xImpl->m_pTempFile) { SAL_WARN("svx", "this is only intended for embedded media"); - return 0; + return nullptr; } ucbhelper::Content tempFile(m_xImpl->m_pTempFile->m_TempFileURL, uno::Reference<ucb::XCommandEnvironment>(), @@ -282,7 +282,7 @@ static bool lcl_HandleJsonPackageURL( OUString& o_rTempDirURL) { // Create a temporary folder which will contain all files of glTF model - o_rTempDirURL = ::utl::TempFile(NULL, true).GetURL(); + o_rTempDirURL = ::utl::TempFile(nullptr, true).GetURL(); const sal_uInt16 nPackageLength = OString("vnd.sun.star.Package:").getLength(); const OUString sUrlPath = rURL.copy(nPackageLength,rURL.lastIndexOf("/")-nPackageLength); @@ -342,7 +342,7 @@ static bool lcl_CopyToTempFile( { OUString tempFileURL; ::osl::FileBase::RC const err = - ::osl::FileBase::createTempFile(0, 0, & tempFileURL); + ::osl::FileBase::createTempFile(nullptr, nullptr, & tempFileURL); if (::osl::FileBase::E_None != err) { SAL_INFO("svx", "cannot create temp file"); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 268fccd9ae12..bec870ba25b7 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -190,7 +190,7 @@ void SdrLightEmbeddedClient_Impl::Release() { { SolarMutexGuard aGuard; - mpObj = NULL; + mpObj = nullptr; } release(); @@ -602,7 +602,7 @@ public: virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( const OUString& rMimeType, const css::uno::Any & rValue ) override; - bool Connect() { return GetRealObject() != NULL; } + bool Connect() { return GetRealObject() != nullptr; } }; @@ -693,9 +693,9 @@ public: SvxUnoShapeModifyListener* mpModifyListener; explicit SdrOle2ObjImpl( bool bFrame ) : - mpGraphic(NULL), - mpGraphicObject(NULL), - pLightClient (NULL), + mpGraphic(nullptr), + mpGraphicObject(nullptr), + pLightClient (nullptr), mbFrame(bFrame), mbInDestruction(false), mbSuppressSetVisAreaSize(false), @@ -703,17 +703,17 @@ public: mbIsChart(false), mbLoadingOLEObjectFailed(false), mbConnected(false), - mpObjectLink(NULL), - mpModifyListener(NULL) + mpObjectLink(nullptr), + mpModifyListener(nullptr) { mxObjRef.Lock(); } SdrOle2ObjImpl( bool bFrame, const svt::EmbeddedObjectRef& rObjRef ) : mxObjRef(rObjRef), - mpGraphic(NULL), - mpGraphicObject(NULL), - pLightClient (NULL), + mpGraphic(nullptr), + mpGraphicObject(nullptr), + pLightClient (nullptr), mbFrame(bFrame), mbInDestruction(false), mbSuppressSetVisAreaSize(false), @@ -721,8 +721,8 @@ public: mbIsChart(false), mbLoadingOLEObjectFailed(false), mbConnected(false), - mpObjectLink(NULL), - mpModifyListener(NULL) + mpObjectLink(nullptr), + mpModifyListener(nullptr) { mxObjRef.Lock(); } @@ -826,7 +826,7 @@ SdrOle2Obj::~SdrOle2Obj() if ( mpImpl->pLightClient ) { mpImpl->pLightClient->Release(); - mpImpl->pLightClient = NULL; + mpImpl->pLightClient = nullptr; } delete mpImpl; @@ -863,9 +863,9 @@ void SdrOle2Obj::SetGraphic_Impl(const Graphic* pGrf) if (mpImpl->mpGraphic) { delete mpImpl->mpGraphic; - mpImpl->mpGraphic = NULL; + mpImpl->mpGraphic = nullptr; delete mpImpl->mpGraphicObject; - mpImpl->mpGraphicObject = NULL; + mpImpl->mpGraphicObject = nullptr; } if (pGrf) @@ -926,11 +926,11 @@ bool SdrOle2Obj::UpdateLinkURL_Impl() if ( mpImpl->mpObjectLink ) { - sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : NULL; + sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : nullptr; if ( pLinkManager ) { OUString aNewLinkURL; - sfx2::LinkManager::GetDisplayNames( mpImpl->mpObjectLink, 0, &aNewLinkURL ); + sfx2::LinkManager::GetDisplayNames( mpImpl->mpObjectLink, nullptr, &aNewLinkURL ); if ( !aNewLinkURL.equalsIgnoreAsciiCase( mpImpl->maLinkURL ) ) { GetObjRef_Impl(); @@ -1015,11 +1015,11 @@ void SdrOle2Obj::BreakFileLink_Impl() void SdrOle2Obj::DisconnectFileLink_Impl() { - sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : NULL; + sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : nullptr; if ( pLinkManager && mpImpl->mpObjectLink ) { pLinkManager->Remove( mpImpl->mpObjectLink ); - mpImpl->mpObjectLink = NULL; + mpImpl->mpObjectLink = nullptr; } } @@ -1250,7 +1250,7 @@ void SdrOle2Obj::Disconnect_Impl() if ( pContainer ) { pContainer->CloseEmbeddedObject( mpImpl->mxObjRef.GetObject() ); - mpImpl->mxObjRef.AssignToContainer( NULL, mpImpl->aPersistName ); + mpImpl->mxObjRef.AssignToContainer( nullptr, mpImpl->aPersistName ); } // happens later than the destruction of the model, so we can't assert that). @@ -1285,7 +1285,7 @@ void SdrOle2Obj::Disconnect_Impl() // TODO/LATER: mpImpl->aPersistName contains outdated information, to keep it updated // it should be returned from RemoveEmbeddedObject call. Currently it is no problem, // since no container is adjusted, actually the empty string could be provided as a name here - mpImpl->mxObjRef.AssignToContainer( NULL, mpImpl->aPersistName ); + mpImpl->mxObjRef.AssignToContainer( nullptr, mpImpl->aPersistName ); } DisconnectFileLink_Impl(); @@ -1297,7 +1297,7 @@ void SdrOle2Obj::Disconnect_Impl() { mpImpl->mxObjRef->removeStateChangeListener ( mpImpl->pLightClient ); mpImpl->mxObjRef->removeEventListener( uno::Reference< document::XEventListener >( mpImpl->pLightClient ) ); - mpImpl->mxObjRef->setClientSite( NULL ); + mpImpl->mxObjRef->setClientSite( nullptr ); GetSdrGlobalData().GetOLEObjCache().RemoveObj(this); } @@ -1390,15 +1390,15 @@ SdrObject* SdrOle2Obj::DoConvertToPolyObj(bool bBezier, bool bAddText) const } } - return 0; + return nullptr; } void SdrOle2Obj::SetModel(SdrModel* pNewModel) { - ::comphelper::IEmbeddedHelper* pDestPers = pNewModel ? pNewModel->GetPersist() : 0; - ::comphelper::IEmbeddedHelper* pSrcPers = pModel ? pModel->GetPersist() : 0; + ::comphelper::IEmbeddedHelper* pDestPers = pNewModel ? pNewModel->GetPersist() : nullptr; + ::comphelper::IEmbeddedHelper* pSrcPers = pModel ? pModel->GetPersist() : nullptr; if ( pNewModel == pModel ) { @@ -1473,8 +1473,8 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) void SdrOle2Obj::SetPage(SdrPage* pNewPage) { - bool bRemove=pNewPage==NULL && pPage!=NULL; - bool bInsert=pNewPage!=NULL && pPage==NULL; + bool bRemove=pNewPage==nullptr && pPage!=nullptr; + bool bInsert=pNewPage!=nullptr && pPage==nullptr; if (bRemove && mpImpl->mbConnected ) Disconnect(); @@ -1579,7 +1579,7 @@ void SdrOle2Obj::AbandonObject() { mpImpl->aPersistName.clear(); mpImpl->mbLoadingOLEObjectFailed = false; - SetObjRef(0); + SetObjRef(nullptr); } @@ -1654,7 +1654,7 @@ SdrOle2Obj* SdrOle2Obj::CloneWithShellIDs( const OUString& rSrcShellID, const OU { SdrOle2Obj* pObj = dynamic_cast<SdrOle2Obj*>( - SdrObjFactory::MakeNewObject(GetObjInventor(), GetObjIdentifier(), NULL)); + SdrObjFactory::MakeNewObject(GetObjInventor(), GetObjIdentifier(), nullptr)); if (pObj) pObj->assignFrom(*this, rSrcShellID, rDestShellID); @@ -2072,7 +2072,7 @@ void SdrOle2Obj::GetObjRef_Impl() // perhaps preview not valid anymore // This line changes the modified state of the model - SetGraphic_Impl( NULL ); + SetGraphic_Impl( nullptr ); // if status was not set before, force it back // to not set, so that SetGraphic(0L) above does not diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 568aa4ea7a10..33ea8b5839cd 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -60,7 +60,7 @@ void SdrPageObj::PageInDestruction(const SdrPage& rPage) // lead to the construction of a view contact object for a page that // is being destroyed. - mpShownPage = 0L; + mpShownPage = nullptr; } } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 3f047239b3be..0b41030f8f50 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -149,7 +149,7 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl const SdrMarkView& rMarkView = *rDrag.GetView(); const SdrHdlList& rHdlList = rMarkView.GetHdlList(); const size_t nHdlCount = rHdlList.GetHdlCount(); - const SdrObject* pInteractionObject(nHdlCount && rHdlList.GetHdl(0) ? rHdlList.GetHdl(0)->GetObj() : 0); + const SdrObject* pInteractionObject(nHdlCount && rHdlList.GetHdl(0) ? rHdlList.GetHdl(0)->GetObj() : nullptr); for(size_t a = 0; a < nHdlCount; ++a) { @@ -343,7 +343,7 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi aCircCenter.X()+=Round(nRad*cos((nTangAngle-9000)*nPi180)); aCircCenter.Y()-=Round(nRad*sin((nTangAngle-9000)*nPi180)); } - bAngleSnap=pView!=NULL && pView->IsAngleSnapEnabled(); + bAngleSnap=pView!=nullptr && pView->IsAngleSnapEnabled(); if (bAngleSnap) { long nSA=pView->GetSnapAngle(); if (nSA!=0) { // angle snapping @@ -402,7 +402,7 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr long y2=BigMulDiv(x,nDirY,nDirX); long l1=std::abs(x1)+std::abs(y1); long l2=std::abs(x2)+std::abs(y2); - if ((l1<=l2) != (pView!=NULL && pView->IsBigOrtho())) { + if ((l1<=l2) != (pView!=nullptr && pView->IsBigOrtho())) { x=x1; y=y1; } else { x=x2; y=y2; @@ -422,7 +422,7 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point long nDirY=rDir.Y(); Point aP1(CalcLine(aTmpPt, nDirX, nDirY,pView)); aP1-=aTmpPt; long nQ1=std::abs(aP1.X())+std::abs(aP1.Y()); Point aP2(CalcLine(aTmpPt, nDirY,-nDirX,pView)); aP2-=aTmpPt; long nQ2=std::abs(aP2.X())+std::abs(aP2.Y()); - if (pView!=NULL && pView->IsOrtho()) nQ1=0; // Ortho turns off at right angle + if (pView!=nullptr && pView->IsOrtho()) nQ1=0; // Ortho turns off at right angle bLine90=nQ1>2*nQ2; if (!bLine90) { // smooth transition aLineEnd+=aP1; @@ -470,7 +470,7 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point } aRectP2.X()+=x; aRectP2.Y()+=y; - if (pView!=NULL && pView->IsOrtho()) { + if (pView!=nullptr && pView->IsOrtho()) { long dx1=aRectP2.X()-aRectP1.X(); long dx1a=std::abs(dx1); long dy1=aRectP2.Y()-aRectP1.Y(); long dy1a=std::abs(dy1); long dx2=aRectP3.X()-aRectP2.X(); long dx2a=std::abs(dx2); @@ -546,7 +546,7 @@ ImpPathForDragAndCreate::ImpPathForDragAndCreate(SdrPathObj& rSdrPathObject) : mrSdrPathObject(rSdrPathObject), aPathPolygon(rSdrPathObject.GetPathPoly()), meObjectKind(mrSdrPathObject.meKind), - mpSdrPathDragData(0), + mpSdrPathDragData(nullptr), mbCreating(false) { } @@ -575,7 +575,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const const SdrMarkView& rMarkView = *rDrag.GetView(); const SdrHdlList& rHdlList = rMarkView.GetHdlList(); const size_t nHdlCount = rHdlList.GetHdlCount(); - const SdrObject* pInteractionObject(nHdlCount && rHdlList.GetHdl(0) ? rHdlList.GetHdl(0)->GetObj() : 0); + const SdrObject* pInteractionObject(nHdlCount && rHdlList.GetHdl(0) ? rHdlList.GetHdl(0)->GetObj() : nullptr); sal_uInt32 nSelectedPoints(0); for(size_t a = 0; a < nHdlCount; ++a) @@ -598,7 +598,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const { OSL_FAIL("ImpPathForDragAndCreate::BegDrag(): ImpSdrPathDragData is invalid."); delete mpSdrPathDragData; - const_cast<ImpPathForDragAndCreate*>(this)->mpSdrPathDragData = 0; + const_cast<ImpPathForDragAndCreate*>(this)->mpSdrPathDragData = nullptr; return false; } @@ -680,7 +680,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const bool bNextIsControl =mpSdrPathDragData->bNextIsControl; // if nPnt is a support point: there's a control point after // Ortho for lines/polygons: keep angle - if (!bControl && rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho()) { + if (!bControl && rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho()) { bool bBigOrtho=rDrag.GetView()->IsBigOrtho(); Point aPos(rDrag.GetNow()); // current position Point aPnt(mpSdrPathDragData->aXP[nPnt]); // the dragged point @@ -753,7 +753,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const rDrag.SetActionRect(Rectangle(rDrag.GetNow(),rDrag.GetNow())); // specially for IBM: Eliminate points if both adjoining lines form near 180 degrees angle anyway - if (!bControl && rDrag.GetView()!=NULL && rDrag.GetView()->IsEliminatePolyPoints() && + if (!bControl && rDrag.GetView()!=nullptr && rDrag.GetView()->IsEliminatePolyPoints() && !bBegPnt && !bEndPnt && !bPrevIsControl && !bNextIsControl) { Point aPt(mpSdrPathDragData->aXP[nNextPnt]); @@ -924,7 +924,7 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag) } delete mpSdrPathDragData; - mpSdrPathDragData = 0; + mpSdrPathDragData = nullptr; return true; } @@ -1278,7 +1278,7 @@ bool ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat) mbCreating=true; bool bMakeStartPoint = true; SdrView* pView=rStat.GetView(); - if (pView!=NULL && pView->IsUseIncompatiblePathCreateInterface() && + if (pView!=nullptr && pView->IsUseIncompatiblePathCreateInterface() && (meObjectKind==OBJ_POLY || meObjectKind==OBJ_PLIN || meObjectKind==OBJ_PATHLINE || meObjectKind==OBJ_PATHFILL)) { bMakeStartPoint = false; } @@ -1299,7 +1299,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) ImpPathCreateUser* pU=static_cast<ImpPathCreateUser*>(rStat.GetUser()); SdrView* pView=rStat.GetView(); XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; - if (pView!=NULL && pView->IsCreateMode()) { + if (pView!=nullptr && pView->IsCreateMode()) { // switch to different CreateTool, if appropriate sal_uInt16 nIdent; sal_uInt32 nInvent; @@ -1338,20 +1338,20 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) rXPoly[nActPoint]=rStat.Now(); if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE && rXPoly.GetPointCount()>=1) { Point aPt(rStat.Start()); - if (pView!=NULL && pView->IsCreate1stPointAsCenter()) { + if (pView!=nullptr && pView->IsCreate1stPointAsCenter()) { aPt+=aPt; aPt-=rStat.Now(); } rXPoly[0]=aPt; } - OutputDevice* pOut=pView==NULL ? NULL : pView->GetFirstOutputDevice(); + OutputDevice* pOut=pView==nullptr ? nullptr : pView->GetFirstOutputDevice(); if (bFreeHand) { if (pU->nBezierStartPoint>nActPoint) pU->nBezierStartPoint=nActPoint; if (rStat.IsMouseDown() && nActPoint>0) { // don't allow two consecutive points to occupy too similar positions long nMinDist=1; - if (pView!=NULL) nMinDist=pView->GetFreeHandMinDistPix(); - if (pOut!=NULL) nMinDist=pOut->PixelToLogic(Size(nMinDist,0)).Width(); + if (pView!=nullptr) nMinDist=pView->GetFreeHandMinDistPix(); + if (pOut!=nullptr) nMinDist=pOut->PixelToLogic(Size(nMinDist,0)).Width(); if (nMinDist<1) nMinDist=1; Point aPt0(rXPoly[nActPoint-1]); @@ -1406,7 +1406,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) ImpPathCreateUser* pU=static_cast<ImpPathCreateUser*>(rStat.GetUser()); bool bRet = false; SdrView* pView=rStat.GetView(); - bool bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface(); + bool bIncomp=pView!=nullptr && pView->IsUseIncompatiblePathCreateInterface(); XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; sal_uInt16 nActPoint=rXPoly.GetPointCount()-1; rXPoly[nActPoint]=rStat.Now(); @@ -1416,7 +1416,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if (bRet) { mbCreating = false; delete pU; - rStat.SetUser(NULL); + rStat.SetUser(nullptr); } return bRet; } @@ -1427,7 +1427,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if (bRet) { mbCreating=false; delete pU; - rStat.SetUser(NULL); + rStat.SetUser(nullptr); } return bRet; } @@ -1511,7 +1511,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if (bRet) { mbCreating=false; delete pU; - rStat.SetUser(NULL); + rStat.SetUser(nullptr); } return bRet; } @@ -1562,7 +1562,7 @@ void ImpPathForDragAndCreate::BrkCreate(SdrDragStat& rStat) aPathPolygon.Clear(); mbCreating=false; delete pU; - rStat.SetUser(NULL); + rStat.SetUser(nullptr); } basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeObjectPolyPolygon(const SdrDragStat& rDrag) const @@ -1668,7 +1668,7 @@ TYPEINIT1(SdrPathObj,SdrTextObj); SdrPathObj::SdrPathObj(SdrObjKind eNewKind) : meKind(eNewKind), - mpDAC(0L), + mpDAC(nullptr), mdBrightness(1.0) { bClosedObj = IsClosed(); @@ -1677,7 +1677,7 @@ SdrPathObj::SdrPathObj(SdrObjKind eNewKind) SdrPathObj::SdrPathObj(SdrObjKind eNewKind, const basegfx::B2DPolyPolygon& rPathPoly, double dBrightness) : maPathPolygon(rPathPoly), meKind(eNewKind), - mpDAC(0L), + mpDAC(nullptr), mdBrightness(dBrightness) { bClosedObj = IsClosed(); @@ -2032,8 +2032,8 @@ SdrHdl* SdrPathObj::GetHdl(sal_uInt32 nHdlNum) const OSL_FAIL("SdrPathObj::GetHdl(): ineffective, use AddToHdlList instead (!)"); // to have an alternative, get single handle using the ineffective way - SdrHdl* pRetval = 0; - SdrHdlList aLocalList(0); + SdrHdl* pRetval = nullptr; + SdrHdlList aLocalList(nullptr); AddToHdlList(aLocalList); const sal_uInt32 nHdlCount(aLocalList.GetHdlCount()); @@ -2110,7 +2110,7 @@ SdrHdl* SdrPathObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlusNum) const { // keep old stuff to be able to keep old SdrHdl stuff, too const XPolyPolygon aOldPathPolygon(GetPathPoly()); - SdrHdl* pHdl = 0L; + SdrHdl* pHdl = nullptr; sal_uInt16 nPnt = (sal_uInt16)rHdl.GetPointNum(); sal_uInt16 nPolyNum = (sal_uInt16)rHdl.GetPolyNum(); @@ -2688,7 +2688,7 @@ sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, bo SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index) { - SdrPathObj* pNewObj = 0L; + SdrPathObj* pNewObj = nullptr; const basegfx::B2DPolyPolygon aLocalPolyPolygon(GetPathPoly()); sal_uInt32 nPoly, nPnt; @@ -2741,7 +2741,7 @@ SdrObject* SdrPathObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const !aText.isDefault() && !aText.getSdrFormTextAttribute().isDefault() && aText.isHideContour()); SdrObject* pRet = bHideContour ? - 0 : + nullptr : ImpConvertMakeObj(GetPathPoly(), IsClosed(), bBezier); SdrPathObj* pPath = dynamic_cast<SdrPathObj*>( pRet ); @@ -2810,7 +2810,7 @@ void SdrPathObj::SetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly) { if(GetPathPoly() != rPathPoly) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcSetPathPoly(rPathPoly); SetChanged(); BroadcastObjectChange(); @@ -2821,7 +2821,7 @@ void SdrPathObj::SetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly) void SdrPathObj::ToggleClosed() { Rectangle aBoundRect0; - if(pUserCall != NULL) + if(pUserCall != nullptr) aBoundRect0 = GetLastBoundRect(); ImpSetClosed(!IsClosed()); // set new ObjKind ImpForceKind(); // because we want Line -> Poly -> PolyLine instead of Line -> Poly -> Line @@ -2852,7 +2852,7 @@ void SdrPathObj::impDeleteDAC() const if(mpDAC) { delete mpDAC; - const_cast<SdrPathObj*>(this)->mpDAC = 0L; + const_cast<SdrPathObj*>(this)->mpDAC = nullptr; } } diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 97a69da772de..1750e0c647cc 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -66,21 +66,21 @@ sdr::contact::ViewContact* SdrRectObj::CreateObjectSpecificViewContact() TYPEINIT1(SdrRectObj,SdrTextObj); SdrRectObj::SdrRectObj() -: mpXPoly(0L) +: mpXPoly(nullptr) { bClosedObj=true; } SdrRectObj::SdrRectObj(const Rectangle& rRect) : SdrTextObj(rRect), - mpXPoly(NULL) + mpXPoly(nullptr) { bClosedObj=true; } SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind) : SdrTextObj(eNewTextKind), - mpXPoly(NULL) + mpXPoly(nullptr) { DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, @@ -90,7 +90,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind) SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect) : SdrTextObj(eNewTextKind,rRect), - mpXPoly(NULL) + mpXPoly(nullptr) { DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, @@ -115,7 +115,7 @@ SdrRectObj& SdrRectObj::operator=(const SdrRectObj& rCopy) if ( rCopy.mpXPoly ) mpXPoly = new XPolygon( *rCopy.mpXPoly ); else - mpXPoly = NULL; + mpXPoly = nullptr; return *this; } @@ -123,7 +123,7 @@ SdrRectObj& SdrRectObj::operator=(const SdrRectObj& rCopy) void SdrRectObj::SetXPolyDirty() { delete mpXPoly; - mpXPoly = 0L; + mpXPoly = nullptr; } XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const @@ -320,7 +320,7 @@ sal_uInt32 SdrRectObj::GetHdlCount() const SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const { - SdrHdl* pH = NULL; + SdrHdl* pH = nullptr; Point aPnt; SdrHdlKind eKind = HDL_MOVE; @@ -594,7 +594,7 @@ SdrObject* SdrRectObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const basegfx::B2DPolyPolygon aPolyPolygon(aXP.getB2DPolygon()); aPolyPolygon.removeDoublePoints(); - SdrObject* pRet = 0L; + SdrObject* pRet = nullptr; // small correction: Do not create something when no fill and no line. To // be sure to not damage something with non-text frames, do this only diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 21663ee3a835..5a5796d7e63c 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -86,9 +86,9 @@ TYPEINIT1(SdrTextObj,SdrAttrObj); SdrTextObj::SdrTextObj() : SdrAttrObj(), - mpText(NULL), - pEdtOutl(NULL), - pFormTextBoundRect(NULL), + mpText(nullptr), + pEdtOutl(nullptr), + pFormTextBoundRect(nullptr), eTextKind(OBJ_TEXT) { bTextSizeDirty=false; @@ -115,9 +115,9 @@ SdrTextObj::SdrTextObj() SdrTextObj::SdrTextObj(const Rectangle& rNewRect) : SdrAttrObj(), maRect(rNewRect), - mpText(NULL), - pEdtOutl(NULL), - pFormTextBoundRect(NULL), + mpText(nullptr), + pEdtOutl(nullptr), + pFormTextBoundRect(nullptr), eTextKind(OBJ_TEXT) { bTextSizeDirty=false; @@ -144,9 +144,9 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect) SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind) : SdrAttrObj(), - mpText(NULL), - pEdtOutl(NULL), - pFormTextBoundRect(NULL), + mpText(nullptr), + pEdtOutl(nullptr), + pFormTextBoundRect(nullptr), eTextKind(eNewTextKind) { bTextSizeDirty=false; @@ -173,9 +173,9 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind) SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect) : SdrAttrObj(), maRect(rNewRect), - mpText(NULL), - pEdtOutl(NULL), - pFormTextBoundRect(NULL), + mpText(nullptr), + pEdtOutl(nullptr), + pFormTextBoundRect(nullptr), eTextKind(eNewTextKind) { bTextSizeDirty=false; @@ -206,7 +206,7 @@ SdrTextObj::~SdrTextObj() { SdrOutliner& rOutl = pModel->GetHitTestOutliner(); if( rOutl.GetTextObj() == this ) - rOutl.SetTextObj( NULL ); + rOutl.SetTextObj( nullptr ); } delete mpText; @@ -218,11 +218,11 @@ SdrTextObj::~SdrTextObj() void SdrTextObj::FitFrameToTextSize() { - DBG_ASSERT(pModel!=NULL,"SdrTextObj::FitFrameToTextSize(): pModel=NULL!"); + DBG_ASSERT(pModel!=nullptr,"SdrTextObj::FitFrameToTextSize(): pModel=NULL!"); ImpJustifyRect(maRect); SdrText* pText = getActiveText(); - if( pText!=NULL && pText->GetOutlinerParaObject() && pModel!=NULL) + if( pText!=nullptr && pText->GetOutlinerParaObject() && pModel!=nullptr) { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(Size(maRect.Right()-maRect.Left(),maRect.Bottom()-maRect.Top())); @@ -258,7 +258,7 @@ void SdrTextObj::NbcSetText(const OUString& rStr) void SdrTextObj::SetText(const OUString& rStr) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcSetText(rStr); SetChanged(); BroadcastObjectChange(); @@ -281,7 +281,7 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt void SdrTextObj::SetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcSetText(rInput,rBaseURL,eFormat); SetChanged(); BroadcastObjectChange(); @@ -482,7 +482,7 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner ) { Paragraph* p1stPara=pOutliner->GetParagraph( 0 ); sal_Int32 nParaCount=pOutliner->GetParagraphCount(); - if(p1stPara==NULL) + if(p1stPara==nullptr) nParaCount=0; if(nParaCount==1) @@ -504,8 +504,8 @@ bool SdrTextObj::HasEditText() const void SdrTextObj::SetPage(SdrPage* pNewPage) { - bool bRemove=pNewPage==NULL && pPage!=NULL; - bool bInsert=pNewPage!=NULL && pPage==NULL; + bool bRemove=pNewPage==nullptr && pPage!=nullptr; + bool bInsert=pNewPage!=nullptr && pPage==nullptr; bool bLinked=IsLinkedText(); if (bLinked && bRemove) { @@ -534,7 +534,7 @@ void SdrTextObj::SetModel(SdrModel* pNewModel) if( bChg ) { - if( pNewModel != 0 && pOldModel != 0 ) + if( pNewModel != nullptr && pOldModel != nullptr ) SetTextSizeDirty(); sal_Int32 nCount = getTextCount(); @@ -619,7 +619,7 @@ void SdrTextObj::AdaptTextMinSize() void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const { basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly()); - basegfx::B2DPolyPolygon* pContourPolyPolygon = 0L; + basegfx::B2DPolyPolygon* pContourPolyPolygon = nullptr; basegfx::B2DHomMatrix aMatrix(basegfx::tools::createTranslateB2DHomMatrix( -rAnchorRect.Left(), -rAnchorRect.Top())); @@ -792,7 +792,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo // put text into the outliner, if available from the edit outliner SdrText* pText = getActiveText(); - OutlinerParaObject* pOutlinerParaObject = pText ? pText->GetOutlinerParaObject() : 0; + OutlinerParaObject* pOutlinerParaObject = pText ? pText->GetOutlinerParaObject() : nullptr; OutlinerParaObject* pPara = (pEdtOutl && !bNoEditText) ? pEdtOutl->CreateParaObject() : pOutlinerParaObject; if (pPara) @@ -817,7 +817,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo } else { - rOutliner.SetTextObj( NULL ); + rOutliner.SetTextObj( nullptr ); } if (pEdtOutl && !bNoEditText && pPara) @@ -888,7 +888,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const { - OutlinerParaObject* pPara=NULL; + OutlinerParaObject* pPara=nullptr; if( HasTextImpl( pEdtOutl ) ) { sal_Int32 nParaCount = pEdtOutl->GetParagraphCount(); @@ -909,7 +909,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS OUString aTestString(static_cast<sal_Unicode>('J')); if(pMtf && (!pMtf->IsRecord() || pMtf->IsPause())) - pMtf = NULL; + pMtf = nullptr; if(pMtf) pMtf->Pause(true); @@ -1117,14 +1117,14 @@ SdrTextObj& SdrTextObj::operator=(const SdrTextObj& rObj) bNoMirror = rObj.bNoMirror; bDisableAutoWidthOnDragging = rObj.bDisableAutoWidthOnDragging; - OutlinerParaObject* pNewOutlinerParaObject = 0; + OutlinerParaObject* pNewOutlinerParaObject = nullptr; SdrText* pText = getActiveText(); if( pText && rObj.HasText() ) { const Outliner* pEO=rObj.pEdtOutl; - if (pEO!=NULL) + if (pEO!=nullptr) { pNewOutlinerParaObject = pEO->CreateParaObject(); } @@ -1406,7 +1406,7 @@ OutlinerParaObject* SdrTextObj::GetOutlinerParaObject() const if( pText ) return pText->GetOutlinerParaObject(); else - return 0; + return nullptr; } void SdrTextObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) @@ -1479,7 +1479,7 @@ void SdrTextObj::ReformatText() if(GetOutlinerParaObject()) { Rectangle aBoundRect0; - if (pUserCall!=NULL) + if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcReformatText(); @@ -1529,7 +1529,7 @@ const Rectangle& SdrTextObj::GetGeoRect() const void SdrTextObj::ForceOutlinerParaObject() { SdrText* pText = getActiveText(); - if( pText && (pText->GetOutlinerParaObject() == 0) ) + if( pText && (pText->GetOutlinerParaObject() == nullptr) ) { sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT; if( IsTextFrame() && eTextKind == OBJ_OUTLINETEXT ) @@ -1884,7 +1884,7 @@ SdrTextAniDirection SdrTextObj::GetTextAniDirection() const GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle( Rectangle& rScrollRectangle, Rectangle& rPaintRectangle) { - GDIMetaFile* pRetval = 0L; + GDIMetaFile* pRetval = nullptr; SdrOutliner& rOutliner = ImpGetDrawOutliner(); Rectangle aTextRect; Rectangle aAnchorRect; @@ -1996,7 +1996,7 @@ SdrObject *ImpGetObjByName(SdrObjList *pObjList, OUString const& aObjName) } } // not found - return NULL; + return nullptr; } // XXX: Make it a (private) method of SdrTextObj @@ -2006,7 +2006,7 @@ void ImpUpdateChainLinks(SdrTextObj *pTextObj, OUString const& aNextLinkName) // No next link if (aNextLinkName.isEmpty()) { - pTextObj->SetNextLinkInChain(NULL); + pTextObj->SetNextLinkInChain(nullptr); return; } @@ -2097,7 +2097,7 @@ void SdrTextObj::SetNextLinkInChain(SdrTextObj *pNextObj) mpNextInChain = pNextObj; // Deal with old next link's prev link if (pOldNextObj) { - pOldNextObj->mpPrevInChain = NULL; + pOldNextObj->mpPrevInChain = nullptr; } // Deal with new next link's prev link @@ -2105,7 +2105,7 @@ void SdrTextObj::SetNextLinkInChain(SdrTextObj *pNextObj) // If there is a prev already at all and this is not already the current object if (mpNextInChain->mpPrevInChain && mpNextInChain->mpPrevInChain != this) - mpNextInChain->mpPrevInChain->mpNextInChain = NULL; + mpNextInChain->mpPrevInChain->mpNextInChain = nullptr; mpNextInChain->mpPrevInChain = this; } @@ -2140,7 +2140,7 @@ bool SdrTextObj::GetPreventChainable() const { SdrObject *pClone = SdrAttrObj::getFullDragClone(); SdrTextObj *pTextObjClone = dynamic_cast<SdrTextObj *>(pClone); - if (pTextObjClone != NULL) { + if (pTextObjClone != nullptr) { // Avoid transferring of text for chainable object during dragging pTextObjClone->SetPreventChainable(); } @@ -2164,13 +2164,13 @@ SdrText* SdrTextObj::getText( sal_Int32 nIndex ) const { if( nIndex == 0 ) { - if( mpText == 0 ) + if( mpText == nullptr ) const_cast< SdrTextObj* >(this)->mpText = new SdrText( *(const_cast< SdrTextObj* >(this)) ); return mpText; } else { - return 0; + return nullptr; } } diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 5e2c38069548..4630658bf8f1 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -273,7 +273,7 @@ namespace const bool bWordLineMode(rInfo.mrFont.IsWordLineMode() && !rInfo.mbEndOfBullet); // prepare new primitive - drawinglayer::primitive2d::BasePrimitive2D* pNewPrimitive = 0; + drawinglayer::primitive2d::BasePrimitive2D* pNewPrimitive = nullptr; const bool bDecoratedIsNeeded( UNDERLINE_NONE != rInfo.mrFont.GetOverline() || UNDERLINE_NONE != rInfo.mrFont.GetUnderline() @@ -715,7 +715,7 @@ void SdrTextObj::impDecomposeContourTextPrimitive( // cleanup outliner rOutliner.Clear(); - rOutliner.setVisualizedPage(0); + rOutliner.setVisualizedPage(nullptr); rTarget = aConverter.getPrimitive2DSequence(); } @@ -848,7 +848,7 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive( // cleanup outliner rOutliner.Clear(); - rOutliner.setVisualizedPage(0); + rOutliner.setVisualizedPage(nullptr); rOutliner.SetControlWord(nOriginalControlWord); rTarget = aConverter.getPrimitive2DSequence(); @@ -1091,7 +1091,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( // cleanup outliner rOutliner.SetBackgroundColor(aOriginalBackColor); rOutliner.Clear(); - rOutliner.setVisualizedPage(0); + rOutliner.setVisualizedPage(nullptr); rTarget = aConverter.getPrimitive2DSequence(); } @@ -1169,7 +1169,7 @@ void SdrTextObj::impDecomposeStretchTextPrimitive( // cleanup outliner rOutliner.SetControlWord(nOriginalControlWord); rOutliner.Clear(); - rOutliner.setVisualizedPage(0); + rOutliner.setVisualizedPage(nullptr); rTarget = aConverter.getPrimitive2DSequence(); } @@ -1592,7 +1592,7 @@ void SdrTextObj::impDecomposeChainedTextPrimitive( // cleanup outliner rOutliner.Clear(); - rOutliner.setVisualizedPage(0); + rOutliner.setVisualizedPage(nullptr); rOutliner.SetControlWord(nOriginalControlWord); rTarget = aConverter.getPrimitive2DSequence(); diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index a3b817106559..78fc7e796708 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -792,7 +792,7 @@ void SdrTextObj::impDecomposePathTextPrimitive( // clean up outliner rOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>()); rOutliner.Clear(); - rOutliner.setVisualizedPage(0); + rOutliner.setVisualizedPage(nullptr); // concatenate all results drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(rTarget, aRetvalA); diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 62ea55429018..04c39c959932 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -279,7 +279,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) Rectangle aNeuRect(maRect); bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); if (bRet) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); maRect = aNeuRect; SetRectsDirty(); if (HAS_BASE(SdrRectObj,this)) { // this is a hack @@ -297,12 +297,12 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) void SdrTextObj::ImpSetTextStyleSheetListeners() { - SfxStyleSheetBasePool* pStylePool=pModel!=NULL ? pModel->GetStyleSheetPool() : NULL; - if (pStylePool!=NULL) + SfxStyleSheetBasePool* pStylePool=pModel!=nullptr ? pModel->GetStyleSheetPool() : nullptr; + if (pStylePool!=nullptr) { std::vector<OUString> aStyleNames; OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); - if (pOutlinerParaObject!=NULL) + if (pOutlinerParaObject!=nullptr) { // First, we collect all stylesheets contained in the ParaObject in // the container aStyles. The Family is always appended to the name @@ -348,7 +348,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() SfxStyleFamily eFam = ReadFamilyFromStyleName(aName); SfxStyleSheetBase* pStyleBase = pStylePool->Find(aName,eFam); SfxStyleSheet* pStyle = dynamic_cast<SfxStyleSheet*>( pStyleBase ); - if (pStyle!=NULL && pStyle!=GetStyleSheet()) { + if (pStyle!=nullptr && pStyle!=GetStyleSheet()) { aStyleSheets.insert(pStyle); } } @@ -358,7 +358,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() nNum--; SfxBroadcaster* pBroadcast=GetBroadcasterJOE((sal_uInt16)nNum); SfxStyleSheet* pStyle=dynamic_cast<SfxStyleSheet*>( pBroadcast ); - if (pStyle!=NULL && pStyle!=GetStyleSheet()) { // special case for stylesheet of the object + if (pStyle!=nullptr && pStyle!=GetStyleSheet()) { // special case for stylesheet of the object if (aStyleSheets.find(pStyle)==aStyleSheets.end()) { EndListening(*pStyle); } @@ -384,11 +384,11 @@ void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& while( --nText >= 0 ) { SdrText* pText = getText( nText ); - OutlinerParaObject* pOutlinerParaObject = pText ? pText->GetOutlinerParaObject() : 0; + OutlinerParaObject* pOutlinerParaObject = pText ? pText->GetOutlinerParaObject() : nullptr; if(pOutlinerParaObject) { - Outliner* pOutliner = 0; + Outliner* pOutliner = nullptr; if( pEdtOutl || (pText == getActiveText()) ) pOutliner = pEdtOutl; diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 954d36c8a430..95a419b36362 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -39,7 +39,7 @@ sal_uInt32 SdrTextObj::GetHdlCount() const SdrHdl* SdrTextObj::GetHdl(sal_uInt32 nHdlNum) const { - SdrHdl* pH=NULL; + SdrHdl* pH=nullptr; Point aPnt; SdrHdlKind eKind=HDL_MOVE; switch (nHdlNum) { @@ -73,9 +73,9 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const { Rectangle aTmpRect(maRect); const SdrHdl* pHdl=rDrag.GetHdl(); - SdrHdlKind eHdl=pHdl==NULL ? HDL_MOVE : pHdl->GetKind(); + SdrHdlKind eHdl=pHdl==nullptr ? HDL_MOVE : pHdl->GetKind(); bool bEcke=(eHdl==HDL_UPLFT || eHdl==HDL_UPRGT || eHdl==HDL_LWLFT || eHdl==HDL_LWRGT); - bool bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); + bool bOrtho=rDrag.GetView()!=nullptr && rDrag.GetView()->IsOrtho(); bool bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho(); Point aPos(rDrag.GetNow()); // Unrotate: diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index b2cc9d68eccd..9df962bed61e 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -40,7 +40,7 @@ bool SdrTextObj::HasTextEdit() const bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) { - if (pEdtOutl!=NULL) return false; // Textedit might already run in another View! + if (pEdtOutl!=nullptr) return false; // Textedit might already run in another View! pEdtOutl=&rOutl; mbInEditMode = true; @@ -74,7 +74,7 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); - if(pOutlinerParaObject!=NULL) + if(pOutlinerParaObject!=nullptr) { rOutl.SetText(*GetOutlinerParaObject()); rOutl.SetFixedCellHeight(static_cast<const SdrTextFixedCellHeightItem&>(GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); @@ -135,7 +135,7 @@ void ImpUpdateOutlParamsForOverflow(SdrOutliner *pOutl, SdrTextObj *pTextObj) Size aPaperMin; Size aPaperMax; Rectangle aEditArea; - pTextObj->TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,NULL); + pTextObj->TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,nullptr); pOutl->SetMinAutoPaperSize(aPaperMin); pOutl->SetMaxAutoPaperSize(aPaperMax); @@ -159,7 +159,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p Size aAnkSiz(aViewInit.GetSize()); aAnkSiz.Width()--; aAnkSiz.Height()--; // because GetSize() adds 1 Size aMaxSiz(1000000,1000000); - if (pModel!=NULL) { + if (pModel!=nullptr) { Size aTmpSiz(pModel->GetMaxObjSize()); if (aTmpSiz.Width()!=0) aMaxSiz.Width()=aTmpSiz.Width(); if (aTmpSiz.Height()!=0) aMaxSiz.Height()=aTmpSiz.Height(); @@ -242,7 +242,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p aPaperMax=aMaxSiz; } - if (pViewMin!=NULL) { + if (pViewMin!=nullptr) { *pViewMin=aViewInit; long nXFree=aAnkSiz.Width()-aPaperMin.Width(); @@ -272,9 +272,9 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p aPaperMin.Height() = 0; } - if (pPaperMin!=NULL) *pPaperMin=aPaperMin; - if (pPaperMax!=NULL) *pPaperMax=aPaperMax; - if (pViewInit!=NULL) *pViewInit=aViewInit; + if (pPaperMin!=nullptr) *pPaperMin=aPaperMin; + if (pPaperMax!=nullptr) *pPaperMax=aPaperMax; + if (pViewInit!=nullptr) *pViewInit=aViewInit; } void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) @@ -334,7 +334,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) } /* End Chaining-related code */ - pEdtOutl = NULL; + pEdtOutl = nullptr; rOutl.Clear(); EEControlBits nStat = rOutl.GetControlWord(); nStat &= ~EEControlBits::AUTOPAGESIZE; @@ -379,13 +379,13 @@ sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const void SdrTextObj::ImpSetTextEditParams() const { - if (pEdtOutl!=NULL) { + if (pEdtOutl!=nullptr) { bool bUpdMerk=pEdtOutl->GetUpdateMode(); if (bUpdMerk) pEdtOutl->SetUpdateMode(false); Size aPaperMin; Size aPaperMax; Rectangle aEditArea; - TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,NULL); + TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,nullptr); bool bContourFrame=IsContourTextFrame(); pEdtOutl->SetMinAutoPaperSize(aPaperMin); pEdtOutl->SetMaxAutoPaperSize(aPaperMax); diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index cf8777616325..840dbbe618a3 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -61,7 +61,7 @@ void ImpSdrObjTextLink::Closed() { // set pLink of the object to NULL, because we are destroying the link instance now ImpSdrObjTextLinkUserData* pData=pSdrObj->GetLinkUserData(); - if (pData!=NULL) pData->pLink=NULL; + if (pData!=nullptr) pData->pLink=nullptr; pSdrObj->ReleaseTextLink(); } SvBaseLink::Closed(); @@ -72,8 +72,8 @@ void ImpSdrObjTextLink::Closed() const OUString& /*rMimeType*/, const css::uno::Any & /*rValue */) { bool bForceReload = false; - SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0; - sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0; + SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : nullptr; + sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : nullptr; if( pLinkManager ) { ImpSdrObjTextLinkUserData* pData=pSdrObj->GetLinkUserData(); @@ -81,7 +81,7 @@ void ImpSdrObjTextLink::Closed() { OUString aFile; OUString aFilter; - sfx2::LinkManager::GetDisplayNames( this, 0,&aFile, 0, &aFilter ); + sfx2::LinkManager::GetDisplayNames( this, nullptr,&aFile, nullptr, &aFilter ); if( pData->aFileName != aFile || pData->aFilterName != aFilter ) @@ -104,7 +104,7 @@ ImpSdrObjTextLinkUserData::ImpSdrObjTextLinkUserData(SdrTextObj* pObj1): SdrObjUserData(SdrInventor,SDRUSERDATA_OBJTEXTLINK,0), pObj(pObj1), aFileDate0( DateTime::EMPTY ), - pLink(NULL), + pLink(nullptr), eCharSet(RTL_TEXTENCODING_DONTKNOW) { } @@ -121,7 +121,7 @@ SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* pObj1) const pData->aFilterName=aFilterName; pData->aFileDate0 =aFileDate0; pData->eCharSet =eCharSet; - pData->pLink=NULL; + pData->pLink=nullptr; return pData; } @@ -132,7 +132,7 @@ void SdrTextObj::SetTextLink(const OUString& rFileName, const OUString& rFilterN eCharSet = osl_getThreadTextEncoding(); ImpSdrObjTextLinkUserData* pData=GetLinkUserData(); - if (pData!=NULL) { + if (pData!=nullptr) { ReleaseTextLink(); } pData=new ImpSdrObjTextLinkUserData(this); @@ -256,29 +256,29 @@ ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const return static_cast<ImpSdrObjTextLinkUserData *>(pData); } } - return 0; + return nullptr; } void SdrTextObj::ImpLinkAnmeldung() { ImpSdrObjTextLinkUserData* pData=GetLinkUserData(); - sfx2::LinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL; - if (pLinkManager!=NULL && pData!=NULL && pData->pLink==NULL) { // don't register twice + sfx2::LinkManager* pLinkManager=pModel!=nullptr ? pModel->GetLinkManager() : nullptr; + if (pLinkManager!=nullptr && pData!=nullptr && pData->pLink==nullptr) { // don't register twice pData->pLink = new ImpSdrObjTextLink(this); pLinkManager->InsertFileLink(*pData->pLink,OBJECT_CLIENT_FILE,pData->aFileName, !pData->aFilterName.isEmpty() ? - &pData->aFilterName : NULL); + &pData->aFilterName : nullptr); } } void SdrTextObj::ImpLinkAbmeldung() { ImpSdrObjTextLinkUserData* pData=GetLinkUserData(); - sfx2::LinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL; - if (pLinkManager!=NULL && pData!=NULL && pData->pLink!=NULL) { // don't register twice + sfx2::LinkManager* pLinkManager=pModel!=nullptr ? pModel->GetLinkManager() : nullptr; + if (pLinkManager!=nullptr && pData!=nullptr && pData->pLink!=nullptr) { // don't register twice // when doing Remove, *pLink is deleted implicitly pLinkManager->Remove( pData->pLink ); - pData->pLink=NULL; + pData->pLink=nullptr; } } diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index df967bb5ff4d..79dfcf938fe9 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -287,12 +287,12 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const { - SdrObject* pRetval = 0; + SdrObject* pRetval = nullptr; if(!ImpCanConvTextToCurve()) { // suppress HelpTexts from PresObj's - return 0; + return nullptr; } // get primitives @@ -343,7 +343,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const // create ItemSet with object attributes SfxItemSet aAttributeSet(GetObjectItemSet()); - SdrPathObj* pPathObj = 0; + SdrPathObj* pPathObj = nullptr; // always clear objectshadow; this is included in the extraction aAttributeSet.Put(makeSdrShadowItem(false)); @@ -415,7 +415,7 @@ SdrObject* SdrTextObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const return ImpConvertContainedTextToSdrPathObjs(!bBezier); } - return 0; + return nullptr; } bool SdrTextObj::ImpCanConvTextToCurve() const diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index e5c95130c9c8..b68a5574eb6b 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -88,7 +88,7 @@ void SAL_CALL SdrControlEventListenerImpl::disposing( const css::lang::EventObje { if (pObj) { - pObj->xUnoControlModel = NULL; + pObj->xUnoControlModel = nullptr; } } @@ -118,7 +118,7 @@ namespace { OSL_PRECOND( _pObject, "lcl_ensureControlVisibility: no object -> no survival!" ); - SdrPageView* pPageView = _pView ? _pView->GetSdrPageView() : NULL; + SdrPageView* pPageView = _pView ? _pView->GetSdrPageView() : nullptr; DBG_ASSERT( pPageView, "lcl_ensureControlVisibility: no view found!" ); if ( !pPageView ) return; @@ -280,7 +280,7 @@ SdrUnoObj& SdrUnoObj::operator= (const SdrUnoObj& rObj) SdrRectObj::operator= (rObj); // release the reference to the current control model - SetUnoControlModel( NULL ); + SetUnoControlModel( nullptr ); aUnoControlModelTypeName = rObj.aUnoControlModelTypeName; aUnoControlTypeName = rObj.aUnoControlTypeName; @@ -359,7 +359,7 @@ bool SdrUnoObj::supportsFullDrag() const SdrObject* SdrUnoObj::getFullDragClone() const { - SdrObject* pRetval = 0; + SdrObject* pRetval = nullptr; static bool bHandleSpecial(false); if(bHandleSpecial) @@ -516,7 +516,7 @@ void SdrUnoObj::SetUnoControlModel( const uno::Reference< awt::XControlModel >& } // invalidate all ViewObject contacts - ViewContactOfUnoControl* pVC = NULL; + ViewContactOfUnoControl* pVC = nullptr; if ( impl_getViewContact( pVC ) ) { // flushViewObjectContacts() removes all existing VOCs for the local DrawHierarchy. This @@ -533,12 +533,12 @@ uno::Reference< awt::XControl > SdrUnoObj::GetUnoControl(const SdrView& _rView, SdrPageView* pPageView = _rView.GetSdrPageView(); OSL_ENSURE( pPageView && GetPage() == pPageView->GetPage(), "SdrUnoObj::GetUnoControl: This object is not displayed in that particular view!" ); if ( !pPageView || GetPage() != pPageView->GetPage() ) - return NULL; + return nullptr; SdrPageWindow* pPageWindow = pPageView->FindPageWindow( _rOut ); OSL_ENSURE( pPageWindow, "SdrUnoObj::GetUnoControl: did not find my SdrPageWindow!" ); if ( !pPageWindow ) - return NULL; + return nullptr; ViewObjectContact& rViewObjectContact( GetViewContact().GetViewObjectContact( pPageWindow->GetObjectContact() ) ); ViewObjectContactOfUnoControl* pUnoContact = dynamic_cast< ViewObjectContactOfUnoControl* >( &rViewObjectContact ); @@ -555,7 +555,7 @@ uno::Reference< awt::XControl > SdrUnoObj::GetTemporaryControlForWindow( { uno::Reference< awt::XControl > xControl; - ViewContactOfUnoControl* pVC = NULL; + ViewContactOfUnoControl* pVC = nullptr; if ( impl_getViewContact( pVC ) ) xControl = pVC->getTemporaryControlForWindow( _rWindow, _inout_ControlContainer ); @@ -568,7 +568,7 @@ bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact ) ViewContact& rViewContact( GetViewContact() ); _out_rpContact = dynamic_cast< ViewContactOfUnoControl* >( &rViewContact ); DBG_ASSERT( _out_rpContact, "SdrUnoObj::impl_getViewContact: could not find my ViewContact!" ); - return ( _out_rpContact != NULL ); + return ( _out_rpContact != nullptr ); } diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index 63f1ef49fe98..998c520c800f 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -29,7 +29,7 @@ SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode ) : Outliner( pItemPool, nMode ), //mpPaintInfoRec( NULL ) - mpVisualizedPage(0) + mpVisualizedPage(nullptr) { } @@ -91,7 +91,7 @@ const SdrTextObj* SdrOutliner::GetTextObj() const if( mpTextObj.is() ) return static_cast< SdrTextObj* >( mpTextObj.get() ); else - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx index d77babce8079..c9e9beeb699d 100644 --- a/svx/source/svdraw/svdoutlinercache.cxx +++ b/svx/source/svdraw/svdoutlinercache.cxx @@ -24,24 +24,24 @@ SdrOutlinerCache::SdrOutlinerCache( SdrModel* pModel ) : mpModel( pModel ), - mpModeOutline( NULL ), - mpModeText( NULL ) + mpModeOutline( nullptr ), + mpModeText( nullptr ) { } SdrOutliner* SdrOutlinerCache::createOutliner( sal_uInt16 nOutlinerMode ) { - SdrOutliner* pOutliner = NULL; + SdrOutliner* pOutliner = nullptr; if( (OUTLINERMODE_OUTLINEOBJECT == nOutlinerMode) && mpModeOutline ) { pOutliner = mpModeOutline; - mpModeOutline = NULL; + mpModeOutline = nullptr; } else if( (OUTLINERMODE_TEXTOBJECT == nOutlinerMode) && mpModeText ) { pOutliner = mpModeText; - mpModeText = NULL; + mpModeText = nullptr; } else { @@ -59,13 +59,13 @@ SdrOutlinerCache::~SdrOutlinerCache() if( mpModeOutline ) { delete mpModeOutline; - mpModeOutline = NULL; + mpModeOutline = nullptr; } if( mpModeText ) { delete mpModeText; - mpModeText = NULL; + mpModeText = nullptr; } } @@ -75,7 +75,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner ) { sal_uInt16 nOutlMode = pOutliner->GetOutlinerMode(); - if( (OUTLINERMODE_OUTLINEOBJECT == nOutlMode) && (NULL == mpModeOutline) ) + if( (OUTLINERMODE_OUTLINEOBJECT == nOutlMode) && (nullptr == mpModeOutline) ) { mpModeOutline = pOutliner; pOutliner->Clear(); @@ -84,7 +84,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner ) // Deregister on outliner, might be reused from outliner cache pOutliner->SetNotifyHdl( Link<EENotify&,void>() ); } - else if( (OUTLINERMODE_TEXTOBJECT == nOutlMode) && (NULL == mpModeText) ) + else if( (OUTLINERMODE_TEXTOBJECT == nOutlMode) && (nullptr == mpModeText) ) { mpModeText = pOutliner; pOutliner->Clear(); diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 5cea7776090f..0ab775b068ea 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -233,7 +233,7 @@ void SdrVirtObj::AddToHdlList(SdrHdlList& rHdlList) const // and may not be prepared to GetHdl returning NULL // get handles using AddToHdlList from ref object - SdrHdlList aLocalList(0); + SdrHdlList aLocalList(nullptr); rRefObj.AddToHdlList(aLocalList); const size_t nHdlCount(aLocalList.GetHdlCount()); @@ -274,7 +274,7 @@ bool SdrVirtObj::supportsFullDrag() const SdrObject* SdrVirtObj::getFullDragClone() const { static bool bSpecialHandling(false); - SdrObject* pRetval = 0; + SdrObject* pRetval = nullptr; if(bSpecialHandling) { @@ -384,7 +384,7 @@ void SdrVirtObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShea void SdrVirtObj::Move(const Size& rSiz) { if (rSiz.Width()!=0 || rSiz.Height()!=0) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcMove(rSiz); SetChanged(); BroadcastObjectChange(); @@ -395,7 +395,7 @@ void SdrVirtObj::Move(const Size& rSiz) void SdrVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative) { if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); rRefObj.Resize(rRef-aAnchor,xFact,yFact, bUnsetRelative); SetRectsDirty(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); @@ -405,7 +405,7 @@ void SdrVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction void SdrVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs) { if (nAngle!=0) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); rRefObj.Rotate(rRef-aAnchor,nAngle,sn,cs); SetRectsDirty(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); @@ -414,7 +414,7 @@ void SdrVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs) void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); rRefObj.Mirror(rRef1-aAnchor,rRef2-aAnchor); SetRectsDirty(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); @@ -423,7 +423,7 @@ void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2) void SdrVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear) { if (nAngle!=0) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); rRefObj.Shear(rRef-aAnchor,nAngle,tn,bVShear); SetRectsDirty(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); @@ -448,7 +448,7 @@ const Rectangle& SdrVirtObj::GetSnapRect() const void SdrVirtObj::SetSnapRect(const Rectangle& rRect) { { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); Rectangle aR(rRect); aR-=aAnchor; rRefObj.SetSnapRect(aR); @@ -476,7 +476,7 @@ const Rectangle& SdrVirtObj::GetLogicRect() const void SdrVirtObj::SetLogicRect(const Rectangle& rRect) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); Rectangle aR(rRect); aR-=aAnchor; rRefObj.SetLogicRect(aR); @@ -568,7 +568,7 @@ SdrObjGeoData* SdrVirtObj::GetGeoData() const void SdrVirtObj::SetGeoData(const SdrObjGeoData& rGeo) { - Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); + Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); rRefObj.SetGeoData(rGeo); SetRectsDirty(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index d1e240e6dc79..91e6ad534024 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -84,7 +84,7 @@ SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewU pUpList=pNewUpList; bObjOrdNumsDirty=false; bRectsDirty=false; - pOwnerObj=NULL; + pOwnerObj=nullptr; eListKind=SDROBJLIST_UNKNOWN; } @@ -94,12 +94,12 @@ SdrObjList::SdrObjList(): mbIsNavigationOrderDirty(false) { maList.reserve(InitialObjectContainerCapacity); - pModel=NULL; - pPage=NULL; - pUpList=NULL; + pModel=nullptr; + pPage=nullptr; + pUpList=nullptr; bObjOrdNumsDirty=false; bRectsDirty=false; - pOwnerObj=NULL; + pOwnerObj=nullptr; eListKind=SDROBJLIST_UNKNOWN; } @@ -109,7 +109,7 @@ SdrObjList::~SdrObjList() // To avoid that the Clear() method will broadcast changes when in destruction // which would call virtual methos (not allowed in destructor), the model is set // to NULL here. - pModel = 0L; + pModel = nullptr; Clear(); // delete contents of container } @@ -143,7 +143,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) SdrObject* pDO = pSO->Clone(); - if (pDO!=NULL) { + if (pDO!=nullptr) { pDO->SetModel(pModel); pDO->SetPage(pPage); NbcInsertObject(pDO, SAL_MAX_SIZE, &aReason); @@ -164,28 +164,28 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) for (size_t no=0; no<nCount; ++no) { const SdrObject* pSrcOb=rSrcList.GetObj(no); const SdrEdgeObj* pSrcEdge=dynamic_cast<const SdrEdgeObj*>( pSrcOb ); - if (pSrcEdge!=NULL) { + if (pSrcEdge!=nullptr) { SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(true); SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(false); - if (pSrcNode1!=NULL && pSrcNode1->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode1=NULL; // can't do this - if (pSrcNode2!=NULL && pSrcNode2->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode2=NULL; // across all lists (yet) - if (pSrcNode1!=NULL || pSrcNode2!=NULL) { + if (pSrcNode1!=nullptr && pSrcNode1->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode1=nullptr; // can't do this + if (pSrcNode2!=nullptr && pSrcNode2->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode2=nullptr; // across all lists (yet) + if (pSrcNode1!=nullptr || pSrcNode2!=nullptr) { SdrObject* pEdgeObjTmp=GetObj(no); SdrEdgeObj* pDstEdge=dynamic_cast<SdrEdgeObj*>( pEdgeObjTmp ); - if (pDstEdge!=NULL) { - if (pSrcNode1!=NULL) { + if (pDstEdge!=nullptr) { + if (pSrcNode1!=nullptr) { sal_uIntPtr nDstNode1=pSrcNode1->GetOrdNum(); SdrObject* pDstNode1=GetObj(nDstNode1); - if (pDstNode1!=NULL) { // else we get an error! + if (pDstNode1!=nullptr) { // else we get an error! pDstEdge->ConnectToNode(true,pDstNode1); } else { OSL_FAIL("SdrObjList::operator=(): pDstNode1==NULL!"); } } - if (pSrcNode2!=NULL) { + if (pSrcNode2!=nullptr) { sal_uIntPtr nDstNode2=pSrcNode2->GetOrdNum(); SdrObject* pDstNode2=GetObj(nDstNode2); - if (pDstNode2!=NULL) { // else the node was probably not selected + if (pDstNode2!=nullptr) { // else the node was probably not selected pDstEdge->ConnectToNode(false,pDstNode2); } else { OSL_FAIL("SdrObjList::operator=(): pDstNode2==NULL!"); @@ -317,7 +317,7 @@ void SdrObjList::RecalcRects() void SdrObjList::SetRectsDirty() { bRectsDirty=true; - if (pUpList!=NULL) pUpList->SetRectsDirty(); + if (pUpList!=nullptr) pUpList->SetRectsDirty(); } void SdrObjList::impChildInserted(SdrObject& rChild) @@ -332,8 +332,8 @@ void SdrObjList::impChildInserted(SdrObject& rChild) void SdrObjList::NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReason* /*pReason*/) { - DBG_ASSERT(pObj!=NULL,"SdrObjList::NbcInsertObject(NULL)"); - if (pObj!=NULL) { + DBG_ASSERT(pObj!=nullptr,"SdrObjList::NbcInsertObject(NULL)"); + if (pObj!=nullptr) { DBG_ASSERT(!pObj->IsInserted(),"ZObjekt already has the status Inserted."); const size_t nCount = GetObjCount(); if (nPos>nCount) nPos=nCount; @@ -358,7 +358,7 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertRe void SdrObjList::InsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReason* pReason) { - DBG_ASSERT(pObj!=NULL,"SdrObjList::InsertObject(NULL)"); + DBG_ASSERT(pObj!=nullptr,"SdrObjList::InsertObject(NULL)"); if(pObj) { @@ -403,22 +403,22 @@ SdrObject* SdrObjList::NbcRemoveObject(size_t nObjNum) if (nObjNum >= maList.size()) { OSL_ASSERT(nObjNum<maList.size()); - return NULL; + return nullptr; } const size_t nCount = GetObjCount(); SdrObject* pObj=maList[nObjNum]; RemoveObjectFromContainer(nObjNum); - DBG_ASSERT(pObj!=NULL,"Could not find object to remove."); - if (pObj!=NULL) { + DBG_ASSERT(pObj!=nullptr,"Could not find object to remove."); + if (pObj!=nullptr) { // flushViewObjectContacts() clears the VOC's and those invalidate pObj->GetViewContact().flushViewObjectContacts(); DBG_ASSERT(pObj->IsInserted(),"ZObjekt does not have the status Inserted."); pObj->SetInserted(false); // Ruft u.a. den UserCall - pObj->SetObjList(NULL); - pObj->SetPage(NULL); + pObj->SetObjList(nullptr); + pObj->SetPage(nullptr); if (!bObjOrdNumsDirty) { // optimizing for the case that the last object has to be removed if (nObjNum+1!=nCount) { bObjOrdNumsDirty=true; @@ -434,23 +434,23 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum) if (nObjNum >= maList.size()) { OSL_ASSERT(nObjNum<maList.size()); - return NULL; + return nullptr; } const size_t nCount = GetObjCount(); SdrObject* pObj=maList[nObjNum]; RemoveObjectFromContainer(nObjNum); - DBG_ASSERT(pObj!=NULL,"Object to remove not found."); + DBG_ASSERT(pObj!=nullptr,"Object to remove not found."); if(pObj) { // flushViewObjectContacts() clears the VOC's and those invalidate pObj->GetViewContact().flushViewObjectContacts(); DBG_ASSERT(pObj->IsInserted(),"ZObjekt does not have the status Inserted."); - if (pModel!=NULL) { + if (pModel!=nullptr) { // TODO: We need a different broadcast here. - if (pObj->GetPage()!=NULL) { + if (pObj->GetPage()!=nullptr) { SdrHint aHint(*pObj); aHint.SetKind(HINT_OBJREMOVED); pModel->Broadcast(aHint); @@ -458,8 +458,8 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum) pModel->SetChanged(); } pObj->SetInserted(false); // calls, among other things, the UserCall - pObj->SetObjList(NULL); - pObj->SetPage(NULL); + pObj->SetObjList(nullptr); + pObj->SetPage(nullptr); if (!bObjOrdNumsDirty) { // optimization for the case that the last object is removed if (nObjNum+1!=nCount) { bObjOrdNumsDirty=true; @@ -479,20 +479,20 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum) SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum) { - if (nObjNum >= maList.size() || pNewObj == NULL) + if (nObjNum >= maList.size() || pNewObj == nullptr) { OSL_ASSERT(nObjNum<maList.size()); - OSL_ASSERT(pNewObj!=NULL); - return NULL; + OSL_ASSERT(pNewObj!=nullptr); + return nullptr; } SdrObject* pObj=maList[nObjNum]; - DBG_ASSERT(pObj!=NULL,"SdrObjList::ReplaceObject: Could not find object to remove."); - if (pObj!=NULL) { + DBG_ASSERT(pObj!=nullptr,"SdrObjList::ReplaceObject: Could not find object to remove."); + if (pObj!=nullptr) { DBG_ASSERT(pObj->IsInserted(),"SdrObjList::ReplaceObject: ZObjekt does not have status Inserted."); pObj->SetInserted(false); - pObj->SetObjList(NULL); - pObj->SetPage(NULL); + pObj->SetObjList(nullptr); + pObj->SetPage(nullptr); ReplaceObjectInContainer(*pNewObj,nObjNum); // flushViewObjectContacts() clears the VOC's and those invalidate @@ -517,29 +517,29 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum) if (nObjNum >= maList.size()) { OSL_ASSERT(nObjNum<maList.size()); - return NULL; + return nullptr; } - if (pNewObj == NULL) + if (pNewObj == nullptr) { - OSL_ASSERT(pNewObj!=NULL); - return NULL; + OSL_ASSERT(pNewObj!=nullptr); + return nullptr; } SdrObject* pObj=maList[nObjNum]; - DBG_ASSERT(pObj!=NULL,"SdrObjList::ReplaceObject: Could not find object to remove."); - if (pObj!=NULL) { + DBG_ASSERT(pObj!=nullptr,"SdrObjList::ReplaceObject: Could not find object to remove."); + if (pObj!=nullptr) { DBG_ASSERT(pObj->IsInserted(),"SdrObjList::ReplaceObject: ZObjekt does not have status Inserted."); - if (pModel!=NULL) { + if (pModel!=nullptr) { // TODO: We need a different broadcast here. - if (pObj->GetPage()!=NULL) { + if (pObj->GetPage()!=nullptr) { SdrHint aHint(*pObj); aHint.SetKind(HINT_OBJREMOVED); pModel->Broadcast(aHint); } } pObj->SetInserted(false); - pObj->SetObjList(NULL); - pObj->SetPage(NULL); + pObj->SetObjList(nullptr); + pObj->SetPage(nullptr); ReplaceObjectInContainer(*pNewObj,nObjNum); // flushViewObjectContacts() clears the VOC's and those invalidate @@ -554,9 +554,9 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum) impChildInserted(*pNewObj); pNewObj->SetInserted(true); - if (pModel!=NULL) { + if (pModel!=nullptr) { // TODO: We need a different broadcast here. - if (pNewObj->GetPage()!=NULL) { + if (pNewObj->GetPage()!=nullptr) { SdrHint aHint(*pNewObj); aHint.SetKind(HINT_OBJINSERTED); pModel->Broadcast(aHint); @@ -574,13 +574,13 @@ SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) { OSL_ASSERT(nOldObjNum<maList.size()); OSL_ASSERT(nNewObjNum<maList.size()); - return NULL; + return nullptr; } SdrObject* pObj=maList[nOldObjNum]; if (nOldObjNum==nNewObjNum) return pObj; - DBG_ASSERT(pObj!=NULL,"SdrObjList::SetObjectOrdNum: Object not found."); - if (pObj!=NULL) { + DBG_ASSERT(pObj!=nullptr,"SdrObjList::SetObjectOrdNum: Object not found."); + if (pObj!=nullptr) { DBG_ASSERT(pObj->IsInserted(),"SdrObjList::SetObjectOrdNum: ZObjekt does not have status Inserted."); RemoveObjectFromContainer(nOldObjNum); InsertObjectIntoContainer(*pObj,nNewObjNum); @@ -591,10 +591,10 @@ SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) pObj->SetOrdNum(nNewObjNum); bObjOrdNumsDirty=true; - if (pModel!=NULL) + if (pModel!=nullptr) { // TODO: We need a different broadcast here. - if (pObj->GetPage()!=NULL) pModel->Broadcast(SdrHint(*pObj)); + if (pObj->GetPage()!=nullptr) pModel->Broadcast(SdrHint(*pObj)); pModel->SetChanged(); } } @@ -687,7 +687,7 @@ SdrObject* SdrObjList::GetObj(size_t nNum) const if (nNum >= maList.size()) { OSL_ASSERT(nNum<maList.size()); - return NULL; + return nullptr; } else return maList[nNum]; @@ -699,7 +699,7 @@ SdrObject* SdrObjList::GetObj(size_t nNum) const bool SdrObjList::IsReadOnly() const { bool bRet = false; - if (pPage!=NULL && pPage!=this) bRet=pPage->IsReadOnly(); + if (pPage!=nullptr && pPage!=this) bRet=pPage->IsReadOnly(); return bRet; } @@ -709,7 +709,7 @@ size_t SdrObjList::CountAllObjects() const size_t nCnt=nCount; for (size_t nNum=0; nNum<nCount; nNum++) { SdrObjList* pSubOL=GetObj(nNum)->GetSubList(); - if (pSubOL!=NULL) { + if (pSubOL!=nullptr) { nCnt+=pSubOL->CountAllObjects(); } } @@ -765,7 +765,7 @@ void SdrObjList::UnGroupObj( size_t nObjNum ) bool SdrObjList::HasObjectNavigationOrder() const { - return mxNavigationOrder.get() != NULL; + return mxNavigationOrder.get() != nullptr; } @@ -778,7 +778,7 @@ void SdrObjList::SetObjectNavigationPosition ( // When the navigation order container has not yet been created then // create one now. It is initialized with the z-order taken from // maList. - if (mxNavigationOrder.get() == NULL) + if (mxNavigationOrder.get() == nullptr) { mxNavigationOrder.reset(new WeakSdrObjectContainerType(maList.size())); ::std::copy( @@ -786,7 +786,7 @@ void SdrObjList::SetObjectNavigationPosition ( maList.end(), mxNavigationOrder->begin()); } - OSL_ASSERT(mxNavigationOrder.get()!=NULL); + OSL_ASSERT(mxNavigationOrder.get()!=nullptr); OSL_ASSERT( mxNavigationOrder->size() == maList.size()); SdrObjectWeakRef aReference (&rObject); @@ -819,7 +819,7 @@ void SdrObjList::SetObjectNavigationPosition ( mbIsNavigationOrderDirty = true; // The navigation order is written out to file so mark the model as modified. - if (pModel != NULL) + if (pModel != nullptr) pModel->SetChanged(); } } @@ -851,7 +851,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat else return maList[nNavigationPosition]; } - return NULL; + return nullptr; } @@ -870,7 +870,7 @@ bool SdrObjList::RecalcNavigationPositions() { if (mbIsNavigationOrderDirty) { - if (mxNavigationOrder.get() != NULL) + if (mxNavigationOrder.get() != nullptr) { mbIsNavigationOrderDirty = false; @@ -882,7 +882,7 @@ bool SdrObjList::RecalcNavigationPositions() } } - return mxNavigationOrder.get() != NULL; + return mxNavigationOrder.get() != nullptr; } @@ -896,14 +896,14 @@ void SdrObjList::SetNavigationOrder (const uno::Reference<container::XIndexAcces if ((sal_uInt32)nCount != maList.size()) return; - if (mxNavigationOrder.get() == NULL) + if (mxNavigationOrder.get() == nullptr) mxNavigationOrder.reset(new WeakSdrObjectContainerType(nCount)); for (sal_Int32 nIndex=0; nIndex<nCount; ++nIndex) { uno::Reference<uno::XInterface> xShape (rxOrder->getByIndex(nIndex), uno::UNO_QUERY); SdrObject* pObject = SdrObject::getSdrObjectFromXShape(xShape); - if (pObject == NULL) + if (pObject == nullptr) break; (*mxNavigationOrder)[nIndex] = pObject; } @@ -1080,8 +1080,8 @@ void SdrPageProperties::ImpRemoveStyleSheet() if(mpStyleSheet) { EndListening(*mpStyleSheet); - mpProperties->SetParent(0); - mpStyleSheet = 0; + mpProperties->SetParent(nullptr); + mpStyleSheet = nullptr; } } @@ -1112,7 +1112,7 @@ void ImpPageChange(SdrPage& rSdrPage) SdrPageProperties::SdrPageProperties(SdrPage& rSdrPage) : SfxListener(), mpSdrPage(&rSdrPage), - mpStyleSheet(0), + mpStyleSheet(nullptr), mpProperties(new SfxItemSet(mpSdrPage->GetModel()->GetItemPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST)) { if(!rSdrPage.IsMasterPage()) @@ -1198,7 +1198,7 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet) TYPEINIT1(SdrPage,SdrObjList); SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage) : SdrObjList(&rNewModel, this), - mpViewContact(0L), + mpViewContact(nullptr), nWdt(10L), nHgt(10L), nBordLft(0L), @@ -1206,8 +1206,8 @@ SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage) nBordRgt(0L), nBordLwr(0L), pLayerAdmin(new SdrLayerAdmin(&rNewModel.GetLayerAdmin())), - mpSdrPageProperties(0), - mpMasterPageDescriptor(0L), + mpSdrPageProperties(nullptr), + mpMasterPageDescriptor(nullptr), nPageNum(0L), mbMaster(bMasterPage), mbInserted(false), @@ -1223,7 +1223,7 @@ SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage) SdrPage::SdrPage(const SdrPage& rSrcPage) : SdrObjList(rSrcPage.pModel, this), tools::WeakBase< SdrPage >(), - mpViewContact(0L), + mpViewContact(nullptr), nWdt(rSrcPage.nWdt), nHgt(rSrcPage.nHgt), nBordLft(rSrcPage.nBordLft), @@ -1231,8 +1231,8 @@ SdrPage::SdrPage(const SdrPage& rSrcPage) nBordRgt(rSrcPage.nBordRgt), nBordLwr(rSrcPage.nBordLwr), pLayerAdmin(new SdrLayerAdmin(rSrcPage.pModel->GetLayerAdmin())), - mpSdrPageProperties(0), - mpMasterPageDescriptor(0L), + mpSdrPageProperties(nullptr), + mpMasterPageDescriptor(nullptr), nPageNum(rSrcPage.nPageNum), mbMaster(rSrcPage.mbMaster), mbInserted(false), @@ -1278,12 +1278,12 @@ SdrPage::~SdrPage() if(mpViewContact) { delete mpViewContact; - mpViewContact = 0L; + mpViewContact = nullptr; } { delete mpSdrPageProperties; - mpSdrPageProperties = 0; + mpSdrPageProperties = nullptr; } } @@ -1347,12 +1347,12 @@ void SdrPage::lateInit(const SdrPage& rSrcPage, SdrModel* const pNewModel) SdrPage* SdrPage::Clone() const { - return Clone(NULL); + return Clone(nullptr); } SdrPage* SdrPage::Clone(SdrModel* pNewModel) const { - if (pNewModel==NULL) pNewModel=pModel; + if (pNewModel==nullptr) pNewModel=pModel; SdrPage* pPage2=new SdrPage(*pNewModel); pPage2->lateInit(*this); return pPage2; @@ -1507,10 +1507,10 @@ sal_Int32 SdrPage::GetLwrBorder() const void SdrPage::impl_setModelForLayerAdmin(SdrModel* const pNewModel) { - if (pNewModel!=NULL) { + if (pNewModel!=nullptr) { pLayerAdmin->SetParent(&pNewModel->GetLayerAdmin()); } else { - pLayerAdmin->SetParent(NULL); + pLayerAdmin->SetParent(nullptr); } pLayerAdmin->SetModel(pNewModel); } @@ -1618,31 +1618,31 @@ void SdrPage::TRG_ClearMasterPage() mpMasterPageDescriptor->GetUsedPage().GetViewContact().flushViewObjectContacts(); delete mpMasterPageDescriptor; - mpMasterPageDescriptor = 0L; + mpMasterPageDescriptor = nullptr; } } SdrPage& SdrPage::TRG_GetMasterPage() const { - DBG_ASSERT(mpMasterPageDescriptor != 0L, "TRG_GetMasterPage(): No MasterPage available. Use TRG_HasMasterPage() before access (!)"); + DBG_ASSERT(mpMasterPageDescriptor != nullptr, "TRG_GetMasterPage(): No MasterPage available. Use TRG_HasMasterPage() before access (!)"); return mpMasterPageDescriptor->GetUsedPage(); } const SetOfByte& SdrPage::TRG_GetMasterPageVisibleLayers() const { - DBG_ASSERT(mpMasterPageDescriptor != 0L, "TRG_GetMasterPageVisibleLayers(): No MasterPage available. Use TRG_HasMasterPage() before access (!)"); + DBG_ASSERT(mpMasterPageDescriptor != nullptr, "TRG_GetMasterPageVisibleLayers(): No MasterPage available. Use TRG_HasMasterPage() before access (!)"); return mpMasterPageDescriptor->GetVisibleLayers(); } void SdrPage::TRG_SetMasterPageVisibleLayers(const SetOfByte& rNew) { - DBG_ASSERT(mpMasterPageDescriptor != 0L, "TRG_SetMasterPageVisibleLayers(): No MasterPage available. Use TRG_HasMasterPage() before access (!)"); + DBG_ASSERT(mpMasterPageDescriptor != nullptr, "TRG_SetMasterPageVisibleLayers(): No MasterPage available. Use TRG_HasMasterPage() before access (!)"); mpMasterPageDescriptor->SetVisibleLayers(rNew); } sdr::contact::ViewContact& SdrPage::TRG_GetMasterPageDescriptorViewContact() const { - DBG_ASSERT(mpMasterPageDescriptor != 0L, "TRG_GetMasterPageDescriptorViewContact(): No MasterPage available. Use TRG_HasMasterPage() before access (!)"); + DBG_ASSERT(mpMasterPageDescriptor != nullptr, "TRG_GetMasterPageDescriptorViewContact(): No MasterPage available. Use TRG_HasMasterPage() before access (!)"); return mpMasterPageDescriptor->GetViewContact(); } @@ -1660,7 +1660,7 @@ void SdrPage::TRG_ImpMasterPageRemoved(const SdrPage& rRemovedPage) const SdrPageGridFrameList* SdrPage::GetGridFrameList(const SdrPageView* /*pPV*/, const Rectangle* /*pRect*/) const { - return NULL; + return nullptr; } OUString SdrPage::GetLayoutName() const @@ -1754,7 +1754,7 @@ Color SdrPage::GetPageBackgroundColor( SdrPageView* pView, bool bScreenDisplay ) Color SdrPage::GetPageBackgroundColor() const // #i75566# GetBackgroundColor -> GetPageBackgroundColor { - return GetPageBackgroundColor( NULL ); + return GetPageBackgroundColor( nullptr ); } /** this method returns true if the object from the ViewObjectContact should diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 0564bc8cd8c5..4d38c950c858 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -60,7 +60,7 @@ SdrPageWindow* SdrPageView::FindPageWindow(SdrPaintWindow& rPaintWindow) const } } - return 0L; + return nullptr; } const SdrPageWindow* SdrPageView::FindPatchedPageWindow( const OutputDevice& _rOutDev ) const @@ -78,7 +78,7 @@ const SdrPageWindow* SdrPageView::FindPatchedPageWindow( const OutputDevice& _rO } } - return NULL; + return nullptr; } SdrPageWindow* SdrPageView::FindPageWindow(const OutputDevice& rOutDev) const @@ -91,7 +91,7 @@ SdrPageWindow* SdrPageView::FindPageWindow(const OutputDevice& rOutDev) const } } - return 0L; + return nullptr; } SdrPageWindow* SdrPageView::GetPageWindow(sal_uInt32 nIndex) const @@ -101,7 +101,7 @@ SdrPageWindow* SdrPageView::GetPageWindow(sal_uInt32 nIndex) const return maPageWindows[nIndex]; } - return 0L; + return nullptr; } void SdrPageView::ClearPageWindows() @@ -131,7 +131,7 @@ SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld) return pSdrPageWindow; } - return 0L; + return nullptr; } @@ -141,7 +141,7 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) // col_auto color lets the view takes the default SvxColorConfig entry maDocumentColor( COL_AUTO ), maBackgroundColor(COL_AUTO ), // #i48367# also react on autocolor - mpPreparedPageWindow(0) // #i72752# + mpPreparedPageWindow(nullptr) // #i72752# { mpPage = pPage1; @@ -155,9 +155,9 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) aLayerPrn.SetAll(); mbVisible = false; - pAktList = NULL; - pAktGroup = NULL; - SetAktGroupAndList(NULL, mpPage); + pAktList = nullptr; + pAktGroup = nullptr; + SetAktGroupAndList(nullptr, mpPage); for(sal_uInt32 a(0L); a < rNewView.PaintWindowCount(); a++) { @@ -216,12 +216,12 @@ css::uno::Reference< css::awt::XControlContainer > SdrPageView::GetControlContai void SdrPageView::ModelHasChanged() { - if (GetAktGroup()!=NULL) CheckAktGroup(); + if (GetAktGroup()!=nullptr) CheckAktGroup(); } bool SdrPageView::IsReadOnly() const { - return (0L == GetPage() || GetView().GetModel()->IsReadOnly() || GetPage()->IsReadOnly() || GetObjList()->IsReadOnly()); + return (nullptr == GetPage() || GetView().GetModel()->IsReadOnly() || GetPage()->IsReadOnly() || GetObjList()->IsReadOnly()); } void SdrPageView::Show() @@ -252,7 +252,7 @@ void SdrPageView::Hide() Rectangle SdrPageView::GetPageRect() const { - if (GetPage()==NULL) return Rectangle(); + if (GetPage()==nullptr) return Rectangle(); return Rectangle(Point(),Size(GetPage()->GetWdt()+1,GetPage()->GetHgt()+1)); } @@ -306,7 +306,7 @@ void SdrPageView::CompleteRedraw( if(bIsTempTarget) { delete pPageWindow; - pPageWindow = 0L; + pPageWindow = nullptr; } } } @@ -421,7 +421,7 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor) { - if (GetPage()==NULL) + if (GetPage()==nullptr) return; long nx1=GetView().maGridBig.Width(); @@ -515,12 +515,12 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C long x2=GetPage()->GetWdt()-GetPage()->GetRgtBorder()-1+nWrY; long y1=GetPage()->GetUppBorder()+1+nWrX; long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY; - const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,NULL); + const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,nullptr); sal_uInt16 nGridPaintAnz=1; - if (pFrames!=NULL) nGridPaintAnz=pFrames->GetCount(); + if (pFrames!=nullptr) nGridPaintAnz=pFrames->GetCount(); for (sal_uInt16 nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) { - if (pFrames!=NULL) { + if (pFrames!=nullptr) { const SdrPageGridFrame& rGF=(*pFrames)[nGridPaintNum]; nWrX=rGF.GetPaperRect().Left(); nWrY=rGF.GetPaperRect().Top(); @@ -899,7 +899,7 @@ void SdrPageView::LeaveAllGroup() GetView().UnmarkAll(); // allocations, pAktGroup and pAktList always need to be set - SetAktGroupAndList(NULL, GetPage()); + SetAktGroupAndList(nullptr, GetPage()); // find and select uppermost group if(pLastGroup) @@ -926,7 +926,7 @@ sal_uInt16 SdrPageView::GetEnteredLevel() const { sal_uInt16 nCount=0; SdrObject* pGrp=GetAktGroup(); - while (pGrp!=NULL) { + while (pGrp!=nullptr) { nCount++; pGrp=pGrp->GetUpGroup(); } @@ -936,13 +936,13 @@ sal_uInt16 SdrPageView::GetEnteredLevel() const void SdrPageView::CheckAktGroup() { SdrObject* pGrp=GetAktGroup(); - while (pGrp!=NULL && - (!pGrp->IsInserted() || pGrp->GetObjList()==NULL || - pGrp->GetPage()==NULL || pGrp->GetModel()==NULL)) { // anything outside of the borders? + while (pGrp!=nullptr && + (!pGrp->IsInserted() || pGrp->GetObjList()==nullptr || + pGrp->GetPage()==nullptr || pGrp->GetModel()==nullptr)) { // anything outside of the borders? pGrp=pGrp->GetUpGroup(); } if (pGrp!=GetAktGroup()) { - if (pGrp!=NULL) EnterGroup(pGrp); + if (pGrp!=nullptr) EnterGroup(pGrp); else LeaveAllGroup(); } } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 86ff0db48d85..8580edeca204 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -75,7 +75,7 @@ SdrPaintWindow* SdrPaintView::FindPaintWindow(const OutputDevice& rOut) const } } - return 0L; + return nullptr; } SdrPaintWindow* SdrPaintView::GetPaintWindow(sal_uInt32 nIndex) const @@ -85,7 +85,7 @@ SdrPaintWindow* SdrPaintView::GetPaintWindow(sal_uInt32 nIndex) const return maPaintWindows[nIndex]; } - return 0L; + return nullptr; } void SdrPaintView::AppendPaintWindow(SdrPaintWindow& rNew) @@ -95,7 +95,7 @@ void SdrPaintView::AppendPaintWindow(SdrPaintWindow& rNew) SdrPaintWindow* SdrPaintView::RemovePaintWindow(SdrPaintWindow& rOld) { - SdrPaintWindow* pRetval = 0L; + SdrPaintWindow* pRetval = nullptr; const SdrPaintWindowVector::iterator aFindResult = ::std::find(maPaintWindows.begin(), maPaintWindows.end(), &rOld); if(aFindResult != maPaintWindows.end()) @@ -115,7 +115,7 @@ OutputDevice* SdrPaintView::GetFirstOutputDevice() const return &(GetPaintWindow(0)->GetOutputDevice()); } - return 0L; + return nullptr; } @@ -161,7 +161,7 @@ TYPEINIT2(SdrPaintView,SfxListener,SfxRepeatTarget); void SdrPaintView::ImpClearVars() { #ifdef DBG_UTIL - mpItemBrowser=NULL; + mpItemBrowser=nullptr; #endif mbPageVisible=true; mbPageBorderVisible=true; @@ -185,10 +185,10 @@ void SdrPaintView::ImpClearVars() mnMinMovPix=3; mnHitTolLog=0; mnMinMovLog=0; - mpActualOutDev=NULL; - mpDragWin=NULL; + mpActualOutDev=nullptr; + mpDragWin=nullptr; mbRestoreColors=true; - mpDefaultStyleSheet=NULL; + mpDefaultStyleSheet=nullptr; mbSomeObjChgdFlag=false; mnGraphicManagerDrawMode = GraphicManagerDrawFlags::STANDARD; maComeBackIdle.SetPriority(SchedulerPriority::REPAINT); @@ -201,7 +201,7 @@ void SdrPaintView::ImpClearVars() } SdrPaintView::SdrPaintView(SdrModel* pModel, OutputDevice* pOut) -: mpPageView(NULL), +: mpPageView(nullptr), maDefaultAttr(pModel->GetItemPool()), mbBufferedOutputAllowed(false), mbBufferedOverlayAllowed(false), @@ -216,7 +216,7 @@ SdrPaintView::SdrPaintView(SdrModel* pModel, OutputDevice* pOut) if(pOut) { - AddWindowToPaintView(pOut, 0); + AddWindowToPaintView(pOut, nullptr); } // flag to visualize groups @@ -255,7 +255,7 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); if (pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING) - mpDefaultStyleSheet = NULL; + mpDefaultStyleSheet = nullptr; return; } @@ -369,7 +369,7 @@ bool SdrPaintView::IsTextEdit() const // info about TextEditPageView. Default is 0L. SdrPageView* SdrPaintView::GetTextEditPageView() const { - return 0L; + return nullptr; } @@ -377,11 +377,11 @@ SdrPageView* SdrPaintView::GetTextEditPageView() const sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const { if (nMinMov>=0) return sal_uInt16(nMinMov); - if (pOut==NULL) + if (pOut==nullptr) { pOut = GetFirstOutputDevice(); } - if (pOut!=NULL) { + if (pOut!=nullptr) { return short(-pOut->PixelToLogic(Size(nMinMov,0)).Width()); } else { return 0; @@ -391,11 +391,11 @@ sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pO sal_uInt16 SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const { if (nHitTol>=0) return sal_uInt16(nHitTol); - if (pOut==NULL) + if (pOut==nullptr) { pOut = GetFirstOutputDevice(); } - if (pOut!=NULL) { + if (pOut!=nullptr) { return short(-pOut->PixelToLogic(Size(nHitTol,0)).Width()); } else { return 0; @@ -426,7 +426,7 @@ void SdrPaintView::ClearPageView() { InvalidateAllWin(); delete mpPageView; - mpPageView = 0L; + mpPageView = nullptr; } } @@ -453,7 +453,7 @@ void SdrPaintView::HideSdrPage() { mpPageView->Hide(); delete mpPageView; - mpPageView = 0L; + mpPageView = nullptr; } } @@ -803,7 +803,7 @@ void SdrPaintView::EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLa if(mpPageView) { // forget prepared SdrPageWindow - mpPageView->setPreparedPageWindow(0); + mpPageView->setPreparedPageWindow(nullptr); } } @@ -870,7 +870,7 @@ void SdrPaintView::ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow ) // need to set PreparedPageWindow to make DrawLayer use the correct ObjectContact mpPageView->setPreparedPageWindow(pKnownTarget); mpPageView->DrawLayer(nControlLayerId, &rPaintWindow.GetTargetOutputDevice()); - mpPageView->setPreparedPageWindow(0); + mpPageView->setPreparedPageWindow(nullptr); } } } @@ -901,7 +901,7 @@ void SdrPaintView::GlueInvalidate() const for (size_t nObjNum=0; nObjNum<nObjCount; ++nObjNum) { const SdrObject* pObj=pOL->GetObj(nObjNum); const SdrGluePointList* pGPL=pObj->GetGluePointList(); - if (pGPL!=NULL && pGPL->GetCount()!=0) { + if (pGPL!=nullptr && pGPL->GetCount()!=0) { pGPL->Invalidate(static_cast<vcl::Window&>(rOutDev), pObj); } } @@ -1003,11 +1003,11 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool /*bRep { // bReplaceAll has no effect here at all. bool bMeasure= dynamic_cast<const SdrView*>(this) != nullptr && static_cast<SdrView*>(this)->IsMeasureTool(); - const SfxPoolItem *pPoolItem=NULL; + const SfxPoolItem *pPoolItem=nullptr; if (rAttr.GetItemState(SDRATTR_LAYERID,true,&pPoolItem)==SfxItemState::SET) { SdrLayerID nLayerId=static_cast<const SdrLayerIdItem*>(pPoolItem)->GetValue(); const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayerPerID(nLayerId); - if (pLayer!=NULL) { + if (pLayer!=nullptr) { if (bMeasure) maMeasureLayer=pLayer->GetName(); else maActualLayer=pLayer->GetName(); } @@ -1037,7 +1037,7 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll) bool bHasEEFeatureItems=false; SfxItemIter aIter(rAttr); const SfxPoolItem* pItem=aIter.FirstItem(); - while (!bHasEEFeatureItems && pItem!=NULL) { + while (!bHasEEFeatureItems && pItem!=nullptr) { if (!IsInvalidItem(pItem)) { sal_uInt16 nW=pItem->Which(); if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=true; @@ -1068,7 +1068,7 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRe if (mpDefaultStyleSheet) StartListening(*mpDefaultStyleSheet); - if (pStyleSheet!=NULL && !bDontRemoveHardAttr) { + if (pStyleSheet!=nullptr && !bDontRemoveHardAttr) { SfxWhichIter aIter(pStyleSheet->GetItemSet()); sal_uInt16 nWhich=aIter.FirstWhich(); while (nWhich!=0) { diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index e7bc02ccec3c..da20cab33767 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -548,9 +548,9 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedPoints(); - sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size(); + sal_uIntPtr nPointCount=pPts==nullptr ? 0 : pPts->size(); SdrPathObj* pPath=dynamic_cast<SdrPathObj*>( pObj ); - if (nPointCount!=0 && pPath!=NULL) + if (nPointCount!=0 && pPath!=nullptr) { if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); @@ -616,8 +616,8 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/) { MovePoint(rPt,*static_cast<const Size*>(p1)); - if (pC1!=NULL) MovePoint(*pC1,*static_cast<const Size*>(p1)); - if (pC2!=NULL) MovePoint(*pC2,*static_cast<const Size*>(p1)); + if (pC1!=nullptr) MovePoint(*pC1,*static_cast<const Size*>(p1)); + if (pC2!=nullptr) MovePoint(*pC2,*static_cast<const Size*>(p1)); } void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz) @@ -633,8 +633,8 @@ void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz) static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* p2, const void* p3, const void* /*p4*/, const void* /*p5*/) { ResizePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3)); - if (pC1!=NULL) ResizePoint(*pC1,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3)); - if (pC2!=NULL) ResizePoint(*pC2,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3)); + if (pC1!=nullptr) ResizePoint(*pC1,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3)); + if (pC2!=nullptr) ResizePoint(*pC2,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3)); } void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact) @@ -650,8 +650,8 @@ void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFac static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* p3, const void* p4, const void* /*p5*/) { RotatePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4)); - if (pC1!=NULL) RotatePoint(*pC1,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4)); - if (pC2!=NULL) RotatePoint(*pC2,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4)); + if (pC1!=nullptr) RotatePoint(*pC1,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4)); + if (pC2!=nullptr) RotatePoint(*pC2,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4)); } void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nAngle) diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 2dc72aeb6db1..2a97790136cc 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -176,8 +176,8 @@ void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition) SdrSnapView::SdrSnapView(SdrModel* pModel1, OutputDevice* pOut) : SdrPaintView(pModel1,pOut) - , mpPageOriginOverlay(0L) - , mpHelpLineOverlay(0L) + , mpPageOriginOverlay(nullptr) + , mpHelpLineOverlay(nullptr) , nMagnSizPix(4) , nSnapAngle(1500) , nEliminatePolyPointLimitAngle(0) @@ -279,9 +279,9 @@ SdrSnap SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const if (!bSnapEnab) return SdrSnap::NOTSNAPPED; long x=rPnt.X(); long y=rPnt.Y(); - if (pPV==NULL) { + if (pPV==nullptr) { pPV=GetSdrPageView(); - if (pPV==NULL) return SdrSnap::NOTSNAPPED; + if (pPV==nullptr) return SdrSnap::NOTSNAPPED; } long dx=NOT_SNAPPED; @@ -457,10 +457,10 @@ bool SdrSnapView::BegSetPageOrg(const Point& rPnt) { BrkAction(); - DBG_ASSERT(0L == mpPageOriginOverlay, "SdrSnapView::BegSetPageOrg: There exists a ImplPageOriginOverlay (!)"); + DBG_ASSERT(nullptr == mpPageOriginOverlay, "SdrSnapView::BegSetPageOrg: There exists a ImplPageOriginOverlay (!)"); basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y()); mpPageOriginOverlay = new ImplPageOriginOverlay(*this, aStartPos); - maDragStat.Reset(GetSnapPos(rPnt,NULL)); + maDragStat.Reset(GetSnapPos(rPnt,nullptr)); return true; } @@ -469,7 +469,7 @@ void SdrSnapView::MovSetPageOrg(const Point& rPnt) { if(IsSetPageOrg()) { - maDragStat.NextMove(GetSnapPos(rPnt,NULL)); + maDragStat.NextMove(GetSnapPos(rPnt,nullptr)); DBG_ASSERT(mpPageOriginOverlay, "SdrSnapView::MovSetPageOrg: no ImplPageOriginOverlay (!)"); basegfx::B2DPoint aNewPos(maDragStat.GetNow().X(), maDragStat.GetNow().Y()); mpPageOriginOverlay->SetPosition(aNewPos); @@ -504,7 +504,7 @@ void SdrSnapView::BrkSetPageOrg() { DBG_ASSERT(mpPageOriginOverlay, "SdrSnapView::MovSetPageOrg: no ImplPageOriginOverlay (!)"); delete mpPageOriginOverlay; - mpPageOriginOverlay = 0L; + mpPageOriginOverlay = nullptr; } } @@ -512,7 +512,7 @@ void SdrSnapView::BrkSetPageOrg() bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const { - rpPV=NULL; + rpPV=nullptr; nTol=ImpGetHitTolLogic(nTol,&rOut); SdrPageView* pPV = GetSdrPageView(); @@ -545,11 +545,11 @@ bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV) Point aHelpLinePos = rHelpLine.GetPos(); basegfx::B2DPoint aStartPos(aHelpLinePos.X(), aHelpLinePos.Y()); - DBG_ASSERT(0L == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists a ImplHelpLineOverlay (!)"); + DBG_ASSERT(nullptr == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists a ImplHelpLineOverlay (!)"); mpHelpLineOverlay = new ImplHelpLineOverlay(*this, aStartPos, pPV, nHelpLineNum, rHelpLine.GetKind()); maDragStat.Reset(GetSnapPos(aHelpLinePos, pPV)); - maDragStat.SetMinMove(ImpGetMinMovLogic(-3, 0L)); + maDragStat.SetMinMove(ImpGetMinMovLogic(-3, nullptr)); bRet = true; } @@ -567,10 +567,10 @@ bool SdrSnapView::BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind) if(GetSdrPageView()) { - DBG_ASSERT(0L == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists a ImplHelpLineOverlay (!)"); + DBG_ASSERT(nullptr == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists a ImplHelpLineOverlay (!)"); basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y()); - mpHelpLineOverlay = new ImplHelpLineOverlay(*this, aStartPos, 0L, 0, eNewKind); - maDragStat.Reset(GetSnapPos(rPnt, 0L)); + mpHelpLineOverlay = new ImplHelpLineOverlay(*this, aStartPos, nullptr, 0, eNewKind); + maDragStat.Reset(GetSnapPos(rPnt, nullptr)); bRet = true; } @@ -596,7 +596,7 @@ void SdrSnapView::MovDragHelpLine(const Point& rPnt) { if(IsDragHelpLine() && maDragStat.CheckMinMoved(rPnt)) { - Point aPnt(GetSnapPos(rPnt, 0L)); + Point aPnt(GetSnapPos(rPnt, nullptr)); if(aPnt != maDragStat.GetNow()) { @@ -658,7 +658,7 @@ void SdrSnapView::BrkDragHelpLine() { DBG_ASSERT(mpHelpLineOverlay, "SdrSnapView::EndDragHelpLine: no ImplHelpLineOverlay (!)"); delete mpHelpLineOverlay; - mpHelpLineOverlay = 0L; + mpHelpLineOverlay = nullptr; } } diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index 303d5f711628..8e804d864d4d 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -53,7 +53,7 @@ void SdrText::CheckPortionInfo( SdrOutliner& rOutliner ) // TODO: optimization: we could create a BigTextObject mbPortionInfoChecked=true; - if(mpOutlinerParaObject!=NULL && rOutliner.ShouldCreateBigTextObject()) + if(mpOutlinerParaObject!=nullptr && rOutliner.ShouldCreateBigTextObject()) { // #i102062# MemoryLeak closed delete mpOutlinerParaObject; @@ -82,7 +82,7 @@ void SdrText::SetOutlinerParaObject( OutlinerParaObject* pTextObject ) // Update HitTestOutliner const SdrTextObj* pTestObj = mpModel->GetHitTestOutliner().GetTextObj(); if( pTestObj && pTestObj->GetOutlinerParaObject() == mpOutlinerParaObject ) - mpModel->GetHitTestOutliner().SetTextObj( 0 ); + mpModel->GetHitTestOutliner().SetTextObj( nullptr ); } delete mpOutlinerParaObject; @@ -106,12 +106,12 @@ OutlinerParaObject* SdrText::RemoveOutlinerParaObject() // Update HitTestOutliner const SdrTextObj* pTestObj = mpModel->GetHitTestOutliner().GetTextObj(); if( pTestObj && pTestObj->GetOutlinerParaObject() == mpOutlinerParaObject ) - mpModel->GetHitTestOutliner().SetTextObj( 0 ); + mpModel->GetHitTestOutliner().SetTextObj( nullptr ); } OutlinerParaObject* pOPO = mpOutlinerParaObject; - mpOutlinerParaObject = 0; + mpOutlinerParaObject = nullptr; mbPortionInfoChecked = false; return pOPO; @@ -125,7 +125,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) SdrModel* pOldModel = mpModel; mpModel = pNewModel; - if( mpOutlinerParaObject && pOldModel!=NULL && pNewModel!=NULL) + if( mpOutlinerParaObject && pOldModel!=nullptr && pNewModel!=nullptr) { bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT) == SfxItemState::SET; @@ -150,7 +150,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) SdrOutliner& rOutliner = mrObject.ImpGetDrawOutliner(); rOutliner.SetText(*mpOutlinerParaObject); delete mpOutlinerParaObject; - mpOutlinerParaObject=0; + mpOutlinerParaObject=nullptr; if (bScaleUnitChanged) { Fraction aMetricFactor=GetMapFactor(aOldUnit,aNewUnit).X(); diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 46264b3037d7..a942fda7b82a 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -160,8 +160,8 @@ void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear) double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, const Point& rRad, double& rSin, double& rCos, bool bVert) { - bool bC1=pC1!=NULL; - bool bC2=pC2!=NULL; + bool bC1=pC1!=nullptr; + bool bC2=pC2!=nullptr; long x0=rPnt.X(); long y0=rPnt.Y(); long cx=rCenter.X(); @@ -214,8 +214,8 @@ double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCent double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, const Point& rRad, double& rSin, double& rCos, bool bVert) { - bool bC1=pC1!=NULL; - bool bC2=pC2!=NULL; + bool bC1=pC1!=nullptr; + bool bC2=pC2!=nullptr; long x0=rPnt.X(); long y0=rPnt.Y(); long dx1=0,dy1=0; @@ -293,8 +293,8 @@ void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, b sal_uInt16 i=0; while (i<nPointAnz) { Point* pPnt=&rPoly[i]; - Point* pC1=NULL; - Point* pC2=NULL; + Point* pC1=nullptr; + Point* pC2=nullptr; if (i+1<nPointAnz && rPoly.IsControl(i)) { // control point to the left pC1=pPnt; i++; @@ -316,8 +316,8 @@ void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bo sal_uInt16 i=0; while (i<nPointAnz) { Point* pPnt=&rPoly[i]; - Point* pC1=NULL; - Point* pC2=NULL; + Point* pC1=nullptr; + Point* pC2=nullptr; if (i+1<nPointAnz && rPoly.IsControl(i)) { // control point to the left pC1=pPnt; i++; @@ -339,8 +339,8 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, sal_uInt16 i=0; while (i<nPointAnz) { Point* pPnt=&rPoly[i]; - Point* pC1=NULL; - Point* pC2=NULL; + Point* pC1=nullptr; + Point* pC2=nullptr; if (i+1<nPointAnz && rPoly.IsControl(i)) { // control point to the left pC1=pPnt; i++; diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 5c8599385caa..34dc6f961738 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -64,21 +64,21 @@ SdrUndoAction::~SdrUndoAction() {} bool SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const { SdrView* pV=dynamic_cast<SdrView*>( &rView ); - if (pV!=NULL) return CanSdrRepeat(*pV); + if (pV!=nullptr) return CanSdrRepeat(*pV); return false; } void SdrUndoAction::Repeat(SfxRepeatTarget& rView) { SdrView* pV=dynamic_cast<SdrView*>( &rView ); - if (pV!=NULL) SdrRepeat(*pV); - DBG_ASSERT(pV!=NULL,"Repeat: SfxRepeatTarget that was handed over is not a SdrView"); + if (pV!=nullptr) SdrRepeat(*pV); + DBG_ASSERT(pV!=nullptr,"Repeat: SfxRepeatTarget that was handed over is not a SdrView"); } OUString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const { SdrView* pV=dynamic_cast<SdrView*>( &rView ); - if (pV!=NULL) return GetSdrRepeatComment(*pV); + if (pV!=nullptr) return GetSdrRepeatComment(*pV); return OUString(); } @@ -265,20 +265,20 @@ void SdrUndoAttrObj::ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& rSt SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSaveText) : SdrUndoObj(rNewObj) - , pUndoSet(NULL) - , pRedoSet(NULL) - , pRepeatSet(NULL) + , pUndoSet(nullptr) + , pRedoSet(nullptr) + , pRepeatSet(nullptr) , mxUndoStyleSheet() , mxRedoStyleSheet() , bHaveToTakeRedoSet(true) - , pTextUndo(NULL) - , pTextRedo(NULL) - , pUndoGroup(NULL) + , pTextUndo(nullptr) + , pTextRedo(nullptr) + , pUndoGroup(nullptr) { bStyleSheet = bStyleSheet1; SdrObjList* pOL = rNewObj.GetSubList(); - bool bIsGroup(pOL!=NULL && pOL->GetObjCount()); + bool bIsGroup(pOL!=nullptr && pOL->GetObjCount()); bool bIs3DScene(bIsGroup && dynamic_cast< E3dScene* >(pObj) != nullptr); if(bIsGroup) @@ -534,7 +534,7 @@ void SdrUndoAttrObj::SdrRepeat(SdrView& rView) bool SdrUndoAttrObj::CanSdrRepeat(SdrView& rView) const { - return (pRepeatSet!=0L && rView.AreObjectsMarked()); + return (pRepeatSet!=nullptr && rView.AreObjectsMarked()); } OUString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const @@ -601,12 +601,12 @@ OUString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) : SdrUndoObj(rNewObj) - , pUndoGeo(NULL) - , pRedoGeo(NULL) - , pUndoGroup(NULL) + , pUndoGeo(nullptr) + , pRedoGeo(nullptr) + , pUndoGroup(nullptr) { SdrObjList* pOL=rNewObj.GetSubList(); - if (pOL!=NULL && pOL->GetObjCount() && dynamic_cast<const E3dScene* >( &rNewObj) == nullptr) + if (pOL!=nullptr && pOL->GetObjCount() && dynamic_cast<const E3dScene* >( &rNewObj) == nullptr) { // this is a group object! // If this were 3D scene, we'd only add an Undo for the scene itself @@ -682,8 +682,8 @@ OUString SdrUndoGeoObj::GetComment() const SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect) : SdrUndoObj(rNewObj) , bOwner(false) - , pView(NULL) - , pPageView(NULL) + , pView(nullptr) + , pPageView(nullptr) { pObjList=pObj->GetObjList(); if (bOrdNumDirect) @@ -700,7 +700,7 @@ SdrUndoObjList::~SdrUndoObjList() { SolarMutexGuard aGuard; - if (pObj!=NULL && IsOwner()) + if (pObj!=nullptr && IsOwner()) { // Attribute have to go back to the regular Pool SetOwner(false); @@ -902,7 +902,7 @@ SdrUndoReplaceObj::SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, b SdrUndoReplaceObj::~SdrUndoReplaceObj() { - if (pObj!=NULL && IsOldOwner()) + if (pObj!=nullptr && IsOldOwner()) { // Attribute have to go back into the Pool SetOldOwner(false); @@ -910,7 +910,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj() // now delete SdrObject::Free( pObj ); } - if (pNewObj!=NULL && IsNewOwner()) + if (pNewObj!=nullptr && IsNewOwner()) { // Attribute have to go back into the Pool SetNewOwner(false); @@ -1019,7 +1019,7 @@ void SdrUndoObjOrdNum::Undo() ImpShowPageOfThisObject(); SdrObjList* pOL=pObj->GetObjList(); - if (pOL==NULL) + if (pOL==nullptr) { OSL_FAIL("UndoObjOrdNum: pObj does not have an ObjList."); return; @@ -1030,7 +1030,7 @@ void SdrUndoObjOrdNum::Undo() void SdrUndoObjOrdNum::Redo() { SdrObjList* pOL=pObj->GetObjList(); - if (pOL==NULL) + if (pOL==nullptr) { OSL_FAIL("RedoObjOrdNum: pObj does not have an ObjList."); return; @@ -1052,8 +1052,8 @@ OUString SdrUndoObjOrdNum::GetComment() const SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText) : SdrUndoObj(rNewObj) - , pOldText(NULL) - , pNewText(NULL) + , pOldText(nullptr) + , pNewText(nullptr) , bNewTextAvailable(false) , bEmptyPresObj(false) , mnText(nText) @@ -1106,7 +1106,7 @@ void SdrUndoObjSetText::Undo() if (pText) { // copy text for Undo, because the original now belongs to SetOutlinerParaObject() - OutlinerParaObject* pText1 = pOldText ? new OutlinerParaObject(*pOldText) : NULL; + OutlinerParaObject* pText1 = pOldText ? new OutlinerParaObject(*pOldText) : nullptr; pText->SetOutlinerParaObject(pText1); pTarget->NbcSetOutlinerParaObjectForText(pText1, pText); } @@ -1141,7 +1141,7 @@ void SdrUndoObjSetText::Redo() if (pText) { // copy text for Undo, because the original now belongs to SetOutlinerParaObject() - OutlinerParaObject* pText1 = pNewText ? new OutlinerParaObject(*pNewText) : NULL; + OutlinerParaObject* pText1 = pNewText ? new OutlinerParaObject(*pNewText) : nullptr; pTarget->NbcSetOutlinerParaObjectForText( pText1, pText ); } @@ -1195,13 +1195,13 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView) { SdrObject* pObj2=rML.GetMark(nm)->GetMarkedSdrObj(); SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( pObj2 ); - if (pTextObj!=NULL) + if (pTextObj!=nullptr) { if( bUndo ) rView.AddUndo(new SdrUndoObjSetText(*pTextObj,0)); OutlinerParaObject* pText1=pNewText; - if (pText1!=NULL) + if (pText1!=nullptr) pText1 = new OutlinerParaObject(*pText1); pTextObj->SetOutlinerParaObject(pText1); } @@ -1400,7 +1400,7 @@ void SdrUndoPage::ImpRemovePage(sal_uInt16 nNum) DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpRemovePage(): mrPage is not inserted."); if (mrPage.IsInserted()) { - SdrPage* pChkPg=NULL; + SdrPage* pChkPg=nullptr; if (mrPage.IsMasterPage()) { pChkPg=rMod.RemoveMasterPage(nNum); @@ -1456,7 +1456,7 @@ SdrUndoPageList::~SdrUndoPageList() SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg) : SdrUndoPageList(rNewPg) - , pUndoGroup(NULL) + , pUndoGroup(nullptr) { bItsMine = true; @@ -1495,7 +1495,7 @@ SdrUndoDelPage::~SdrUndoDelPage() void SdrUndoDelPage::Undo() { ImpInsertPage(nPageNum); - if (pUndoGroup!=NULL) + if (pUndoGroup!=nullptr) { // recover master page relationships pUndoGroup->Undo(); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index c007a337d4e9..1bac9f79fa7a 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -53,11 +53,11 @@ SdrViewEvent::SdrViewEvent() -: pHdl(NULL), - pObj(NULL), - pRootObj(NULL), - pPV(NULL), - pURLField(NULL), +: pHdl(nullptr), + pObj(nullptr), + pRootObj(nullptr), + pPV(nullptr), + pURLField(nullptr), eHit(SDRHIT_NONE), eEvent(SDREVENT_NONE), eHdlKind(HDL_MOVE), @@ -194,7 +194,7 @@ bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) case KEY_ESCAPE: { if (IsTextEdit()) SdrEndTextEdit(); if (IsAction()) BrkAction(); - if (pWin!=NULL) pWin->ReleaseMouse(); + if (pWin!=nullptr) pWin->ReleaseMouse(); } break; case KEY_DELETE: DeleteMarked(); break; case KEY_CUT: case KEY_DELETE+KEY_SHIFT: Cut(); break; @@ -208,7 +208,7 @@ bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) } // switch } } // switch - if (bRet && pWin!=NULL) { + if (bRet && pWin!=nullptr) { pWin->SetPointer(GetPreferredPointer( pWin->PixelToLogic(pWin->ScreenToOutputPixel( pWin->GetPointerPosPixel() ) ), pWin, @@ -284,12 +284,12 @@ SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, SdrMouseEventKind nEve rVEvt.nMouseMode=rMEvt.GetMode(); rVEvt.nMouseCode=rMEvt.GetButtons() | rMEvt.GetModifier(); const OutputDevice* pOut=mpActualOutDev; - if (pOut==NULL) + if (pOut==nullptr) { pOut = GetFirstOutputDevice(); } Point aPnt(rMEvt.GetPosPixel()); - if (pOut!=NULL) aPnt=pOut->PixelToLogic(aPnt); + if (pOut!=nullptr) aPnt=pOut->PixelToLogic(aPnt); rVEvt.aLogicPos=aPnt; return PickAnything(aPnt,rVEvt); } @@ -320,7 +320,7 @@ SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, SdrMouseEventKind nEve SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const { const OutputDevice* pOut=mpActualOutDev; - if (pOut==NULL) + if (pOut==nullptr) { pOut = GetFirstOutputDevice(); } @@ -340,10 +340,10 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; SdrHitKind eHit=SDRHIT_NONE; - SdrHdl* pHdl=pOut!=NULL && !bTextEditSel ? PickHandle(aLocalLogicPosition) : NULL; - SdrPageView* pPV=NULL; - SdrObject* pObj=NULL; - SdrObject* pHitObj=NULL; + SdrHdl* pHdl=pOut!=nullptr && !bTextEditSel ? PickHandle(aLocalLogicPosition) : nullptr; + SdrPageView* pPV=nullptr; + SdrObject* pObj=nullptr; + SdrObject* pHitObj=nullptr; bool bHitPassDirect=true; sal_uInt16 nHlplIdx=0; sal_uInt16 nGlueId=0; @@ -352,11 +352,11 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co eHit=SDRHIT_TEXTEDIT; bTextEditHit=true; } - else if (pHdl!=NULL) + else if (pHdl!=nullptr) { eHit=SDRHIT_HANDLE; // handle is hit: highest priority } - else if (bEditMode && IsHlplVisible() && IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,mnHitTolLog,*pOut,nHlplIdx,pPV)) + else if (bEditMode && IsHlplVisible() && IsHlplFront() && pOut!=nullptr && PickHelpLine(aLocalLogicPosition,mnHitTolLog,*pOut,nHlplIdx,pPV)) { eHit=SDRHIT_HELPLINE; // help line in the foreground hit: can be moved now } @@ -405,7 +405,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co } } } - else if (bEditMode && IsHlplVisible() && !IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,mnHitTolLog,*pOut,nHlplIdx,pPV)) + else if (bEditMode && IsHlplVisible() && !IsHlplFront() && pOut!=nullptr && PickHelpLine(aLocalLogicPosition,mnHitTolLog,*pOut,nHlplIdx,pPV)) { eHit=SDRHIT_HELPLINE; // help line in foreground hit: can be moved now } @@ -414,13 +414,13 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co bool bRoot=pObj->HasMacro(); bool bDeep=pObj!=pHitObj && pHitObj->HasMacro(); bool bMid=false; // Have we hit upon a grouped group with a macro? - SdrObject* pMidObj=NULL; + SdrObject* pMidObj=nullptr; if (pObj!=pHitObj) { - SdrObject* pObjTmp=NULL; + SdrObject* pObjTmp=nullptr; pObjTmp=pHitObj->GetUpGroup(); - if (pObjTmp==pObj) pObjTmp=NULL; - while (pObjTmp!=NULL) + if (pObjTmp==pObj) pObjTmp=nullptr; + while (pObjTmp!=nullptr) { if (pObjTmp->HasMacro()) { @@ -428,7 +428,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co pMidObj=pObjTmp; } pObjTmp=pObjTmp->GetUpGroup(); - if (pObjTmp==pObj) pObjTmp=NULL; + if (pObjTmp==pObj) pObjTmp=nullptr; } } @@ -457,7 +457,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if (IsMacroMode() && eHit==SDRHIT_UNMARKEDOBJECT) { SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( pHitObj ); - if (pTextObj!=NULL && pTextObj->HasText()) + if (pTextObj!=nullptr && pTextObj->HasText()) { bool bTEHit(pPV && SdrObjectPrimitiveHit(*pTextObj, aLocalLogicPosition, 0, *pPV, &pPV->GetVisibleLayers(), true)); @@ -491,10 +491,10 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co OutlinerView aOLV(pOutliner, const_cast<vcl::Window*>(static_cast<const vcl::Window*>(mpActualOutDev.get()))); const EditView& aEV=aOLV.GetEditView(); const SvxFieldItem* pItem=aEV.GetField(aTemporaryTextRelativePosition); - if (pItem!=NULL) { + if (pItem!=nullptr) { const SvxFieldData* pFld=pItem->GetField(); const SvxURLField* pURL=dynamic_cast<const SvxURLField*>( pFld ); - if (pURL!=NULL) { + if (pURL!=nullptr) { eHit=SDRHIT_URLFIELD; rVEvt.pURLField=pURL; } @@ -554,8 +554,8 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co } if (!bHitPassDirect && eHit==SDRHIT_UNMARKEDOBJECT) { eHit=SDRHIT_NONE; - pObj=NULL; - pPV=NULL; + pObj=nullptr; + pPV=nullptr; } bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; @@ -609,7 +609,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co } else if (bMouseDown && bMouseLeft) { - if (rVEvt.nMouseClicks==2 && rVEvt.nMouseCode==MOUSE_LEFT && pObj!=NULL && pHitObj!=NULL && pHitObj->HasTextEdit() && eHit==SDRHIT_MARKEDOBJECT) + if (rVEvt.nMouseClicks==2 && rVEvt.nMouseCode==MOUSE_LEFT && pObj!=nullptr && pHitObj!=nullptr && pHitObj->HasTextEdit() && eHit==SDRHIT_MARKEDOBJECT) { rVEvt.pRootObj=pObj; pObj=pHitObj; @@ -732,7 +732,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co rVEvt.aLogicPos=aLocalLogicPosition; rVEvt.pHdl=pHdl; rVEvt.pObj=pObj; - if(rVEvt.pRootObj==NULL) + if(rVEvt.pRootObj==nullptr) rVEvt.pRootObj=pObj; rVEvt.pPV=pPV; rVEvt.nHlplIdx=nHlplIdx; @@ -830,7 +830,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) 1,rVEvt.nMouseMode,rVEvt.nMouseCode,rVEvt.nMouseCode); OutlinerView* pOLV=GetTextEditOutlinerView(); - if (pOLV!=NULL) { + if (pOLV!=nullptr) { pOLV->MouseButtonDown(aMEvt); // event for the Outliner, but without double-click pOLV->MouseButtonUp(aMEvt); // event for the Outliner, but without double-click } @@ -858,7 +858,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) bUnmark=nCount1<nCount0; } if (!bUnmark) { - BegDragObj(aLogicPos,NULL,nullptr,mnMinMovLog); + BegDragObj(aLogicPos,nullptr,nullptr,mnMinMovLog); bRet=true; } } break; @@ -870,7 +870,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) bRet=MarkPoint(*rVEvt.pHdl,rVEvt.bUnmark); } if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) { - BegDragObj(aLogicPos,NULL,rVEvt.pHdl,mnMinMovLog); + BegDragObj(aLogicPos,nullptr,rVEvt.pHdl,mnMinMovLog); bRet=true; } } break; @@ -883,7 +883,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) { SdrHdl* pHdl=GetGluePointHdl(rVEvt.pObj,rVEvt.nGlueId); - BegDragObj(aLogicPos,NULL,pHdl,mnMinMovLog); + BegDragObj(aLogicPos,nullptr,pHdl,mnMinMovLog); bRet=true; } } break; @@ -898,7 +898,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } break; case SDREVENT_BEGINSGLUEPOINT: bRet=BegInsGluePoint(aLogicPos); break; case SDREVENT_BEGDRAGHELPLINE: bRet=BegDragHelpLine(rVEvt.nHlplIdx,rVEvt.pPV); break; - case SDREVENT_BEGDRAGOBJ: bRet=BegDragObj(aLogicPos,NULL,rVEvt.pHdl,mnMinMovLog); break; + case SDREVENT_BEGDRAGOBJ: bRet=BegDragObj(aLogicPos,nullptr,rVEvt.pHdl,mnMinMovLog); break; case SDREVENT_BEGCREATEOBJ: { if (nAktInvent==SdrInventor && nAktIdent==OBJ_CAPTION) { long nHgt=SdrEngineDefaults::GetFontHeight(); @@ -922,7 +922,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) MouseEvent aMEvt(mpActualOutDev->LogicToPixel(aLogicPos), 1,rVEvt.nMouseMode,rVEvt.nMouseCode,rVEvt.nMouseCode); OutlinerView* pOLV=GetTextEditOutlinerView(); - if (pOLV!=NULL) pOLV->MouseButtonDown(aMEvt); // event for the Outliner, but without double-click + if (pOLV!=nullptr) pOLV->MouseButtonDown(aMEvt); // event for the Outliner, but without double-click } } break; default: break; @@ -1002,7 +1002,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* aVEvt.nMouseCode=(nModifier&(KEY_SHIFT|KEY_MOD1|KEY_MOD2))|MOUSE_LEFT; // to see what would happen on MouseLeftDown aVEvt.bMouseDown=!bLeftDown; // What if ..? aVEvt.bMouseUp=bLeftDown; // What if ..? - if (pOut!=NULL) + if (pOut!=nullptr) const_cast<SdrView*>(this)->SetActualWin(pOut); SdrHitKind eHit=PickAnything(rMousePos,aVEvt); SdrEventKind eEvent=aVEvt.eEvent; @@ -1062,10 +1062,10 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* bool bMarkHit=eHit==SDRHIT_MARKEDOBJECT; SdrHdl* pHdl=aVEvt.pHdl; // now check the pointers for dragging - if (pHdl!=NULL || bMarkHit) { - SdrHdlKind eHdl= pHdl!=NULL ? pHdl->GetKind() : HDL_MOVE; - bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl(); - bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl(); + if (pHdl!=nullptr || bMarkHit) { + SdrHdlKind eHdl= pHdl!=nullptr ? pHdl->GetKind() : HDL_MOVE; + bool bCorner=pHdl!=nullptr && pHdl->IsCornerHdl(); + bool bVertex=pHdl!=nullptr && pHdl->IsVertexHdl(); bool bMov=eHdl==HDL_MOVE; if (bMov && (meDragMode==SDRDRAG_MOVE || meDragMode==SDRDRAG_RESIZE || mbMarkedHitMovesAlways)) { if (!IsMoveAllowed()) return Pointer(PointerStyle::Arrow); // because double click or drag & drop is possible @@ -1108,7 +1108,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* bool b90=false; bool b45=false; Point aDif; - if (pH1!=NULL && pH2!=NULL) { + if (pH1!=nullptr && pH2!=nullptr) { aDif=pH2->GetPos()-pH1->GetPos(); b90=(aDif.X()==0) || aDif.Y()==0; b45=b90 || (std::abs(aDif.X())==std::abs(aDif.Y())); @@ -1157,7 +1157,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* if ((bCorner || bVertex) && !IsResizeAllowed(true)) return Pointer(PointerStyle::NotAllowed); } } - if (pHdl!=NULL) return pHdl->GetPointer(); + if (pHdl!=nullptr) return pHdl->GetPointer(); if (bMov) { if (!IsMoveAllowed()) return Pointer(PointerStyle::Arrow); // because double click or drag & drop is possible return Pointer(PointerStyle::Move); @@ -1175,7 +1175,7 @@ OUString SdrView::GetStatusText() aStr += STR_NOTHING; - if (pAktCreate!=NULL) + if (pAktCreate!=nullptr) { aStr=pAktCreate->getSpecialDragComment(maDragStat); @@ -1234,7 +1234,7 @@ OUString SdrView::GetStatusText() aStr = ImpGetResStr(STR_ViewMarkGluePoints); } } - else if (IsTextEdit() && pTextEditOutlinerView!=NULL) { + else if (IsTextEdit() && pTextEditOutlinerView!=nullptr) { aStr=ImpGetResStr(STR_ViewTextEdit); // "TextEdit - Row y, Column x"; ESelection aSel(pTextEditOutlinerView->GetSelection()); long nPar=aSel.nEndPara,nLin=0,nCol=aSel.nEndPos; diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index bfa66c5c839b..3cdfc2c1b57f 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -34,7 +34,7 @@ void SdrViewIter::ImpInitVars() mnListenerNum = 0L; mnPageViewNum = 0L; mnOutDevNum = 0L; - mpAktView = 0L; + mpAktView = nullptr; } @@ -42,8 +42,8 @@ void SdrViewIter::ImpInitVars() SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) { mpPage = pPage; - mpModel = (pPage) ? pPage->GetModel() : 0L; - mpObject = 0L; + mpModel = (pPage) ? pPage->GetModel() : nullptr; + mpObject = nullptr; mbNoMasterPage = bNoMasterPage; ImpInitVars(); } @@ -53,14 +53,14 @@ SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage) { mpObject = pObject; - mpModel = (pObject) ? pObject->GetModel() : 0L; - mpPage = (pObject) ? pObject->GetPage() : 0L; + mpModel = (pObject) ? pObject->GetModel() : nullptr; + mpPage = (pObject) ? pObject->GetPage() : nullptr; mbNoMasterPage = bNoMasterPage; if(!mpModel || !mpPage) { - mpModel = 0L; - mpPage = 0L; + mpModel = nullptr; + mpPage = nullptr; } ImpInitVars(); @@ -162,7 +162,7 @@ SdrView* SdrViewIter::ImpFindView() } } - mpAktView = 0L; + mpAktView = nullptr; return mpAktView; } diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 0f65e951c19f..ab6c8a4c8d2b 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -97,11 +97,11 @@ bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const void SdrExchangeView::ImpGetPasteObjList(Point& /*rPos*/, SdrObjList*& rpLst) { - if (rpLst==NULL) + if (rpLst==nullptr) { SdrPageView* pPV = GetSdrPageView(); - if (pPV!=NULL) { + if (pPV!=nullptr) { rpLst=pPV->GetObjList(); } } @@ -111,13 +111,13 @@ bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& r { bool bRet=false; rLayer=0; - if (pObjList!=NULL) { + if (pObjList!=nullptr) { const SdrPage* pPg=pObjList->GetPage(); - if (pPg!=NULL) { + if (pPg!=nullptr) { rLayer=pPg->GetLayerAdmin().GetLayerID(maActualLayer,true); if (rLayer==SDRLAYER_NOTFOUND) rLayer=0; SdrPageView* pPV = GetSdrPageView(); - if (pPV!=NULL) { + if (pPV!=nullptr) { bRet=!pPV->GetLockedLayers().IsSet(rLayer) && pPV->GetVisibleLayers().IsSet(rLayer); } } @@ -133,21 +133,21 @@ bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList* Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return false; + if (pLst==nullptr) return false; SdrLayerID nLayer; if (!ImpGetPasteLayer(pLst,nLayer)) return false; bool bUnmark = (nOptions & (SdrInsertFlags::DONTMARK|SdrInsertFlags::ADDMARK))==SdrInsertFlags::NONE && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); Rectangle aTextRect(0,0,500,500); SdrPage* pPage=pLst->GetPage(); - if (pPage!=NULL) { + if (pPage!=nullptr) { aTextRect.SetSize(pPage->GetSize()); } SdrRectObj* pObj=new SdrRectObj(OBJ_TEXT,aTextRect); pObj->SetModel(mpModel); pObj->SetLayer(nLayer); pObj->NbcSetText(rStr); // SetText before SetAttr, else SetAttr doesn't work! - if (mpDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(mpDefaultStyleSheet, false); + if (mpDefaultStyleSheet!=nullptr) pObj->NbcSetStyleSheet(mpDefaultStyleSheet, false); pObj->SetMergedItemSet(maDefaultAttr); @@ -170,20 +170,20 @@ bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return false; + if (pLst==nullptr) return false; SdrLayerID nLayer; if (!ImpGetPasteLayer(pLst,nLayer)) return false; bool bUnmark=(nOptions&(SdrInsertFlags::DONTMARK|SdrInsertFlags::ADDMARK))==SdrInsertFlags::NONE && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); Rectangle aTextRect(0,0,500,500); SdrPage* pPage=pLst->GetPage(); - if (pPage!=NULL) { + if (pPage!=nullptr) { aTextRect.SetSize(pPage->GetSize()); } SdrRectObj* pObj=new SdrRectObj(OBJ_TEXT,aTextRect); pObj->SetModel(mpModel); pObj->SetLayer(nLayer); - if (mpDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(mpDefaultStyleSheet, false); + if (mpDefaultStyleSheet!=nullptr) pObj->NbcSetStyleSheet(mpDefaultStyleSheet, false); pObj->SetMergedItemSet(maDefaultAttr); @@ -245,7 +245,7 @@ bool SdrExchangeView::Paste( Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); - SdrPageView* pMarkPV=NULL; + SdrPageView* pMarkPV=nullptr; SdrPageView* pPV = GetSdrPageView(); if(pPV) @@ -255,7 +255,7 @@ bool SdrExchangeView::Paste( } ImpLimitToWorkArea( aPos ); - if (pLst==NULL) + if (pLst==nullptr) return false; bool bUnmark=(nOptions&(SdrInsertFlags::DONTMARK|SdrInsertFlags::ADDMARK))==SdrInsertFlags::NONE && !IsTextEdit(); @@ -290,7 +290,7 @@ bool SdrExchangeView::Paste( Size aSiz(aDist.X(),aDist.Y()); size_t nCloneErrCnt = 0; const size_t nObjCount = pSrcPg->GetObjCount(); - bool bMark = pMarkPV!=NULL && !IsTextEdit() && (nOptions&SdrInsertFlags::DONTMARK)==SdrInsertFlags::NONE; + bool bMark = pMarkPV!=nullptr && !IsTextEdit() && (nOptions&SdrInsertFlags::DONTMARK)==SdrInsertFlags::NONE; // #i13033# // New mechanism to re-create the connections of cloned connectors @@ -302,7 +302,7 @@ bool SdrExchangeView::Paste( SdrObject* pNeuObj = pSrcOb->CloneWithShellIDs(rSrcShellID, rDestShellID); - if (pNeuObj!=NULL) + if (pNeuObj!=nullptr) { if(bResize) { @@ -427,7 +427,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po if( IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj)); - SdrPageView* pMarkPV=NULL; + SdrPageView* pMarkPV=nullptr; SdrPageView* pPV = GetSdrPageView(); if(pPV) @@ -436,7 +436,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po pMarkPV=pPV; } - bool bMark = pMarkPV!=NULL && !IsTextEdit() && (nOptions&SdrInsertFlags::DONTMARK)==SdrInsertFlags::NONE; + bool bMark = pMarkPV!=nullptr && !IsTextEdit() && (nOptions&SdrInsertFlags::DONTMARK)==SdrInsertFlags::NONE; if (bMark) { // select object the first PageView we found MarkObj(pObj,pMarkPV); @@ -539,7 +539,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked) co if( bNoVDevIfOneMtfMarked ) { SdrObject* pGrafObjTmp = GetMarkedObjectByIndex( 0 ); - SdrGrafObj* pGrafObj = ( GetMarkedObjectCount() ==1 ) ? dynamic_cast<SdrGrafObj*>( pGrafObjTmp ) : NULL; + SdrGrafObj* pGrafObj = ( GetMarkedObjectCount() ==1 ) ? dynamic_cast<SdrGrafObj*>( pGrafObjTmp ) : nullptr; if( pGrafObj ) { diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx index 7ef3c006afb4..7d58612b60e8 100644 --- a/svx/source/svdraw/textchainflow.cxx +++ b/svx/source/svdraw/textchainflow.cxx @@ -38,8 +38,8 @@ TextChainFlow::TextChainFlow(SdrTextObj *pChainTarget) mbOFisUFinduced = false; - mpOverflChText = NULL; - mpUnderflChText = NULL; + mpOverflChText = nullptr; + mpUnderflChText = nullptr; maCursorEvent = CursorChainingEvent::NULL_EVENT; mbPossiblyCursorOut = false; @@ -72,7 +72,7 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner *p bool bOldUpdateMode = pFlowOutl->GetUpdateMode(); // XXX: This could be reorganized moving most of this stuff inside EditingTextChainFlow - if (pParamOutl != NULL) + if (pParamOutl != nullptr) { // We need this since it's required to check overflow pFlowOutl->SetUpdateMode(true); @@ -101,12 +101,12 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner *p mpOverflChText = bOverflow ? new OFlowChainedText(pFlowOutl, bMustMergeParaOF) : - NULL; + nullptr; // Set current underflowing text (if any) mpUnderflChText = bUnderflow ? new UFlowChainedText(pFlowOutl, bMustMergeParaAmongLinks) : - NULL; + nullptr; // Reset update mode // Reset it here because we use WriteRTF (needing updatemode = true) in the two constructors above if (!bOldUpdateMode) // Reset only if the old value was false @@ -140,7 +140,7 @@ void TextChainFlow::impUpdateCursorInfo() void TextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl) { - impCheckForFlowEvents(pFlowOutl, NULL); + impCheckForFlowEvents(pFlowOutl, nullptr); } @@ -275,7 +275,7 @@ void EditingTextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl) { // if this is editing outliner no need to set parameters if (pFlowOutl == GetLinkTarget()->pEdtOutl) - impCheckForFlowEvents(pFlowOutl, NULL); + impCheckForFlowEvents(pFlowOutl, nullptr); else impCheckForFlowEvents(pFlowOutl, GetLinkTarget()->pEdtOutl); diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 4f67b59654ff..74b4fa85b1d6 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -50,7 +50,7 @@ AccessibleCell::AccessibleCell( const css::uno::Reference< css::accessibility::X : AccessibleCellBase( rxParent, AccessibleRole::TABLE_CELL ) , maShapeTreeInfo( rShapeTreeInfo ) , mnIndexInParent( nIndex ) -, mpText( NULL ) +, mpText( nullptr ) , mxCell( rCell ) { //Init the pAccTable var @@ -61,7 +61,7 @@ AccessibleCell::AccessibleCell( const css::uno::Reference< css::accessibility::X AccessibleCell::~AccessibleCell() { - DBG_ASSERT( mpText == 0, "svx::AccessibleCell::~AccessibleCell(), not disposed!?" ); + DBG_ASSERT( mpText == nullptr, "svx::AccessibleCell::~AccessibleCell(), not disposed!?" ); } @@ -70,11 +70,11 @@ void AccessibleCell::Init() { SdrView* pView = maShapeTreeInfo.GetSdrView(); const vcl::Window* pWindow = maShapeTreeInfo.GetWindow (); - if( (pView != NULL) && (pWindow != NULL) && mxCell.is()) + if( (pView != nullptr) && (pWindow != nullptr) && mxCell.is()) { OutlinerParaObject* pOutlinerParaObject = mxCell->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active - bool bOwnParaObject = pOutlinerParaObject != 0; + bool bOwnParaObject = pOutlinerParaObject != nullptr; if( !pOutlinerParaObject ) pOutlinerParaObject = mxCell->GetOutlinerParaObject(); @@ -99,7 +99,7 @@ bool AccessibleCell::SetState (sal_Int16 aState) { bool bStateHasChanged = false; - if (aState == AccessibleStateType::FOCUSED && mpText != NULL) + if (aState == AccessibleStateType::FOCUSED && mpText != nullptr) { // Offer FOCUSED state to edit engine and detect whether the state // changes. @@ -119,7 +119,7 @@ bool AccessibleCell::ResetState (sal_Int16 aState) { bool bStateHasChanged = false; - if (aState == AccessibleStateType::FOCUSED && mpText != NULL) + if (aState == AccessibleStateType::FOCUSED && mpText != nullptr) { // Try to remove FOCUSED state from the edit engine and detect // whether the state changes. @@ -173,7 +173,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (css::uno::Ru { SolarMutexGuard aSolarGuard; ThrowIfDisposed (); - return mpText != NULL ? mpText->GetChildCount () : 0; + return mpText != nullptr ? mpText->GetChildCount () : 0; } @@ -204,7 +204,7 @@ Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet() ::osl::MutexGuard aGuard (maMutex); Reference<XAccessibleStateSet> xStateSet; - if (rBHelper.bDisposed || mpText == NULL) + if (rBHelper.bDisposed || mpText == nullptr) { // Return a minimal state set that only contains the DEFUNC state. xStateSet = AccessibleContextBase::getAccessibleStateSet (); @@ -216,7 +216,7 @@ Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet() if(pStateSet) { // Merge current FOCUSED state from edit engine. - if (mpText != NULL) + if (mpText != nullptr) { if (mpText->HaveFocus()) pStateSet->AddState (AccessibleStateType::FOCUSED); @@ -326,7 +326,7 @@ css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, const ::Rectangle aCellRect( mxCell->getCellRect() ); // Transform coordinates from internal to pixel. - if (maShapeTreeInfo.GetViewForwarder() == NULL) + if (maShapeTreeInfo.GetViewForwarder() == nullptr) throw uno::RuntimeException ("AccessibleCell has no valid view forwarder",static_cast<uno::XWeak*>(this)); ::Size aPixelSize( maShapeTreeInfo.GetViewForwarder()->LogicToPixel(::Size(aCellRect.GetWidth(), aCellRect.GetHeight())) ); @@ -485,7 +485,7 @@ void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAcces else { AccessibleContextBase::addAccessibleEventListener (rxListener); - if (mpText != NULL) + if (mpText != nullptr) mpText->AddEventListener (rxListener); } } @@ -496,7 +496,7 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc { SolarMutexGuard aSolarGuard; AccessibleContextBase::removeAccessibleEventListener(rxListener); - if (mpText != NULL) + if (mpText != nullptr) mpText->RemoveEventListener (rxListener); } @@ -553,14 +553,14 @@ void AccessibleCell::disposing() // Make sure to send an event that this object loses the focus in the // case that it has the focus. ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); - if (pStateSet != NULL) + if (pStateSet != nullptr) pStateSet->RemoveState(AccessibleStateType::FOCUSED); - if (mpText != NULL) + if (mpText != nullptr) { mpText->Dispose(); delete mpText; - mpText = NULL; + mpText = nullptr; } // Cleanup. Remove references to objects to allow them to be diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 0bea6de4c68c..ce4396987f50 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -342,7 +342,7 @@ SvxTableController* AccessibleTableShape::getTableController() if( pView ) return dynamic_cast< SvxTableController* >( pView->getSelectionController().get() ); else - return 0; + return nullptr; } @@ -961,7 +961,7 @@ void SAL_CALL AccessibleTableShape::selectionChanged (const EventObject& rEvent AccessibleCell* AccessibleTableShape::GetActiveAccessibleCell() { Reference< AccessibleCell > xAccCell; - AccessibleCell* pAccCell = NULL; + AccessibleCell* pAccCell = nullptr; SvxTableController* pController = getTableController(); if (pController) { @@ -990,7 +990,7 @@ bool AccessibleTableShape::SetState (sal_Int16 aState) { AccessibleCell* pActiveAccessibleCell = GetActiveAccessibleCell(); bool bStateHasChanged = false; - if (aState == AccessibleStateType::FOCUSED && pActiveAccessibleCell != NULL) + if (aState == AccessibleStateType::FOCUSED && pActiveAccessibleCell != nullptr) { return pActiveAccessibleCell->SetState(aState); } @@ -1004,7 +1004,7 @@ bool AccessibleTableShape::ResetState (sal_Int16 aState) { AccessibleCell* pActiveAccessibleCell = GetActiveAccessibleCell(); bool bStateHasChanged = false; - if (aState == AccessibleStateType::FOCUSED && pActiveAccessibleCell != NULL) + if (aState == AccessibleStateType::FOCUSED && pActiveAccessibleCell != nullptr) { return pActiveAccessibleCell->ResetState(aState); } @@ -1039,7 +1039,7 @@ AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pT AccessibleTableHeaderShape::~AccessibleTableHeaderShape() { - mpTable = NULL; + mpTable = nullptr; } // XAccessible diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 61418a29e1aa..6b70d0806e13 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -225,7 +225,7 @@ namespace sdr BaseProperties& CellProperties::Clone(SdrObject& rObj) const { OSL_FAIL("CellProperties::Clone(), does not work yet!"); - return *(new CellProperties(*this, rObj,0)); + return *(new CellProperties(*this, rObj,nullptr)); } void CellProperties::ForceDefaultAttributes() @@ -240,15 +240,15 @@ namespace sdr { OutlinerParaObject* pParaObj = mxCell->GetEditOutlinerParaObject(); - bool bOwnParaObj = pParaObj != 0; + bool bOwnParaObj = pParaObj != nullptr; - if( pParaObj == 0 ) + if( pParaObj == nullptr ) pParaObj = mxCell->GetOutlinerParaObject(); if(pParaObj) { // handle outliner attributes - Outliner* pOutliner = 0; + Outliner* pOutliner = nullptr; if(mxCell->IsTextEditActive()) { @@ -321,7 +321,7 @@ namespace sdr // Set a cell vertical property OutlinerParaObject* pParaObj = mxCell->GetEditOutlinerParaObject(); - if( pParaObj == 0 ) + if( pParaObj == nullptr ) pParaObj = mxCell->GetOutlinerParaObject(); if(pParaObj) { @@ -405,9 +405,9 @@ void Cell::dispose() if( mpProperties ) { delete mpProperties; - mpProperties = 0; + mpProperties = nullptr; } - SetOutlinerParaObject( 0 ); + SetOutlinerParaObject( nullptr ); } @@ -435,7 +435,7 @@ void Cell::SetModel(SdrModel* pNewModel) SetEditSource( new SvxTextEditSource( &GetObject(), this ) ); } - SetStyleSheet( 0, true ); + SetStyleSheet( nullptr, true ); SdrText::SetModel( pNewModel ); ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT ); } @@ -517,7 +517,7 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell ) if(rSourceTableObj.GetModel() != rTableObj.GetModel()) { - SetStyleSheet( 0, true ); + SetStyleSheet( nullptr, true ); } } } @@ -546,7 +546,7 @@ void Cell::copyFormatFrom( const CellRef& xSourceCell ) if(rSourceTableObj.GetModel() != rTableObj.GetModel()) { - SetStyleSheet( 0, true ); + SetStyleSheet( nullptr, true ); } notifyModified(); @@ -572,7 +572,7 @@ bool Cell::IsTextEditActive() if(rTableObj.getActiveCell().get() == this ) { OutlinerParaObject* pParaObj = rTableObj.GetEditOutlinerParaObject(); - if( pParaObj != 0 ) + if( pParaObj != nullptr ) { isActive = true; delete pParaObj; @@ -610,7 +610,7 @@ OutlinerParaObject* Cell::GetEditOutlinerParaObject() const SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); if( rTableObj.getActiveCell().get() == this ) return rTableObj.GetEditOutlinerParaObject(); - return 0; + return nullptr; } @@ -661,7 +661,7 @@ SfxStyleSheet* Cell::GetStyleSheet() const if( mpProperties ) return mpProperties->GetStyleSheet(); else - return 0; + return nullptr; } void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const @@ -786,7 +786,7 @@ void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject ) SdrText::SetOutlinerParaObject( pTextObject ); maSelection.nStartPara = EE_PARA_MAX_COUNT; - if( pTextObject == 0 ) + if( pTextObject == nullptr ) ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT ); } @@ -809,7 +809,7 @@ sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextPro if( pProperties ) return new sdr::properties::CellProperties( *static_cast<sdr::properties::CellProperties*>(pProperties), rNewObj, &rNewCell ); else - return 0; + return nullptr; } @@ -1016,7 +1016,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& { ::SolarMutexGuard aGuard; - if( (mpProperties == 0) || (GetModel() == 0) ) + if( (mpProperties == nullptr) || (GetModel() == nullptr) ) throw DisposedException(); const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(rPropertyName); @@ -1043,7 +1043,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& break; const TableBorder* pBorder = static_cast<const TableBorder*>(rValue.getValue()); - if( pBorder == NULL ) + if( pBorder == nullptr ) break; SvxBoxItem aBox( SDRATTR_TABLE_BORDER ); @@ -1051,27 +1051,27 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& SvxBorderLine aLine; bool bSet = SvxBoxItem::LineToSvxLine(pBorder->TopLine, aLine, false); - aBox.SetLine(bSet ? &aLine : 0, SvxBoxItemLine::TOP); + aBox.SetLine(bSet ? &aLine : nullptr, SvxBoxItemLine::TOP); aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::TOP, pBorder->IsTopLineValid); bSet = SvxBoxItem::LineToSvxLine(pBorder->BottomLine, aLine, false); - aBox.SetLine(bSet ? &aLine : 0, SvxBoxItemLine::BOTTOM); + aBox.SetLine(bSet ? &aLine : nullptr, SvxBoxItemLine::BOTTOM); aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::BOTTOM, pBorder->IsBottomLineValid); bSet = SvxBoxItem::LineToSvxLine(pBorder->LeftLine, aLine, false); - aBox.SetLine(bSet ? &aLine : 0, SvxBoxItemLine::LEFT); + aBox.SetLine(bSet ? &aLine : nullptr, SvxBoxItemLine::LEFT); aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::LEFT, pBorder->IsLeftLineValid); bSet = SvxBoxItem::LineToSvxLine(pBorder->RightLine, aLine, false); - aBox.SetLine(bSet ? &aLine : 0, SvxBoxItemLine::RIGHT); + aBox.SetLine(bSet ? &aLine : nullptr, SvxBoxItemLine::RIGHT); aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::RIGHT, pBorder->IsRightLineValid); bSet = SvxBoxItem::LineToSvxLine(pBorder->HorizontalLine, aLine, false); - aBoxInfo.SetLine(bSet ? &aLine : 0, SvxBoxInfoItemLine::HORI); + aBoxInfo.SetLine(bSet ? &aLine : nullptr, SvxBoxInfoItemLine::HORI); aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::HORI, pBorder->IsHorizontalLineValid); bSet = SvxBoxItem::LineToSvxLine(pBorder->VerticalLine, aLine, false); - aBoxInfo.SetLine(bSet ? &aLine : 0, SvxBoxInfoItemLine::VERT); + aBoxInfo.SetLine(bSet ? &aLine : nullptr, SvxBoxInfoItemLine::VERT); aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::VERT, pBorder->IsVerticalLineValid); aBox.SetDistance(pBorder->Distance); //TODO @@ -1161,7 +1161,7 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow { ::SolarMutexGuard aGuard; - if( (mpProperties == 0) || (GetModel() == 0) ) + if( (mpProperties == nullptr) || (GetModel() == nullptr) ) throw DisposedException(); const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); @@ -1271,7 +1271,7 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName { ::SolarMutexGuard aSolarGuard; - if( (mpProperties == 0) || (GetModel() == 0) ) + if( (mpProperties == nullptr) || (GetModel() == nullptr) ) throw DisposedException(); const sal_Int32 nCount = aPropertyNames.getLength(); @@ -1302,7 +1302,7 @@ Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aP { ::SolarMutexGuard aSolarGuard; - if( (mpProperties == 0) || (GetModel() == 0) ) + if( (mpProperties == nullptr) || (GetModel() == nullptr) ) throw DisposedException(); const sal_Int32 nCount = aPropertyNames.getLength(); @@ -1356,7 +1356,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th { ::SolarMutexGuard aGuard; - if( (mpProperties == 0) || (GetModel() == 0) ) + if( (mpProperties == nullptr) || (GetModel() == nullptr) ) throw DisposedException(); const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); @@ -1426,7 +1426,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th case XATTR_LINEDASH: { const NameOrIndex* pItem = static_cast<const NameOrIndex*>(rSet.GetItem((sal_uInt16)pMap->nWID)); - if( ( pItem == NULL ) || pItem->GetName().isEmpty() ) + if( ( pItem == nullptr ) || pItem->GetName().isEmpty() ) eState = PropertyState_DEFAULT_VALUE; } break; @@ -1441,7 +1441,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th case XATTR_FILLFLOATTRANSPARENCE: { const NameOrIndex* pItem = static_cast<const NameOrIndex*>(rSet.GetItem((sal_uInt16)pMap->nWID)); - if( pItem == NULL ) + if( pItem == nullptr ) eState = PropertyState_DEFAULT_VALUE; } break; @@ -1460,7 +1460,7 @@ Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUSt { ::SolarMutexGuard aGuard; - if( (mpProperties == 0) || (GetModel() == 0) ) + if( (mpProperties == nullptr) || (GetModel() == nullptr) ) throw DisposedException(); const sal_Int32 nCount = aPropertyName.getLength(); @@ -1491,7 +1491,7 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U { ::SolarMutexGuard aGuard; - if( (mpProperties == 0) || (GetModel() == 0) ) + if( (mpProperties == nullptr) || (GetModel() == nullptr) ) throw DisposedException(); const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); @@ -1533,7 +1533,7 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(Unk { ::SolarMutexGuard aGuard; - if( (mpProperties == 0) || (GetModel() == 0) ) + if( (mpProperties == nullptr) || (GetModel() == nullptr) ) throw DisposedException(); const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(aPropertyName); diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 70a572c72ea8..04620251ad21 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -247,7 +247,7 @@ void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException, if( !GetMergedSelection( aStart, aEnd ) ) throw NoSupportException(); - if( !mxTable.is() || (mxTable->getSdrTableObj() == 0) ) + if( !mxTable.is() || (mxTable->getSdrTableObj() == nullptr) ) throw DisposedException(); SdrModel* pModel = mxTable->getSdrTableObj()->GetModel(); @@ -513,7 +513,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No if( (nColumns < 0) || (nRows < 0) ) throw IllegalArgumentException(); - if( !mxTable.is() || (mxTable->getSdrTableObj() == 0) ) + if( !mxTable.is() || (mxTable->getSdrTableObj() == nullptr) ) throw DisposedException(); SdrModel* pModel = mxTable->getSdrTableObj()->GetModel(); diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index 25302611510d..81bbc8b2bdb7 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -69,7 +69,7 @@ const Property* FastPropertySetInfo::hasProperty( const OUString& aName ) { PropertyMap::iterator aIter( maMap.find( aName ) ); if( aIter == maMap.end() ) - return 0; + return nullptr; else return &maProperties[(*aIter).second]; } @@ -94,7 +94,7 @@ Property SAL_CALL FastPropertySetInfo::getPropertyByName( const OUString& aName sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName ) throw (RuntimeException, std::exception) { - return hasProperty( aName ) != 0; + return hasProperty( aName ) != nullptr; } FastPropertySet::FastPropertySet( const rtl::Reference< FastPropertySetInfo >& xInfo ) diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 3b6d0f239c1c..0a24b8feb793 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -250,7 +250,7 @@ private: static sal_Int32 lastColCount; }; -SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL; +SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = nullptr; Rectangle SdrTableObjImpl::lastLayoutInputRectangle; Rectangle SdrTableObjImpl::lastLayoutResultRectangle; bool SdrTableObjImpl::lastLayoutFitWidth; @@ -260,8 +260,8 @@ sal_Int32 SdrTableObjImpl::lastRowCount; sal_Int32 SdrTableObjImpl::lastColCount; SdrTableObjImpl::SdrTableObjImpl() -: mpTableObj( 0 ) -, mpLayouter( 0 ) +: mpTableObj( nullptr ) +, mpLayouter( nullptr ) , mbModifyPending( false ) { } @@ -271,7 +271,7 @@ SdrTableObjImpl::SdrTableObjImpl() SdrTableObjImpl::~SdrTableObjImpl() { if( lastLayoutTable == this ) - lastLayoutTable = NULL; + lastLayoutTable = nullptr; } @@ -299,7 +299,7 @@ SdrTableObjImpl& SdrTableObjImpl::operator=( const SdrTableObjImpl& rSource ) if( mpLayouter ) { delete mpLayouter; - mpLayouter = 0; + mpLayouter = nullptr; } if( mxTable.is() ) @@ -474,7 +474,7 @@ void SdrTableObjImpl::dispose() if( mpLayouter ) { delete mpLayouter; - mpLayouter = 0; + mpLayouter = nullptr; } if( mxTable.is() ) @@ -651,9 +651,9 @@ void SAL_CALL SdrTableObjImpl::disposing( const css::lang::EventObject& /*Source if( mpLayouter ) { delete mpLayouter; - mpLayouter = 0; + mpLayouter = nullptr; } - mpTableObj = 0; + mpTableObj = nullptr; } @@ -1247,7 +1247,7 @@ SdrText* SdrTableObj::getText( sal_Int32 nIndex ) const return dynamic_cast< SdrText* >( xCell.get() ); } } - return 0; + return nullptr; } @@ -1305,7 +1305,7 @@ SdrOutliner* SdrTableObj::GetCellTextEditOutliner( const Cell& rCell ) const if( mpImpl && (mpImpl->getCell( mpImpl->maEditPos ).get() == &rCell) ) return pEdtOutl; else - return 0; + return nullptr; } const TableLayouter& SdrTableObj::getTableLayouter() const @@ -1480,7 +1480,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec } else { - rOutliner.SetTextObj( NULL ); + rOutliner.SetTextObj( nullptr ); } if (pEdtOutl && !bNoEditText && pPara && mpImpl->mxActiveCell == xCell ) @@ -1622,7 +1622,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* aAnkSiz.Width()--; aAnkSiz.Height()--; // weil GetSize() ein draufaddiert Size aMaxSiz(aAnkSiz.Width(),1000000); - if (pModel!=NULL) + if (pModel!=nullptr) { Size aTmpSiz(pModel->GetMaxObjSize()); if (aTmpSiz.Height()!=0) @@ -1636,7 +1636,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* aPaperMin.Width() = aAnkSiz.Width(); - if (pViewMin!=NULL) + if (pViewMin!=nullptr) { *pViewMin=aViewInit; long nYFree=aAnkSiz.Height()-aPaperMin.Height(); @@ -1662,9 +1662,9 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* else aPaperMin.Height() = 0; - if (pPaperMin!=NULL) *pPaperMin=aPaperMin; - if (pPaperMax!=NULL) *pPaperMax=aPaperMax; - if (pViewInit!=NULL) *pViewInit=aViewInit; + if (pPaperMin!=nullptr) *pPaperMin=aPaperMin; + if (pPaperMax!=nullptr) *pPaperMax=aPaperMax; + if (pViewInit!=nullptr) *pViewInit=aViewInit; } @@ -1739,7 +1739,7 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj) // call parent SdrObject::operator=(rObj); - TableModelNotifyGuard aGuard( mpImpl ? mpImpl->mxTable.get() : 0 ); + TableModelNotifyGuard aGuard( mpImpl ? mpImpl->mxTable.get() : nullptr ); maLogicRect = rObj.maLogicRect; maRect = rObj.maRect; @@ -1818,7 +1818,7 @@ Point SdrTableObj::GetSnapPoint(sal_uInt32 i) const bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) { - if( pEdtOutl != NULL ) + if( pEdtOutl != nullptr ) return false; pEdtOutl=&rOutl; @@ -1833,7 +1833,7 @@ bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) Size aPaperMin; Size aPaperMax; Rectangle aEditArea; - TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,NULL); + TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,nullptr); rOutl.SetMinAutoPaperSize(aPaperMin); rOutl.SetMaxAutoPaperSize(aPaperMax); @@ -1865,7 +1865,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) if( GetModel() && GetModel()->IsUndoEnabled() ) GetModel()->AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this) ); - OutlinerParaObject* pNewText = 0; + OutlinerParaObject* pNewText = nullptr; Paragraph* p1stPara = rOutl.GetParagraph( 0 ); sal_Int32 nParaAnz = rOutl.GetParagraphCount(); @@ -1894,7 +1894,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) SetOutlinerParaObject(pNewText); } - pEdtOutl = 0; + pEdtOutl = nullptr; rOutl.Clear(); EEControlBits nStat = rOutl.GetControlWord(); nStat &= ~EEControlBits::AUTOPAGESIZE; @@ -1911,7 +1911,7 @@ OutlinerParaObject* SdrTableObj::GetOutlinerParaObject() const if( xCell.is() ) return xCell->GetOutlinerParaObject(); else - return 0; + return nullptr; } @@ -1926,7 +1926,7 @@ void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject) // Update HitTestOutliner const SdrTextObj* pTestObj = pModel->GetHitTestOutliner().GetTextObj(); if( pTestObj && pTestObj->GetOutlinerParaObject() == xCell->GetOutlinerParaObject() ) - pModel->GetHitTestOutliner().SetTextObj( NULL ); + pModel->GetHitTestOutliner().SetTextObj( nullptr ); } xCell->SetOutlinerParaObject( pTextObject ); @@ -1990,7 +1990,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) if (bRet) { Rectangle aBoundRect0; - if (pUserCall!=NULL) + if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); maRect = aNeuRect; SetRectsDirty(); @@ -2005,7 +2005,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const { - if((pModel == NULL) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() ) + if((pModel == nullptr) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() ) return false; Rectangle aRectangle( rR ); @@ -2034,7 +2034,7 @@ void SdrTableObj::NbcReformatText() void SdrTableObj::ReformatText() { Rectangle aBoundRect0; - if (pUserCall!=NULL) + if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcReformatText(); SetChanged(); @@ -2189,13 +2189,13 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const if( nRowHeight > 0 ) { if( rLayouter.isEdgeVisible( nCol, nRow, false ) ) - aColEdges[nCol]->SetEdge( nRow, nY, nY + nRowHeight, (rLayouter.getBorderLine( nCol, nRow, false ) == 0) ? Visible : Invisible); + aColEdges[nCol]->SetEdge( nRow, nY, nY + nRowHeight, (rLayouter.getBorderLine( nCol, nRow, false ) == nullptr) ? Visible : Invisible); } if( nColWidth > 0 ) { if( rLayouter.isEdgeVisible( nCol, nRow, true ) ) - aRowEdges[nRow]->SetEdge( nCol, nX, nX + nColWidth, (rLayouter.getBorderLine( nCol, nRow, true ) == 0) ? Visible : Invisible); + aRowEdges[nRow]->SetEdge( nCol, nX, nX + nColWidth, (rLayouter.getBorderLine( nCol, nRow, true ) == nullptr) ? Visible : Invisible); } nX += nColWidth; @@ -2206,7 +2206,7 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const } // add remaining handles - SdrHdl* pH=0; + SdrHdl* pH=nullptr; rHdlList.AddHdl( pH = new TableBorderHdl( maRect, !IsTextEditActive() ) ); pH->SetMoveOutside( true ); rHdlList.AddHdl( pH = new SdrHdl(maRect.TopLeft(),HDL_UPLFT) ); pH->SetMoveOutside( true ); rHdlList.AddHdl( pH = new SdrHdl(maRect.TopCenter(),HDL_UPPER) ); pH->SetMoveOutside( true ); @@ -2229,8 +2229,8 @@ SdrHdl* SdrTableObj::GetHdl(sal_uInt32 nHdlNum) const OSL_FAIL("SdrTableObj::GetHdl(): ineffective, use AddToHdlList instead (!)"); // to have an alternative, get single handle using the ineffective way - SdrHdl* pRetval = 0; - SdrHdlList aLocalList(0); + SdrHdl* pRetval = nullptr; + SdrHdlList aLocalList(nullptr); AddToHdlList(aLocalList); const size_t nHdlCount(aLocalList.GetHdlCount()); @@ -2255,7 +2255,7 @@ bool SdrTableObj::hasSpecialDrag() const bool SdrTableObj::beginSpecialDrag(SdrDragStat& rDrag) const { const SdrHdl* pHdl = rDrag.GetHdl(); - const SdrHdlKind eHdl((pHdl == NULL) ? HDL_MOVE : pHdl->GetKind()); + const SdrHdlKind eHdl((pHdl == nullptr) ? HDL_MOVE : pHdl->GetKind()); switch( eHdl ) { @@ -2292,7 +2292,7 @@ bool SdrTableObj::applySpecialDrag(SdrDragStat& rDrag) { bool bRet(true); const SdrHdl* pHdl = rDrag.GetHdl(); - const SdrHdlKind eHdl((pHdl == NULL) ? HDL_MOVE : pHdl->GetKind()); + const SdrHdlKind eHdl((pHdl == nullptr) ? HDL_MOVE : pHdl->GetKind()); switch( eHdl ) { @@ -2444,7 +2444,7 @@ Pointer SdrTableObj::GetCreatePointer() const void SdrTableObj::createCell( CellRef& xNewCell ) { - xNewCell = Cell::create( *this, 0 ); + xNewCell = Cell::create( *this, nullptr ); } @@ -2496,7 +2496,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd if( !xTable.is() || !xNewTable.is() ) { delete pNewTableObj; - return 0; + return nullptr; } // copy cells diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index f94147da46b5..8f48aad20184 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -151,7 +151,7 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a SdrModel* pModel = mxTableModel->getSdrTableObj()->GetModel(); - TableColumnUndo* pUndo = 0; + TableColumnUndo* pUndo = nullptr; if( mxTableModel.is() && mxTableModel->getSdrTableObj() && mxTableModel->getSdrTableObj()->IsInserted() && pModel && pModel->IsUndoEnabled() ) { TableColumnRef xThis( this ); @@ -223,7 +223,7 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a if( pUndo ) { pModel->AddUndo( pUndo ); - pUndo = 0; + pUndo = nullptr; } mxTableModel->setModified(sal_True); } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index ac3ed92595fb..0238e851e4ff 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -115,7 +115,7 @@ void SAL_CALL SvxTableControllerModifyListener::modified( const css::lang::Event void SAL_CALL SvxTableControllerModifyListener::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { - mpController = 0; + mpController = nullptr; } @@ -145,11 +145,11 @@ rtl::Reference< sdr::SelectionController > SvxTableController::create( SdrObjEdi SvxTableController::SvxTableController( SdrObjEditView* pView, const SdrObject* pObj ) : mbCellSelectionMode(false) , mbLeftButtonDown(false) -, mpSelectionOverlay(0) +, mpSelectionOverlay(nullptr) , mpView( dynamic_cast< SdrView* >( pView ) ) , mxTableObj( dynamic_cast< SdrTableObj* >( const_cast< SdrObject* >( pObj ) ) ) -, mpModel( 0 ) -, mnUpdateEvent( 0 ) +, mpModel( nullptr ) +, mnUpdateEvent( nullptr ) { if( pObj ) { @@ -287,7 +287,7 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* RemoveSelection(); Point aPnt(rMEvt.GetPosPixel()); - if (pWindow!=NULL) + if (pWindow!=nullptr) aPnt=pWindow->PixelToLogic(aPnt); SdrHdl* pHdl = mpView->PickHandle(aPnt); @@ -530,7 +530,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) sal_uInt16 nCount = 0; if( pArgs ) { - const SfxPoolItem* pItem = 0; + const SfxPoolItem* pItem = nullptr; pArgs->GetItemState(nSId, false, &pItem); if (pItem) { @@ -881,7 +881,7 @@ void SvxTableController::onSelect( sal_uInt16 nSId ) } StartSelection( aEnd ); - gotoCell( aStart, true, 0 ); + gotoCell( aStart, true, nullptr ); } } } @@ -923,7 +923,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq ) aNewAttr.Put( aBoxInfoItem ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - std::unique_ptr< SfxAbstractTabDialog > xDlg( pFact ? pFact->CreateSvxFormatCellsDialog( NULL, &aNewAttr, pTableObj->GetModel(), pTableObj) : 0 ); + std::unique_ptr< SfxAbstractTabDialog > xDlg( pFact ? pFact->CreateSvxFormatCellsDialog( nullptr, &aNewAttr, pTableObj->GetModel(), pTableObj) : nullptr ); // Even Cancel Button is returning positive(101) value, if (xDlg.get() && xDlg->Execute() == RET_OK) { @@ -1043,7 +1043,7 @@ void SvxTableController::Execute( SfxRequest& rReq ) void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) { SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); - SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0; + SdrModel* pModel = pTableObj ? pTableObj->GetModel() : nullptr; if( !pTableObj || !pModel || !pArgs || (SfxItemState::SET != pArgs->GetItemState(SID_TABLE_STYLE, false)) ) return; @@ -1126,14 +1126,14 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs ) { SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); - SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0; + SdrModel* pModel = pTableObj ? pTableObj->GetModel() : nullptr; if( !pTableObj || !pModel ) return; TableStyleSettings aSettings( pTableObj->getTableStyleSettings() ); - const SfxPoolItem *pPoolItem=NULL; + const SfxPoolItem *pPoolItem=nullptr; if( (SfxItemState::SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, false,&pPoolItem)) ) aSettings.mbUseFirstRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); @@ -1234,7 +1234,7 @@ void SvxTableController::SplitMarkedCells() getSelectedCells( aStart, aEnd ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - std::unique_ptr< SvxAbstractSplittTableDialog > xDlg( pFact ? pFact->CreateSvxSplittTableDialog( NULL, false, 99, 99 ) : 0 ); + std::unique_ptr< SvxAbstractSplittTableDialog > xDlg( pFact ? pFact->CreateSvxSplittTableDialog( nullptr, false, 99, 99 ) : nullptr ); if( xDlg.get() && xDlg->Execute() ) { const sal_Int32 nCount = xDlg->GetCount() - 1; @@ -1351,7 +1351,7 @@ bool SvxTableController::DeleteMarked() { if (bUndo) xCell->AddUndo(); - xCell->SetOutlinerParaObject(0); + xCell->SetOutlinerParaObject(nullptr); } } } @@ -1367,11 +1367,11 @@ bool SvxTableController::GetStyleSheet( SfxStyleSheet*& rpStyleSheet ) const { if( hasSelectedCells() ) { - rpStyleSheet = 0; + rpStyleSheet = nullptr; if( mxTable.is() ) { - SfxStyleSheet* pRet=0; + SfxStyleSheet* pRet=nullptr; bool b1st=true; CellPos aStart, aEnd; @@ -1701,7 +1701,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W } case ACTION_EDIT_CELL: - EditCell( getSelectionStart(), pWindow, 0, nAction ); + EditCell( getSelectionStart(), pWindow, nullptr, nAction ); break; case ACTION_STOP_TEXT_EDIT: @@ -1763,7 +1763,7 @@ void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, vcl::Windo else { RemoveSelection(); - EditCell( rPos, pWindow, 0, nAction ); + EditCell( rPos, pWindow, nullptr, nAction ); } } @@ -1894,7 +1894,7 @@ void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, co pTableObj->setActiveCell( aPos ); // create new outliner, owner will be the SdrObjEditView - SdrOutliner* pOutl = mpModel ? SdrMakeOutliner(OUTLINERMODE_OUTLINEOBJECT, *mpModel) : NULL; + SdrOutliner* pOutl = mpModel ? SdrMakeOutliner(OUTLINERMODE_OUTLINEOBJECT, *mpModel) : nullptr; if (pOutl && pTableObj->IsVerticalWriting()) pOutl->SetVertical( true ); @@ -2114,7 +2114,7 @@ void SvxTableController::RemoveSelection() void SvxTableController::onTableModified() { - if( mnUpdateEvent == 0 ) + if( mnUpdateEvent == nullptr ) mnUpdateEvent = Application::PostUserEvent( LINK( this, SvxTableController, UpdateHdl ) ); } @@ -2200,7 +2200,7 @@ void SvxTableController::destroySelectionOverlay() if( mpSelectionOverlay ) { delete mpSelectionOverlay; - mpSelectionOverlay = 0; + mpSelectionOverlay = nullptr; if (mxTableObj->GetModel()->isTiledRendering()) { @@ -2297,12 +2297,12 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem, if( nCellFlags & CELL_UPPER ) { if( pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::TOP) ) - rNewFrame.SetLine(0, SvxBoxItemLine::BOTTOM ); + rNewFrame.SetLine(nullptr, SvxBoxItemLine::BOTTOM ); } else if( nCellFlags & CELL_LOWER ) { if( pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::BOTTOM) ) - rNewFrame.SetLine( 0, SvxBoxItemLine::TOP ); + rNewFrame.SetLine( nullptr, SvxBoxItemLine::TOP ); } } else if( (nCellFlags & ( CELL_UPPER|CELL_LOWER)) == 0 ) // check if its not sw or se corner @@ -2310,12 +2310,12 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem, if( nCellFlags & CELL_BEFORE ) { if( pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::LEFT) ) - rNewFrame.SetLine( 0, SvxBoxItemLine::RIGHT ); + rNewFrame.SetLine( nullptr, SvxBoxItemLine::RIGHT ); } else if( nCellFlags & CELL_AFTER ) { if( pBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::RIGHT) ) - rNewFrame.SetLine( 0, SvxBoxItemLine::LEFT ); + rNewFrame.SetLine( nullptr, SvxBoxItemLine::LEFT ); } } } @@ -2430,19 +2430,19 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr ) const sal_Int32 nColCount = mxTable->getColumnCount(); if( nRowCount && nColCount ) { - const SvxBoxItem* pBoxItem = 0; + const SvxBoxItem* pBoxItem = nullptr; if(SfxItemState::SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, false) ) pBoxItem = dynamic_cast< const SvxBoxItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER ) ); - const SvxBoxInfoItem* pBoxInfoItem = 0; + const SvxBoxInfoItem* pBoxInfoItem = nullptr; if(SfxItemState::SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, false) ) pBoxInfoItem = dynamic_cast< const SvxBoxInfoItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ); - const SvxColorItem* pLineColorItem = 0; + const SvxColorItem* pLineColorItem = nullptr; if(SfxItemState::SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, false) ) pLineColorItem = dynamic_cast< const SvxColorItem* >( &rAttr.Get( SID_FRAME_LINECOLOR ) ); - const SvxBorderLine* pBorderLineItem = 0; + const SvxBorderLine* pBorderLineItem = nullptr; if(SfxItemState::SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, false) ) pBorderLineItem = static_cast<const SvxLineItem&>(rAttr.Get( SID_FRAME_LINESTYLE )).GetLine(); @@ -2808,7 +2808,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo IMPL_LINK_NOARG_TYPED(SvxTableController, UpdateHdl, void*, void) { - mnUpdateEvent = 0; + mnUpdateEvent = nullptr; if( mbCellSelectionMode ) { @@ -2912,7 +2912,7 @@ void lcl_MergeBorderLine( const SvxBorderLine* const pMergedLine(aBoxItem.getLine()); if ((pLine && !pMergedLine) || (!pLine && pMergedLine) || (pLine && (*pLine != *pMergedLine))) { - aBoxItem.setLine(0); + aBoxItem.setLine(nullptr); rbIndeterminate = true; } } @@ -3083,7 +3083,7 @@ bool SvxTableController::selectRow( sal_Int32 row ) return false; CellPos aStart( 0, row ), aEnd( mxTable->getColumnCount() - 1, row ); StartSelection( aEnd ); - gotoCell( aStart, true, 0 ); + gotoCell( aStart, true, nullptr ); return true; } @@ -3093,7 +3093,7 @@ bool SvxTableController::selectColumn( sal_Int32 column ) return false; CellPos aStart( column, 0 ), aEnd( column, mxTable->getRowCount() - 1 ); StartSelection( aEnd ); - gotoCell( aStart, true, 0 ); + gotoCell( aStart, true, nullptr ); return true; } @@ -3103,7 +3103,7 @@ bool SvxTableController::deselectRow( sal_Int32 row ) return false; CellPos aStart( 0, row ), aEnd( mxTable->getColumnCount() - 1, row ); StartSelection( aEnd ); - gotoCell( aStart, false, 0 ); + gotoCell( aStart, false, nullptr ); return true; } @@ -3113,7 +3113,7 @@ bool SvxTableController::deselectColumn( sal_Int32 column ) return false; CellPos aStart( column, 0 ), aEnd( column, mxTable->getRowCount() - 1 ); StartSelection( aEnd ); - gotoCell( aStart, false, 0 ); + gotoCell( aStart, false, nullptr ); return true; } @@ -3144,7 +3144,7 @@ bool SvxTableController::isColumnSelected( sal_Int32 nColumn ) bool SvxTableController::isRowHeader() { SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); - SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0; + SdrModel* pModel = pTableObj ? pTableObj->GetModel() : nullptr; if( !pTableObj || !pModel ) return false; @@ -3157,7 +3157,7 @@ bool SvxTableController::isRowHeader() bool SvxTableController::isColumnHeader() { SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); - SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0; + SdrModel* pModel = pTableObj ? pTableObj->GetModel() : nullptr; if( !pTableObj || !pModel ) return false; diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 67da8ecc9d5b..74227c6f338a 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -161,7 +161,7 @@ void TableEdgeHdl::CreateB2dIAObject() basegfx::B2DPolyPolygon aInvisible; // get visible and invisible parts - getPolyPolygon(aVisible, aInvisible, 0); + getPolyPolygon(aVisible, aInvisible, nullptr); if(aVisible.count() || aInvisible.count()) { diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 7443cb80a796..892b0d911660 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -178,7 +178,7 @@ bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHor if( (nEdgeX >= 0) && (nEdgeX < sal::static_int_cast<sal_Int32>(rMap.size())) && (nEdgeY >= 0) && (nEdgeY < sal::static_int_cast<sal_Int32>(rMap[nEdgeX].size())) ) { - return rMap[nEdgeX][nEdgeY] != 0; + return rMap[nEdgeX][nEdgeY] != nullptr; } else { @@ -193,7 +193,7 @@ bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHor /** returns the requested borderline in rpBorderLine or a null pointer if there is no border at this edge */ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const { - SvxBorderLine* pLine = 0; + SvxBorderLine* pLine = nullptr; const BorderLineMap& rMap = bHorizontal ? maHorizontalBorders : maVerticalBorders; @@ -202,7 +202,7 @@ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, { pLine = rMap[nEdgeX][nEdgeY]; if( pLine == &gEmptyBorder ) - pLine = 0; + pLine = nullptr; } else { @@ -895,7 +895,7 @@ CellRef TableLayouter::getCell( const CellPos& rPos ) const bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ) { - if (!pThis || ((pThis == &gEmptyBorder) && (pOther != 0))) + if (!pThis || ((pThis == &gEmptyBorder) && (pOther != nullptr))) return false; if (!pOther || (pOther == &gEmptyBorder)) return true; @@ -931,14 +931,14 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const SvxBorderLine* pLine ) { - if( pLine == 0 ) + if( pLine == nullptr ) pLine = &gEmptyBorder; SvxBorderLine *pOld = bHorizontal ? maHorizontalBorders[nCol][nRow] : maVerticalBorders[nCol][nRow]; if( HasPriority( pLine, pOld ) ) { - if( (pOld != 0) && (pOld != &gEmptyBorder) ) + if( (pOld != nullptr) && (pOld != &gEmptyBorder) ) delete pOld; SvxBorderLine* pNew = ( pLine != &gEmptyBorder ) ? new SvxBorderLine(*pLine) : &gEmptyBorder; @@ -975,7 +975,7 @@ void TableLayouter::ClearBorderLayout(BorderLineMap& rMap) if( pLine != &gEmptyBorder ) delete pLine; - rMap[nCol][nRow] = 0; + rMap[nCol][nRow] = nullptr; } } } diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 03ba9983e15e..82b84685eb1d 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -92,8 +92,8 @@ public: void updateCells( ::Rectangle& rRectangle ); - sal_Int32 getHorizontalEdge( int nEdgeY, sal_Int32* pnMin = 0, sal_Int32* pnMax = 0 ); - sal_Int32 getVerticalEdge( int nEdgeX , sal_Int32* pnMin = 0, sal_Int32* pnMax = 0); + sal_Int32 getHorizontalEdge( int nEdgeY, sal_Int32* pnMin = nullptr, sal_Int32* pnMax = nullptr ); + sal_Int32 getVerticalEdge( int nEdgeX , sal_Int32* pnMin = nullptr, sal_Int32* pnMax = nullptr); void DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, sal_Int32 nLastCol ); void DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal_Int32 nLastRow ); diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index e14100f65643..c81572018a34 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -315,7 +315,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Referen ::SolarMutexGuard aGuard; ICellRange* pRange = dynamic_cast< ICellRange* >( rRange.get() ); - if( (pRange == 0) || (pRange->getTable().get() != this) ) + if( (pRange == nullptr) || (pRange->getTable().get() != this) ) throw IllegalArgumentException(); TableModelRef xModel( this ); @@ -572,7 +572,7 @@ void TableModel::disposing() mxTableRows.clear(); } - mpTableObj = 0; + mpTableObj = nullptr; } diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 37b9430da6a2..d86f7e9186b4 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -215,7 +215,7 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal bool bOk = false; bool bChange = false; - TableRowUndo* pUndo = 0; + TableRowUndo* pUndo = nullptr; SdrModel* pModel = mxTableModel->getSdrTableObj()->GetModel(); @@ -293,7 +293,7 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal if( pUndo ) { pModel->AddUndo( pUndo ); - pUndo = 0; + pUndo = nullptr; } mxTableModel->setModified(sal_True); } diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 9c3d8d723864..cc8c23618435 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -46,7 +46,7 @@ public: TableRow& operator=( const TableRow& ); - void insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter = 0 ); + void insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter = nullptr ); void removeColumns( sal_Int32 nIndex, sal_Int32 nCount ); // XCellRange diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index eb81993be8ee..616aa6c23625 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -178,9 +178,9 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow ) OUString aContent; OutlinerParaObject* pParaObj = xCell->GetEditOutlinerParaObject(); - bool bOwnParaObj = pParaObj != 0; + bool bOwnParaObj = pParaObj != nullptr; - if( pParaObj == 0 ) + if( pParaObj == nullptr ) pParaObj = xCell->GetOutlinerParaObject(); if(pParaObj) diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 1efb02a67baa..3eb66b77e4fc 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -135,8 +135,8 @@ SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj ) , mnColCnt( 0 ) , mnRowCnt( 0 ) , mnColMax( 0 ) -, mpActDefault( 0 ) -, mpDefMerge( 0 ) +, mpActDefault( nullptr ) +, mpDefMerge( nullptr ) , mxTable( rTableObj.getTable() ) { mpOutliner->SetUpdateMode(true); @@ -183,7 +183,7 @@ IMPL_LINK_TYPED( SdrTableRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) case RTFIMP_END: if ( rInfo.aSelection.nEndPos ) { - mpActDefault = NULL; + mpActDefault = nullptr; rInfo.nToken = RTF_PAR; rInfo.aSelection.nEndPara++; ProcToken( &rInfo ); @@ -268,7 +268,7 @@ void SdrTableRTFParser::FillTable() CellRef xCell( dynamic_cast< Cell* >( mxTable->getCellByPosition( nCol, nRow ).get() ) ); if( xCell.is() && xCellInfo.get() ) { - const SfxPoolItem *pPoolItem = 0; + const SfxPoolItem *pPoolItem = nullptr; if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,false,&pPoolItem)==SfxItemState::SET) xCell->SetMergedItem( *pPoolItem ); @@ -304,7 +304,7 @@ void SdrTableRTFParser::NewCellRow() maRows.push_back( RTFColumnVectorPtr( new RTFColumnVector() ) ); } - mpDefMerge = NULL; + mpDefMerge = nullptr; maDefaultIterator = maDefaultList.begin(); NextColumn(); @@ -317,7 +317,7 @@ void SdrTableRTFParser::NextColumn() if( maDefaultIterator != maDefaultList.end() ) mpActDefault = (*maDefaultIterator++).get(); else - mpActDefault = 0; + mpActDefault = nullptr; } long TwipsToHundMM( long nIn ) @@ -334,7 +334,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo ) { mnColCnt = 0; maDefaultList.clear(); - mpDefMerge = NULL; + mpDefMerge = nullptr; mnLastToken = pInfo->nToken; } break; diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index 8e1358b97d2c..250675e67d48 100644 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -61,13 +61,13 @@ void CellUndo::dispose() { mxCell.clear(); delete maUndoData.mpProperties; - maUndoData.mpProperties = 0; + maUndoData.mpProperties = nullptr; delete maRedoData.mpProperties; - maRedoData.mpProperties = 0; + maRedoData.mpProperties = nullptr; delete maUndoData.mpOutlinerParaObject; - maUndoData.mpOutlinerParaObject = 0; + maUndoData.mpOutlinerParaObject = nullptr; delete maRedoData.mpOutlinerParaObject; - maRedoData.mpOutlinerParaObject = 0; + maRedoData.mpOutlinerParaObject = nullptr; } void CellUndo::ObjectInDestruction(const SdrObject& ) @@ -79,7 +79,7 @@ void CellUndo::Undo() { if( mxCell.is() && mbUndo ) { - if( maRedoData.mpProperties == 0 ) + if( maRedoData.mpProperties == nullptr ) getDataFromCell( maRedoData ); setDataToCell( maUndoData ); @@ -115,7 +115,7 @@ void CellUndo::setDataToCell( const Data& rData ) if( rData.mpProperties ) mxCell->mpProperties = Cell::CloneProperties( rData.mpProperties, *mxObjRef.get(), *mxCell.get() ); else - mxCell->mpProperties = 0; + mxCell->mpProperties = nullptr; if( rData.mpOutlinerParaObject ) mxCell->SetOutlinerParaObject( new OutlinerParaObject(*rData.mpOutlinerParaObject) ); @@ -148,7 +148,7 @@ void CellUndo::getDataFromCell( Data& rData ) if( mxCell->GetOutlinerParaObject() ) rData.mpOutlinerParaObject = new OutlinerParaObject(*mxCell->GetOutlinerParaObject()); else - rData.mpOutlinerParaObject = 0; + rData.mpOutlinerParaObject = nullptr; rData.mnCellContentType = mxCell->mnCellContentType; diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index 54796f603fdb..63a8ed6ff47d 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -69,8 +69,8 @@ private: ::sal_Int32 mnColSpan; Data() - : mpProperties(NULL) - , mpOutlinerParaObject(NULL) + : mpProperties(nullptr) + , mpOutlinerParaObject(nullptr) , mnCellContentType(css::table::CellContentType_EMPTY) , mfValue(0) , mnError(0) diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index 1e17072c0e7e..430623ebc500 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -36,7 +36,7 @@ PaletteManager::PaletteManager() : mnNumOfPalettes(2), mnCurrentPalette(0), mnColorCount(0), - mpBtnUpdater(NULL), + mpBtnUpdater(nullptr), mLastColor(COL_AUTO), maColorSelectFunction(PaletteManager::DispatchColorCommand) { @@ -112,8 +112,8 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet &rColorSet) if ( pDocSh ) { - const SfxPoolItem* pItem = NULL; - if ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) + const SfxPoolItem* pItem = nullptr; + if ( nullptr != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); } @@ -228,7 +228,7 @@ void PaletteManager::PopupColorPicker(const OUString& aCommand) { // The calling object goes away during aColorDlg.Execute(), so we must copy this OUString aCommandCopy = aCommand; - SvColorDialog aColorDlg( 0 ); + SvColorDialog aColorDlg( nullptr ); aColorDlg.SetColor ( mLastColor ); aColorDlg.SetMode( svtools::ColorPickerMode_MODIFY ); if( aColorDlg.Execute() == RET_OK ) diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 497b6c3095a1..acd3f3493379 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -222,7 +222,7 @@ bool NumberingToolBoxControl::IsInImpressDraw() void SAL_CALL NumberingToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) { - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) { @@ -238,7 +238,7 @@ void SAL_CALL NumberingToolBoxControl::initialize( const css::uno::Sequence< css { svt::PopupWindowController::initialize( aArguments ); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWN ); diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 0dd059d88cda..74d847605906 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -145,7 +145,7 @@ void SvxColorValueSet_docking::Command(const CommandEvent& rCEvt) void SvxColorValueSet_docking::StartDrag( sal_Int8 , const Point& ) { - Application::PostUserEvent(LINK(this, SvxColorValueSet_docking, ExecDragHdl), NULL, true); + Application::PostUserEvent(LINK(this, SvxColorValueSet_docking, ExecDragHdl), nullptr, true); } void SvxColorValueSet_docking::DoDrag() @@ -201,17 +201,17 @@ SvxColorDockingWindow::SvxColorDockingWindow // Get the model from the view shell. Using SfxObjectShell::Current() // is unreliable when called at the wrong times. - SfxObjectShell* pDocSh = NULL; - if (_pBindings != NULL) + SfxObjectShell* pDocSh = nullptr; + if (_pBindings != nullptr) { SfxDispatcher* pDispatcher = _pBindings->GetDispatcher(); - if (pDispatcher != NULL) + if (pDispatcher != nullptr) { SfxViewFrame* pFrame = pDispatcher->GetFrame(); - if (pFrame != NULL) + if (pFrame != nullptr) { SfxViewShell* pViewShell = pFrame->GetViewShell(); - if (pViewShell != NULL) + if (pViewShell != nullptr) pDocSh = pViewShell->GetObjectShell(); } } @@ -235,7 +235,7 @@ SvxColorDockingWindow::SvxColorDockingWindow SetSize(); aColorSet->Show(); - if (_pBindings != NULL) + if (_pBindings != nullptr) StartListening( *_pBindings, true ); } diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index adac8ed71a2c..cdfb086f0de0 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -261,7 +261,7 @@ void SAL_CALL ExtrusionDirectionControl::initialize( const css::uno::Sequence< c { svt::PopupWindowController::initialize( aArguments ); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY ); @@ -505,7 +505,7 @@ void SAL_CALL ExtrusionDepthController::initialize( const css::uno::Sequence< cs { svt::PopupWindowController::initialize( aArguments ); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY ); @@ -778,7 +778,7 @@ void SAL_CALL ExtrusionLightingControl::initialize( const css::uno::Sequence< cs { svt::PopupWindowController::initialize( aArguments ); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY ); @@ -922,7 +922,7 @@ void SAL_CALL ExtrusionSurfaceControl::initialize( const css::uno::Sequence< css { svt::PopupWindowController::initialize( aArguments ); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY ); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 678f3ba80d4c..c57eab708220 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -59,9 +59,9 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( , mpFillGradientItem() , mpHatchItem() , mpBitmapItem() - , mpFillControl(0) - , mpLbFillType(0) - , mpLbFillAttr(0) + , mpFillControl(nullptr) + , mpLbFillType(nullptr) + , mpLbFillAttr(nullptr) , meLastXFS(static_cast<sal_uInt16>(-1)) , mnLastPosGradient(0) , mnLastPosHatch(0) @@ -140,7 +140,7 @@ void SvxFillToolBoxControl::StateChanged( { if(SfxItemState::DEFAULT == eState) { - mpColorItem.reset(pState ? static_cast<XFillColorItem*>(pState->Clone()) : 0); + mpColorItem.reset(pState ? static_cast<XFillColorItem*>(pState->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_SOLID == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -156,7 +156,7 @@ void SvxFillToolBoxControl::StateChanged( { if(SfxItemState::DEFAULT == eState) { - mpFillGradientItem.reset(pState ? static_cast<XFillGradientItem*>(pState->Clone()) : 0); + mpFillGradientItem.reset(pState ? static_cast<XFillGradientItem*>(pState->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_GRADIENT == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -185,7 +185,7 @@ void SvxFillToolBoxControl::StateChanged( { if(SfxItemState::DEFAULT == eState) { - mpHatchItem.reset(pState ? static_cast<XFillHatchItem*>(pState->Clone()) : 0); + mpHatchItem.reset(pState ? static_cast<XFillHatchItem*>(pState->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_HATCH == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -214,7 +214,7 @@ void SvxFillToolBoxControl::StateChanged( { if(SfxItemState::DEFAULT == eState) { - mpBitmapItem.reset(pState ? static_cast<XFillBitmapItem*>(pState->Clone()) : 0); + mpBitmapItem.reset(pState ? static_cast<XFillBitmapItem*>(pState->Clone()) : nullptr); } if(mpStyleItem && drawing::FillStyle_BITMAP == (drawing::FillStyle)mpStyleItem->GetValue()) @@ -794,7 +794,7 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) // #i122676# Change FillStale and Gradinet in one call SfxViewFrame::Current()->GetDispatcher()->Execute( SID_ATTR_FILL_GRADIENT, SfxCallMode::RECORD, &aXFillGradientItem, - bFillStyleChange ? &aXFillStyleItem : 0L, 0L); + bFillStyleChange ? &aXFillStyleItem : nullptr, 0L); } } @@ -825,7 +825,7 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) // #i122676# Change FillStale and Hatch in one call SfxViewFrame::Current()->GetDispatcher()->Execute( SID_ATTR_FILL_HATCH, SfxCallMode::RECORD, &aXFillHatchItem, - bFillStyleChange ? &aXFillStyleItem : 0L, 0L); + bFillStyleChange ? &aXFillStyleItem : nullptr, 0L); } } @@ -856,7 +856,7 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) // #i122676# Change FillStale and Bitmap in one call SfxViewFrame::Current()->GetDispatcher()->Execute( SID_ATTR_FILL_BITMAP, SfxCallMode::RECORD, &aXFillBitmapItem, - bFillStyleChange ? &aXFillStyleItem : 0L, 0L); + bFillStyleChange ? &aXFillStyleItem : nullptr, 0L); } } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index ea9e89ee9264..c0d7cb18205f 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -73,8 +73,8 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pP ModalDialog(pParent, "FontworkGalleryDialog", "svx/ui/fontworkgallerydialog.ui" ), mnThemeId ( 0xffff ), mpSdrView ( pSdrView ), - mppSdrObject ( NULL ), - mpDestModel ( NULL ) + mppSdrObject ( nullptr ), + mpDestModel ( nullptr ) { get(mpOKButton, "ok"); get(mpCtlFavorites, "ctlFavorites"); @@ -114,7 +114,7 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId) GalleryExplorer::BeginLocking(nThemeId); sal_uInt32 nModelPos; - FmFormModel *pModel = NULL; + FmFormModel *pModel = nullptr; for( nModelPos = 0; nModelPos < nFavCount; nModelPos++ ) { @@ -379,7 +379,7 @@ void SAL_CALL FontworkAlignmentControl::initialize( const css::uno::Sequence< cs { svt::PopupWindowController::initialize( aArguments ); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY ); @@ -615,7 +615,7 @@ void SAL_CALL FontworkCharacterSpacingControl::initialize( const css::uno::Seque { svt::PopupWindowController::initialize( aArguments ); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY ); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 7ebce656d60a..ab438026d05b 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -213,7 +213,7 @@ static sal_uInt16 ImplGetRID( const OUString& aCommand ) { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST }, { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA }, { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE }, - { 0, 0 } + { nullptr, 0 } }; sal_uInt16 nRID = 0; @@ -452,7 +452,7 @@ void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const if( eState == SfxItemState::DEFAULT ) pCtrl->Update( pState ); else - pCtrl->Update( NULL ); + pCtrl->Update( nullptr ); } } @@ -539,7 +539,7 @@ void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, c if( eState == SfxItemState::DEFAULT ) pCtrl->Update( pState ); else - pCtrl->Update( NULL ); + pCtrl->Update( nullptr ); } } @@ -566,7 +566,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) sal_uInt16 nSlot = rReq.GetSlot(); if( !pArgs || SfxItemState::SET != pArgs->GetItemState( nSlot, false, &pItem )) - pItem = 0; + pItem = nullptr; switch( nSlot ) { @@ -702,7 +702,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) aRBSize.Width(), aRBSize.Height() ) ); ScopedVclPtrInstance<SfxSingleTabDialog> aCropDialog( - SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL, + SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : nullptr, aCropDlgAttr); const OUString aCropStr(SVX_RESSTR(RID_SVXSTR_GRAFCROP)); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 36a007647faa..5bc35bcbee25 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -57,7 +57,7 @@ SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame, nCurPos ( 0 ), aLogicalSize(40,140), bRelease ( true ), - mpSh ( NULL ), + mpSh ( nullptr ), mxFrame ( rFrame ) { SetSizePixel( LogicToPixel( aLogicalSize, MAP_APPFONT )); diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 1ac1096de6d5..6f63ff9d894e 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -720,7 +720,7 @@ VclPtr<SfxPopupWindow> SvxTableToolBoxControl::CreatePopupWindow() SetPopupWindow( pWin ); return pWin; } - return 0; + return nullptr; } void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) @@ -759,7 +759,7 @@ SvxColumnsToolBoxControl::~SvxColumnsToolBoxControl() VclPtr<SfxPopupWindow> SvxColumnsToolBoxControl::CreatePopupWindow() { - ColumnsWindow* pWin = 0; + ColumnsWindow* pWin = nullptr; if(bEnabled) { pWin = VclPtr<ColumnsWindow>::Create( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), m_xFrame ); diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index fd0bb050b3e1..a40580c06fe9 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -137,7 +137,7 @@ vcl::Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() SvxListBoxControl::SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ), - pPopupWin ( 0 ) + pPopupWin ( nullptr ) { rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWN | rTbx.GetItemBits( nId ) ); rTbx.Invalidate(); @@ -150,7 +150,7 @@ SvxListBoxControl::~SvxListBoxControl() VclPtr<SfxPopupWindow> SvxListBoxControl::CreatePopupWindow() { OSL_FAIL( "not implemented" ); - return 0; + return nullptr; } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 5282bbefbe5d..6f66d5cd4226 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -54,8 +54,8 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), - pStyleItem ( NULL ), - pDashItem ( NULL ), + pStyleItem ( nullptr ), + pDashItem ( nullptr ), bUpdate ( false ) { addStatusListener( ".uno:LineDash"); @@ -237,7 +237,7 @@ void SvxLineWidthToolBoxControl::StateChanged( pFld->Update( static_cast<const XLineWidthItem*>(pState) ); } else - pFld->Update( NULL ); + pFld->Update( nullptr ); } } } @@ -391,7 +391,7 @@ void SvxLineEndWindow::FillValueSet() { if( pLineEndList.is() ) { - XLineEndEntry* pEntry = NULL; + XLineEndEntry* pEntry = nullptr; ScopedVclPtrInstance< VirtualDevice > pVD; long nCount = pLineEndList->Count(); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index a92a81cb5090..aa313c5f2129 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -333,7 +333,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent, { m_aMenu.SetSelectHdl( LINK( this, SvxStyleBox_Impl, MenuSelectHdl ) ); for(int i = 0; i < MAX_STYLES_ENTRIES; i++) - m_pButtons[i] = NULL; + m_pButtons[i] = nullptr; aLogicalSize = PixelToLogic( GetSizePixel(), MAP_APPFONT ); SetOptimalSize(); EnableAutocomplete( true ); @@ -432,7 +432,7 @@ void SvxStyleBox_Impl::Select() //Do we need to create a new style? SfxObjectShell *pShell = SfxObjectShell::Current(); SfxStyleSheetBasePool* pPool = pShell->GetStyleSheetPool(); - SfxStyleSheetBase* pStyle = NULL; + SfxStyleSheetBase* pStyle = nullptr; bool bCreateNew = false; @@ -628,7 +628,7 @@ void SvxStyleBox_Impl::SetupEntry(vcl::RenderContext& rRenderContext, vcl::Windo { SfxObjectShell *pShell = SfxObjectShell::Current(); SfxStyleSheetBasePool* pPool = pShell->GetStyleSheetPool(); - SfxStyleSheetBase* pStyle = NULL; + SfxStyleSheetBase* pStyle = nullptr; if ( pPool ) { @@ -709,14 +709,14 @@ void SvxStyleBox_Impl::SetupEntry(vcl::RenderContext& rRenderContext, vcl::Windo pItem = pItemSet->GetItem( SID_ATTR_CHAR_COLOR ); // text color, when nothing is selected - if ( (NULL != pItem) && bIsNotSelected) + if ( (nullptr != pItem) && bIsNotSelected) aFontCol = Color( static_cast< const SvxColorItem* >( pItem )->GetValue() ); sal_uInt16 style = drawing::FillStyle_NONE; // which kind of Fill style is selected pItem = pItemSet->GetItem( XATTR_FILLSTYLE ); // only when ok and not selected - if ( (NULL != pItem) && bIsNotSelected) + if ( (nullptr != pItem) && bIsNotSelected) style = static_cast< const XFillStyleItem* >( pItem )->GetValue(); switch(style) @@ -725,7 +725,7 @@ void SvxStyleBox_Impl::SetupEntry(vcl::RenderContext& rRenderContext, vcl::Windo { // set background color pItem = pItemSet->GetItem( XATTR_FILLCOLOR ); - if ( NULL != pItem ) + if ( nullptr != pItem ) aBackCol = Color( static_cast< const XFillColorItem* >( pItem )->GetColorValue() ); if ( aBackCol != COL_AUTO ) @@ -864,7 +864,7 @@ static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl { bool bChanged = false; const SfxObjectShell* pDocSh = SfxObjectShell::Current(); - const SvxFontListItem* pFontListItem = NULL; + const SvxFontListItem* pFontListItem = nullptr; if ( pDocSh ) pFontListItem = @@ -933,7 +933,7 @@ static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame, WinBits nStyle ) : FontNameBox ( pParent, nStyle | WinBits( WB_DROPDOWN | WB_AUTOHSCROLL ) ), - pFontList ( NULL ), + pFontList ( nullptr ), aLogicalSize ( 60,160 ), nFtCount ( 0 ), bRelease ( true ), @@ -975,7 +975,7 @@ IMPL_LINK_TYPED( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent&, lcl_GetDocFontList( &pFontList, this ); // If the font is unknown, show it in italic. vcl::Font font = GetControlFont(); - if( pFontList != NULL && pFontList->IsAvailable( fontname )) + if( pFontList != nullptr && pFontList->IsAvailable( fontname )) { if( font.GetItalic() != ITALIC_NONE ) { @@ -1110,7 +1110,7 @@ void SvxFontNameBox_Impl::EnableControls_Impl() if ( GetMaxMRUCount() != nEntries ) { // refill in the next GetFocus-Handler - pFontList = NULL; + pFontList = nullptr; Clear(); SetMaxMRUCount( nEntries ); } @@ -1674,10 +1674,10 @@ IMPL_LINK_NOARG_TYPED(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void) SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER ); SvxBoxInfoItem aBorderInner( SID_ATTR_BORDER_INNER ); SvxBorderLine theDefLine; - SvxBorderLine *pLeft = 0, - *pRight = 0, - *pTop = 0, - *pBottom = 0; + SvxBorderLine *pLeft = nullptr, + *pRight = nullptr, + *pTop = nullptr, + *pBottom = nullptr; sal_uInt16 nSel = aFrameSet->GetSelectItemId(); sal_uInt16 nModifier = aFrameSet->GetModifier(); sal_uInt8 nValidFlags = 0; @@ -1714,20 +1714,20 @@ IMPL_LINK_NOARG_TYPED(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void) case 9: // HOR pTop = pBottom = &theDefLine; aBorderInner.SetLine( &theDefLine, SvxBoxInfoItemLine::HORI ); - aBorderInner.SetLine( NULL, SvxBoxInfoItemLine::VERT ); + aBorderInner.SetLine( nullptr, SvxBoxInfoItemLine::VERT ); nValidFlags |= FRM_VALID_HINNER|FRM_VALID_TOP|FRM_VALID_BOTTOM; break; case 10: // HORINNER pLeft = pRight = pTop = pBottom = &theDefLine; aBorderInner.SetLine( &theDefLine, SvxBoxInfoItemLine::HORI ); - aBorderInner.SetLine( NULL, SvxBoxInfoItemLine::VERT ); + aBorderInner.SetLine( nullptr, SvxBoxInfoItemLine::VERT ); nValidFlags |= FRM_VALID_RIGHT|FRM_VALID_LEFT|FRM_VALID_HINNER|FRM_VALID_TOP|FRM_VALID_BOTTOM; break; case 11: // VERINNER pLeft = pRight = pTop = pBottom = &theDefLine; - aBorderInner.SetLine( NULL, SvxBoxInfoItemLine::HORI ); + aBorderInner.SetLine( nullptr, SvxBoxInfoItemLine::HORI ); aBorderInner.SetLine( &theDefLine, SvxBoxInfoItemLine::VERT ); nValidFlags |= FRM_VALID_RIGHT|FRM_VALID_LEFT|FRM_VALID_VINNER|FRM_VALID_TOP|FRM_VALID_BOTTOM; break; @@ -1909,7 +1909,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineWindow_Impl, SelectHdl, ListBox&, void) aLineItem.SetLine( &aTmp ); } else - aLineItem.SetLine( NULL ); + aLineItem.SetLine( nullptr ); if ( IsInPopupMode() ) EndPopupMode(); @@ -1984,11 +1984,11 @@ void SfxStyleControllerItem_Impl::StateChanged( { const SfxTemplateItem* pStateItem = dynamic_cast<const SfxTemplateItem*>( pState ); - DBG_ASSERT( pStateItem != NULL, "SfxTemplateItem expected" ); + DBG_ASSERT( pStateItem != nullptr, "SfxTemplateItem expected" ); rControl.SetFamilyState( nIdx, pStateItem ); } else - rControl.SetFamilyState( nIdx, NULL ); + rControl.SetFamilyState( nIdx, nullptr ); break; } } @@ -2105,14 +2105,14 @@ SvxStyleToolBoxControl::SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl ( nSlotId, nId, rTbx ), pImpl ( new Impl ), - pStyleSheetPool ( NULL ), + pStyleSheetPool ( nullptr ), nActFamily ( 0xffff ) { for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ ) { - pBoundItems[i] = 0; + pBoundItems[i] = nullptr; m_xBoundItems[i].clear(); - pFamilyState[i] = NULL; + pFamilyState[i] = nullptr; } } @@ -2138,7 +2138,7 @@ throw ( Exception, RuntimeException, std::exception) OUString::createFromAscii( StyleSlotToStyleCommand[i] ), *this ); m_xBoundItems[i].set( static_cast< OWeakObject* >( pBoundItems[i] ), UNO_QUERY ); - pFamilyState[i] = NULL; + pFamilyState[i] = nullptr; } } } @@ -2162,12 +2162,12 @@ void SAL_CALL SvxStyleToolBoxControl::dispose() } m_xBoundItems[i].clear(); - pBoundItems[i] = 0; + pBoundItems[i] = nullptr; } delete pFamilyState[i]; - pFamilyState[i] = NULL; + pFamilyState[i] = nullptr; } - pStyleSheetPool = NULL; + pStyleSheetPool = nullptr; pImpl.reset(); } @@ -2212,7 +2212,7 @@ void SvxStyleToolBoxControl::FillStyleBox() { const SfxStyleFamily eFamily = GetActFamily(); sal_uInt16 nCount = pStyleSheetPool->Count(); - SfxStyleSheetBase* pStyle = NULL; + SfxStyleSheetBase* pStyle = nullptr; bool bDoFill = false; pStyleSheetPool->SetSearchMask( eFamily, SFXSTYLEBIT_USED ); @@ -2337,7 +2337,7 @@ void SvxStyleToolBoxControl::SelectStyle( const OUString& rStyleName ) void SvxStyleToolBoxControl::Update() { - SfxStyleSheetBasePool* pPool = NULL; + SfxStyleSheetBasePool* pPool = nullptr; SfxObjectShell* pDocShell = SfxObjectShell::Current(); if ( pDocShell ) @@ -2355,9 +2355,9 @@ void SvxStyleToolBoxControl::Update() } - const SfxTemplateItem* pItem = NULL; + const SfxTemplateItem* pItem = nullptr; - if ( nActFamily == 0xffff || 0 == (pItem = pFamilyState[nActFamily-1]) ) + if ( nActFamily == 0xffff || nullptr == (pItem = pFamilyState[nActFamily-1]) ) // Current range not within allowed ranges or default { pStyleSheetPool = pPool; @@ -2388,7 +2388,7 @@ void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx, const SfxTemplateItem* pItem ) { delete pFamilyState[nIdx]; - pFamilyState[nIdx] = NULL; + pFamilyState[nIdx] = nullptr; if ( pItem ) pFamilyState[nIdx] = new SfxTemplateItem( *pItem ); diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 4a9d658ee131..0aba9071d61c 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -194,7 +194,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& rCurrentFo { // Sizes-Liste auff"ullen sal_Int64 nOldVal = GetValue(); // alten Wert merken - const FontList* _pFontList = NULL; + const FontList* _pFontList = nullptr; std::unique_ptr<FontList> aHold( new FontList( this )); _pFontList = aHold.get(); @@ -208,7 +208,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& rCurrentFo } else { - Fill( NULL, _pFontList ); + Fill( nullptr, _pFontList ); } SetValue( nOldVal ); // alten Wert wiederherstellen m_aCurText = GetText(); // zum R"ucksetzen bei ESC merken @@ -276,7 +276,7 @@ FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< uno::X : svt::ToolboxController( rxContext, uno::Reference< frame::XFrame >(), OUString( ".uno:FontHeight" ) ), - m_pBox( NULL ) + m_pBox( nullptr ) { addStatusListener( ".uno:CharFontName"); } diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 61e49f462805..72a523e222cf 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -372,7 +372,7 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : svt::ToolboxController(rxContext, css::uno::Reference< css::frame::XFrame >(), OUString(COMMAND_FINDTEXT)) - , m_pFindTextFieldControl(NULL) + , m_pFindTextFieldControl(nullptr) , m_nDownSearchId(0) , m_nUpSearchId(0) { @@ -619,7 +619,7 @@ MatchCaseToolboxController::MatchCaseToolboxController( const css::uno::Referenc : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), OUString(COMMAND_MATCHCASE) ) - , m_pMatchCaseControl(NULL) + , m_pMatchCaseControl(nullptr) { } @@ -713,7 +713,7 @@ SearchFormattedToolboxController::SearchFormattedToolboxController( const css::u : svt::ToolboxController( rxContext, css::uno::Reference< css::frame::XFrame >(), OUString(COMMAND_SEARCHFORMATTED) ) - , m_pSearchFormattedControl(NULL) + , m_pSearchFormattedControl(nullptr) { } @@ -1067,7 +1067,7 @@ FindbarDispatcher::FindbarDispatcher() FindbarDispatcher::~FindbarDispatcher() { - m_xFrame = NULL; + m_xFrame = nullptr; } // XInterface diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 282589d6822a..37076ad7a534 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -110,7 +110,7 @@ namespace svx aBmpEx.CopyPixel( aRect, aRect, &aSource ); Bitmap aBmp( aBmpEx.GetBitmap() ); - BitmapWriteAccess* pBmpAcc = aBmp.IsEmpty() ? NULL : aBmp.AcquireWriteAccess(); + BitmapWriteAccess* pBmpAcc = aBmp.IsEmpty() ? nullptr : aBmp.AcquireWriteAccess(); maBmpSize = aBmp.GetSizePixel(); @@ -131,7 +131,7 @@ namespace svx } else { - pMskAcc = NULL; + pMskAcc = nullptr; } mbWasHiContrastMode = mpTbx->GetSettings().GetStyleSettings().GetHighContrastMode(); diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index b1fed1402738..aeac1938cc26 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star::uno; // tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). static SfxSlot aExtrusionBarSlots_Impl[] = { - { 0, 0, 0, SfxSlotMode::NONE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, 0, 0, nullptr } }; SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell) @@ -76,7 +76,7 @@ ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) ExtrusionBar::~ExtrusionBar() { - SetRepeatTarget(NULL); + SetRepeatTarget(nullptr); } void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const Direction3D **pLighting2Defaults ) @@ -587,7 +587,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB fDepth = aDlg->getDepth(); SvxDoubleItem aItem( fDepth, SID_EXTRUSION_DEPTH ); - SfxPoolItem* aItems[] = { &aItem, 0 }; + SfxPoolItem* aItems[] = { &aItem, nullptr }; rBindings.Execute( SID_EXTRUSION_DEPTH, const_cast<const SfxPoolItem**>(aItems) ); } } diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 25f2f8c054f1..9409515b6bbb 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -168,7 +168,7 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) // tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). static SfxSlot aFontworkBarSlots_Impl[] = { - { 0, 0, 0, SfxSlotMode::NONE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, 0, 0, nullptr } }; SFX_IMPL_INTERFACE(FontworkBar, SfxShell) @@ -193,7 +193,7 @@ FontworkBar::FontworkBar(SfxViewShell* pViewShell ) FontworkBar::~FontworkBar() { - SetRepeatTarget(NULL); + SetRepeatTarget(nullptr); } static vcl::Window* ImpGetViewWin(SdrView* pView) @@ -212,7 +212,7 @@ static vcl::Window* ImpGetViewWin(SdrView* pView) } } - return 0L; + return nullptr; } namespace svx { @@ -495,7 +495,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi if( nRet != 0 ) { SfxInt32Item aItem( SID_FONTWORK_CHARACTER_SPACING, aDlg->getScale() ); - SfxPoolItem* aItems[] = { &aItem, 0 }; + SfxPoolItem* aItems[] = { &aItem, nullptr }; rBindings.Execute( SID_FONTWORK_CHARACTER_SPACING, const_cast<const SfxPoolItem**>(aItems) ); } } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 333ec3a46301..054e5fdc2cac 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -51,10 +51,10 @@ using namespace ::com::sun::star::uno; DictionaryList::DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits) : SvSimpleTable(rParent, nBits) - , m_xDictionary(0) - , m_pED_Term(0) - , m_pED_Mapping(0) - , m_pLB_Property(0) + , m_xDictionary(nullptr) + , m_pED_Term(nullptr) + , m_pED_Mapping(nullptr) + , m_pLB_Property(nullptr) , m_aToBeDeleted() , m_nSortColumnIndex(0) { @@ -187,7 +187,7 @@ void DictionaryList::refillFromDictionary( sal_Int32 nTextConversionOptions ) DictionaryEntry* DictionaryList::getFirstSelectedEntry() const { - DictionaryEntry* pRet=0; + DictionaryEntry* pRet=nullptr; for( sal_Int32 nN=GetRowCount(); nN--; ) { if( IsRowSelected( nN ) ) @@ -201,7 +201,7 @@ DictionaryEntry* DictionaryList::getFirstSelectedEntry() const DictionaryEntry* DictionaryList::getEntryOnPos( sal_Int32 nPos ) const { - DictionaryEntry* pEntry=0; + DictionaryEntry* pEntry=nullptr; SvTreeListEntry* pLBEntry = GetEntryOnPos( nPos ); if(pLBEntry) pEntry = static_cast<DictionaryEntry*>(pLBEntry->GetUserData()); @@ -216,12 +216,12 @@ DictionaryEntry* DictionaryList::getTermEntry( const OUString& rTerm ) const if( pE && rTerm.equals( pE->m_aTerm ) ) return pE; } - return 0; + return nullptr; } bool DictionaryList::hasTerm( const OUString& rTerm ) const { - return getTermEntry(rTerm) !=0 ; + return getTermEntry(rTerm) !=nullptr ; } void DictionaryList::addEntry( const OUString& rTerm, const OUString& rMapping @@ -303,7 +303,7 @@ sal_Int32 DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListEntry SvLBoxItem* pLeftItem = getItemAtColumn( pLeft, m_nSortColumnIndex ); SvLBoxItem* pRightItem = getItemAtColumn( pRight, m_nSortColumnIndex ); - if(pLeftItem != NULL && pRightItem != NULL) + if(pLeftItem != nullptr && pRightItem != nullptr) { sal_uInt16 nLeftKind = pLeftItem->GetType(); sal_uInt16 nRightKind = pRightItem->GetType(); @@ -326,7 +326,7 @@ sal_Int32 DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListEntry SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 nColumn ) const { - SvLBoxItem* pItem = NULL; + SvLBoxItem* pItem = nullptr; if( pEntry ) { sal_uInt16 nCount = pEntry->ItemCount(); @@ -444,7 +444,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ChineseDictionaryDialog", "svx/ui/chinesedictionary.ui") , m_nTextConversionOptions(i18n::TextConversionOption::NONE) - , m_xContext(0) + , m_xContext(nullptr) { get(m_pRB_To_Simplified, "tradtosimple"); get(m_pRB_To_Traditional, "simpletotrad"); @@ -476,8 +476,8 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent ) m_pLB_Property->SetDropDownLineCount( m_pLB_Property->GetEntryCount() ); m_pLB_Property->SelectEntryPos(0); - Reference< linguistic2::XConversionDictionary > xDictionary_To_Simplified(0); - Reference< linguistic2::XConversionDictionary > xDictionary_To_Traditional(0); + Reference< linguistic2::XConversionDictionary > xDictionary_To_Simplified(nullptr); + Reference< linguistic2::XConversionDictionary > xDictionary_To_Traditional(nullptr); //get dictionaries { if(!m_xContext.is()) @@ -560,7 +560,7 @@ ChineseDictionaryDialog::~ChineseDictionaryDialog() void ChineseDictionaryDialog::dispose() { - m_xContext=0; + m_xContext=nullptr; m_pCT_DictionaryToSimplified.disposeAndClear(); m_pCT_DictionaryToTraditional.disposeAndClear(); m_pRB_To_Simplified.clear(); @@ -602,7 +602,7 @@ IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, DirectionHdl, Button*, void) void ChineseDictionaryDialog::updateAfterDirectionChange() { - Reference< linguistic2::XConversionDictionary > xDictionary(0); + Reference< linguistic2::XConversionDictionary > xDictionary(nullptr); if( m_pRB_To_Simplified->IsChecked() ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index 701171279d37..bd26f4373d54 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -37,8 +37,8 @@ using namespace ::com::sun::star; ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference< uno::XComponentContext >& xContext ) : m_xCC( xContext ) - , m_xParentWindow( 0 ) - , m_pDialog( 0 ) + , m_xParentWindow( nullptr ) + , m_pDialog( nullptr ) , m_bDisposed(false) , m_bInDispose(false) , m_aContainerMutex() @@ -128,7 +128,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc if( !m_pDialog ) { - vcl::Window* pParent = NULL; + vcl::Window* pParent = nullptr; if( m_xParentWindow.is() ) { VCLXWindow* pImplementation = VCLXWindow::GetImplementation(m_xParentWindow); @@ -160,7 +160,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeExcepti m_bInDispose = true; impl_DeleteDialog(); - m_xParentWindow = 0; + m_xParentWindow = nullptr; m_bDisposed = true; aEvt.Source = static_cast< XComponent * >( this ); @@ -190,7 +190,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Refe uno::Reference< beans::XPropertySetInfo > SAL_CALL ChineseTranslation_UnoDialog::getPropertySetInfo( ) throw (uno::RuntimeException, std::exception) { - return 0; + return nullptr; } void SAL_CALL ChineseTranslation_UnoDialog::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index a1ab685c7c0f..62ada096b75b 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno; ChineseTranslationDialog::ChineseTranslationDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ChineseConversionDialog", "svx/ui/chineseconversiondialog.ui") - , m_pDictionaryDialog(0) + , m_pDictionaryDialog(nullptr) { get(m_pBP_OK, "ok"); get(m_pPB_Editterms, "editterms"); diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index 4d0c17f04929..de6d3f6df754 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -27,10 +27,10 @@ static const struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetran , ::textconversiondlgs::ChineseTranslation_UnoDialog::getImplementationName_Static , ::textconversiondlgs::ChineseTranslation_UnoDialog::getSupportedServiceNames_Static , ::cppu::createSingleComponentFactory - , 0 + , nullptr , 0 } - ,{ 0, 0, 0, 0, 0, 0 } + ,{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; // component exports diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index dbd32b3951a4..a52ee9951aa4 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -262,7 +262,7 @@ namespace { Size* CalcSize( sal_Int32 nWidth, sal_Int32 nHeight, const Size& aBoundSize, Size& aOutSize ) { if( (nWidth == 0) && (nHeight == 0) ) - return NULL; + return nullptr; if( (nWidth == 0) && (nHeight != 0) && (aBoundSize.Height() != 0) ) { @@ -311,10 +311,10 @@ drawinglayer::primitive2d::Primitive2DSequence ImplExportCheckVisisbilityRedirec if(pObject) { SdrPage* pPage = mpCurrentPage; - if( pPage == 0 ) + if( pPage == nullptr ) pPage = pObject->GetPage(); - if( (pPage == 0) || pPage->checkVisibility(rOriginal, rDisplayInfo, false) ) + if( (pPage == nullptr) || pPage->checkVisibility(rOriginal, rDisplayInfo, false) ) { return sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo); } @@ -329,7 +329,7 @@ drawinglayer::primitive2d::Primitive2DSequence ImplExportCheckVisisbilityRedirec } GraphicExporter::GraphicExporter() -: mpUnoPage( NULL ), mnPageNumber(-1), mpCurrentPage(0), mpDoc( NULL ) +: mpUnoPage( nullptr ), mnPageNumber(-1), mpCurrentPage(nullptr), mpDoc( nullptr ) { } @@ -384,7 +384,7 @@ IMPL_LINK_TYPED(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) maOldCalcFieldValueHdl.Call( pInfo ); if( pInfo && mpCurrentPage ) - pInfo->SetSdrPage( 0 ); + pInfo->SetSdrPage( nullptr ); } /** creates an virtual device for the given page @@ -633,7 +633,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, EEControlBits nCntrl = nOldCntrl & ~EEControlBits::ONLINESPELLING; rOutl.SetControlWord(nCntrl); - SdrObject* pTempBackgroundShape = 0; + SdrObject* pTempBackgroundShape = nullptr; std::vector< SdrObject* > aShapes; bool bRet = true; @@ -1001,10 +1001,10 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes { ::SolarMutexGuard aGuard; - if( NULL == mpUnoPage ) + if( nullptr == mpUnoPage ) return sal_False; - if( NULL == mpUnoPage->GetSdrPage() || NULL == mpDoc ) + if( nullptr == mpUnoPage->GetSdrPage() || nullptr == mpDoc ) return sal_False; GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); @@ -1090,8 +1090,8 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon { ::SolarMutexGuard aGuard; - mxShapes = NULL; - mpUnoPage = NULL; + mxShapes = nullptr; + mpUnoPage = nullptr; try { @@ -1114,13 +1114,13 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon } else { - mxShapes = NULL; + mxShapes = nullptr; } // Step 2: try a shape if( mxShape.is() ) { - if( NULL == GetSdrObjectFromXShape( mxShape ) ) + if( nullptr == GetSdrObjectFromXShape( mxShape ) ) break; // get page for this shape @@ -1148,7 +1148,7 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon mpUnoPage = SvxDrawPage::getImplementation( mxPage ); - if( NULL == mpUnoPage || NULL == mpUnoPage->GetSdrPage() ) + if( nullptr == mpUnoPage || nullptr == mpUnoPage->GetSdrPage() ) break; mpDoc = mpUnoPage->GetSdrPage()->GetModel(); diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index 7ef71b97a4bc..e21736f7d7b1 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -37,7 +37,7 @@ using namespace ::cppu; SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw() : mpModel( pModel ), - mpModelPool( pModel ? &pModel->GetItemPool() : NULL ), + mpModelPool( pModel ? &pModel->GetItemPool() : nullptr ), mnWhich( nWhich ), mnMemberId( nMemberId ) { if( pModel ) diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 1df7662c6010..0db90fa6ad40 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -120,7 +120,7 @@ using namespace ::svx; NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool ) { mpPool = pPool; - mpCurrentAttr = NULL; + mpCurrentAttr = nullptr; mnCurrentAttr = 0; mpWhichId = pWhichIds; @@ -142,11 +142,11 @@ bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL ) } // we need the next namespace item - mpCurrentAttr = NULL; + mpCurrentAttr = nullptr; - const SfxPoolItem* pItem = 0; + const SfxPoolItem* pItem = nullptr; // look for the next available item in the current pool - while( (mnItem < mnItemCount) && ( NULL == (pItem = mpPool->GetItem2( *mpWhichId, mnItem ) ) ) ) + while( (mnItem < mnItemCount) && ( nullptr == (pItem = mpPool->GetItem2( *mpWhichId, mnItem ) ) ) ) mnItem++; // are we finished with the current whichid? @@ -162,7 +162,7 @@ bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL ) return next( rPrefix, rURL ); } - pItem = NULL; + pItem = nullptr; } if( pItem ) diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 51f787c28ec9..1067674f17ec 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -89,7 +89,7 @@ XPropertyEntry* SvxUnoXPropertyTable::get( long index ) const if( mpList ) return mpList->Get(index); else - return NULL; + return nullptr; } // XServiceInfo @@ -105,7 +105,7 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const { SolarMutexGuard aGuard; - if( NULL == mpList ) + if( nullptr == mpList ) throw lang::IllegalArgumentException(); if( hasByName( aName ) ) @@ -114,7 +114,7 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const OUString aInternalName = SvxUnogetInternalNameForItem(mnWhich, aName); XPropertyEntry* pNewEntry = getEntry( aInternalName, aElement ); - if( NULL == pNewEntry ) + if( nullptr == pNewEntry ) throw lang::IllegalArgumentException(); if( mpList ) @@ -160,7 +160,7 @@ void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const if (pEntry && aInternalName.equals(pEntry->GetName())) { XPropertyEntry* pNewEntry = getEntry( aInternalName, aElement ); - if( NULL == pNewEntry ) + if( nullptr == pNewEntry ) throw lang::IllegalArgumentException(); if( mpList ) @@ -277,7 +277,7 @@ XPropertyEntry* SvxUnoXColorTable::getEntry( const OUString& rName, const uno::A { sal_Int32 nColor = 0; if( !(rAny >>= nColor) ) - return NULL; + return nullptr; const Color aColor( (ColorData)nColor ); return new XColorEntry( aColor, rName ); @@ -343,7 +343,7 @@ XPropertyEntry* SvxUnoXLineEndTable::getEntry( const OUString& rName, const uno: { if( !rAny.getValue() || rAny.getValueType() != cppu::UnoType<drawing::PolyPolygonBezierCoords>::get()) - return NULL; + return nullptr; basegfx::B2DPolyPolygon aPolyPolygon; drawing::PolyPolygonBezierCoords const * pCoords = static_cast<drawing::PolyPolygonBezierCoords const *>(rAny.getValue()); @@ -423,7 +423,7 @@ XPropertyEntry* SvxUnoXDashTable::getEntry( const OUString& rName, const uno::An { drawing::LineDash aLineDash; if(!(rAny >>= aLineDash)) - return NULL; + return nullptr; XDash aXDash; @@ -502,7 +502,7 @@ XPropertyEntry* SvxUnoXHatchTable::getEntry( const OUString& rName, const uno::A { drawing::Hatch aUnoHatch; if(!(rAny >>= aUnoHatch)) - return NULL; + return nullptr; XHatch aXHatch; aXHatch.SetHatchStyle( (css::drawing::HatchStyle)aUnoHatch.Style ); @@ -583,7 +583,7 @@ XPropertyEntry* SvxUnoXGradientTable::getEntry( const OUString& rName, const uno { awt::Gradient aGradient; if(!(rAny >>= aGradient)) - return NULL; + return nullptr; XGradient aXGradient; @@ -661,7 +661,7 @@ XPropertyEntry* SvxUnoXBitmapTable::getEntry( const OUString& rName, const uno:: { OUString aURL; if(!(rAny >>= aURL)) - return NULL; + return nullptr; const GraphicObject aGrafObj(GraphicObject::CreateGraphicObjectFromURL(aURL)); diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index b65dcc3d2bf8..4ac50aaf46d1 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -119,7 +119,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo RecoveryUI::RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) - , m_pParentWindow(0 ) + , m_pParentWindow(nullptr ) , m_eJob (RecoveryUI::E_JOB_UNKNOWN) { } diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 8858859922d4..316887c22a70 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -42,7 +42,7 @@ public: virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override; }; class SvxAppletShape : public SvxOle2Shape { @@ -60,7 +60,7 @@ public: virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) override; }; class SvxFrameShape : public SvxOle2Shape { @@ -83,7 +83,7 @@ public: virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) throw (css::uno::RuntimeException, std::exception) override; + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = nullptr ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx index 1ae4c1475ef2..fef98fb558c4 100644 --- a/svx/source/unodraw/unobrushitemhelper.cxx +++ b/svx/source/unodraw/unobrushitemhelper.cxx @@ -154,7 +154,7 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSearchInParents) { sal_uInt16 nFillTransparence(static_cast< const XFillTransparenceItem& >(rSourceSet.Get(XATTR_FILLTRANSPARENCE, bSearchInParents)).GetValue()); - const SfxPoolItem* pGradientItem = 0; + const SfxPoolItem* pGradientItem = nullptr; if(SfxItemState::SET == rSourceSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, bSearchInParents, &pGradientItem) && static_cast< const XFillFloatTransparenceItem* >(pGradientItem)->IsEnabled()) diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx index 265d3c2711ed..e764a10dc35f 100644 --- a/svx/source/unodraw/unomlstr.cxx +++ b/svx/source/unodraw/unomlstr.cxx @@ -54,7 +54,7 @@ void SvxUnoShapeModifyListener::disposing(const lang::EventObject& ) throw( uno: // internal void SvxUnoShapeModifyListener::invalidate() throw() { - mpObj = NULL; + mpObj = nullptr; } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 7c6b9d748ac4..29f5d6c78dc6 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -100,7 +100,7 @@ static const SvEventDescription* ImplGetSupportedMacroItems() { { SFX_EVENT_MOUSEOVER_OBJECT, "OnMouseOver" }, { SFX_EVENT_MOUSEOUT_OBJECT, "OnMouseOut" }, - { 0, NULL } + { 0, nullptr } }; return aMacroDescriptionsImpl; @@ -115,8 +115,8 @@ static const SvEventDescription* ImplGetSupportedMacroItems() */ bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdrHint, css::document::EventObject& aEvent ) { - const SdrObject* pObj = NULL; - const SdrPage* pPage = NULL; + const SdrObject* pObj = nullptr; + const SdrPage* pPage = nullptr; switch( pSdrHint->GetKind() ) { @@ -176,7 +176,7 @@ css::uno::Reference<css::uno::XInterface> create( sal_uInt16 nT = (sal_uInt16)(nType & ~E3D_INVENTOR_FLAG); sal_uInt32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor; - return uno::Reference< uno::XInterface >( static_cast<drawing::XShape*>(SvxDrawPage::CreateShapeByTypeAndInventor( nT, nI, 0, 0, referer )) ); + return uno::Reference< uno::XInterface >( static_cast<drawing::XShape*>(SvxDrawPage::CreateShapeByTypeAndInventor( nT, nI, nullptr, nullptr, referer )) ); } } else if ( rServiceSpecifier == "com.sun.star.document.ImportGraphicObjectResolver" ) @@ -422,7 +422,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c const OUString aPackagePrefix( "com.sun.star.presentation." ); if( aType.startsWith( aPackagePrefix ) ) { - SvxShape* pShape = NULL; + SvxShape* pShape = nullptr; sal_uInt16 nType = OBJ_TEXT; OUString aTypeName = aType.copy( aPackagePrefix.getLength() ); @@ -713,7 +713,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNam css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw() { - const SvxNumRule* pDefaultRule = NULL; + const SvxNumRule* pDefaultRule = nullptr; if( pModel ) { const SvxNumBulletItem* pItem = static_cast<const SvxNumBulletItem*>( pModel->GetItemPool().GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET) ); diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index c7b15c25704d..0b200a17a80f 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -336,7 +336,7 @@ static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< { const NameOrIndex* pItem = static_cast<const NameOrIndex*>(pPool->GetItem2( nWhich, nSurrogate )); - if( pItem == NULL || pItem->GetName().isEmpty() ) + if( pItem == nullptr || pItem->GetName().isEmpty() ) continue; OUString aName = SvxUnogetApiNameForItem(XATTR_LINEEND, pItem->GetName()); diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 65ec23491c4f..0cee1fef5c2a 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -64,7 +64,7 @@ UNO3_GETIMPLEMENTATION_IMPL( SvxDrawPage ); SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw() : mrBHelper( getMutex() ) , mpPage( pInPage ) -, mpModel( 0 ) +, mpModel( nullptr ) { // register at broadcaster if( mpPage ) @@ -100,15 +100,15 @@ void SvxDrawPage::disposing() throw() if( mpModel ) { EndListening( *mpModel ); - mpModel = NULL; + mpModel = nullptr; } if( mpView ) { delete mpView; - mpView = NULL; + mpView = nullptr; } - mpPage = 0; + mpPage = nullptr; } // XComponent @@ -172,7 +172,7 @@ void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lan { SolarMutexGuard aGuard; - if( mpModel == 0 ) + if( mpModel == nullptr ) throw lang::DisposedException(); mrBHelper.addListener( cppu::UnoType<decltype(aListener)>::get() , aListener ); @@ -182,7 +182,7 @@ void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css:: { SolarMutexGuard aGuard; - if( mpModel == 0 ) + if( mpModel == nullptr ) throw lang::DisposedException(); mrBHelper.removeListener( cppu::UnoType<decltype(aListener)>::get() , aListener ); @@ -198,12 +198,12 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape { SolarMutexGuard aGuard; - if ( ( mpModel == NULL ) || ( mpPage == NULL ) ) + if ( ( mpModel == nullptr ) || ( mpPage == nullptr ) ) throw lang::DisposedException(); SvxShape* pShape = SvxShape::getImplementation( xShape ); - if( NULL == pShape ) + if( nullptr == pShape ) return; SdrObject *pObj = pShape->GetSdrObject(); @@ -211,7 +211,7 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape if(!pObj) { pObj = CreateSdrObject( xShape ); - ENSURE_OR_RETURN_VOID( pObj != NULL, "SvxDrawPage::add: no SdrObject was created!" ); + ENSURE_OR_RETURN_VOID( pObj != nullptr, "SvxDrawPage::add: no SdrObject was created!" ); } else if ( !pObj->IsInserted() ) { @@ -242,12 +242,12 @@ void SAL_CALL SvxDrawPage::addBottom( const uno::Reference< drawing::XShape >& x { SolarMutexGuard aGuard; - if ( ( mpModel == NULL ) || ( mpPage == NULL ) ) + if ( ( mpModel == nullptr ) || ( mpPage == nullptr ) ) throw lang::DisposedException(); SvxShape* pShape = SvxShape::getImplementation( xShape ); - if( NULL == pShape ) + if( nullptr == pShape ) return; SdrObject *pObj = pShape->GetSdrObject(); @@ -255,7 +255,7 @@ void SAL_CALL SvxDrawPage::addBottom( const uno::Reference< drawing::XShape >& x if(!pObj) { pObj = CreateSdrObject( xShape, true ); - ENSURE_OR_RETURN_VOID( pObj != NULL, "SvxDrawPage::add: no SdrObject was created!" ); + ENSURE_OR_RETURN_VOID( pObj != nullptr, "SvxDrawPage::add: no SdrObject was created!" ); } else if ( !pObj->IsInserted() ) { @@ -280,7 +280,7 @@ void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape ) { SolarMutexGuard aGuard; - if( (mpModel == 0) || (mpPage == 0) ) + if( (mpModel == nullptr) || (mpPage == nullptr) ) throw lang::DisposedException(); SvxShape* pShape = SvxShape::getImplementation( xShape ); @@ -330,7 +330,7 @@ sal_Int32 SAL_CALL SvxDrawPage::getCount() { SolarMutexGuard aGuard; - if( (mpModel == 0) || (mpPage == 0) ) + if( (mpModel == nullptr) || (mpPage == nullptr) ) throw lang::DisposedException(); return static_cast<sal_Int32>( mpPage->GetObjCount() ); @@ -341,14 +341,14 @@ uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index ) { SolarMutexGuard aGuard; - if( (mpModel == 0) || (mpPage == 0) ) + if( (mpModel == nullptr) || (mpPage == nullptr) ) throw lang::DisposedException(); if ( Index < 0 || static_cast<size_t>(Index) >= mpPage->GetObjCount() ) throw lang::IndexOutOfBoundsException(); SdrObject* pObj = mpPage->GetObj( Index ); - if( pObj == NULL ) + if( pObj == nullptr ) throw uno::RuntimeException(); @@ -367,7 +367,7 @@ sal_Bool SAL_CALL SvxDrawPage::hasElements() { SolarMutexGuard aGuard; - if( (mpModel == 0) || (mpPage == 0) ) + if( (mpModel == nullptr) || (mpPage == nullptr) ) throw lang::DisposedException(); return mpPage && mpPage->GetObjCount()>0; @@ -396,7 +396,7 @@ void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aS SAL_WARN_IF(!pPageView, "svx", "SdrPageView is NULL!"); SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!"); - if(pPageView!=NULL && mpView!=NULL) + if(pPageView!=nullptr && mpView!=nullptr) { mpView->UnmarkAllObj( pPageView ); @@ -418,7 +418,7 @@ void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xSha SAL_WARN_IF(!pPageView, "svx", "SdrPageView is NULL!"); SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!"); - if(pPageView!=NULL && mpView != NULL) + if(pPageView!=nullptr && mpView != nullptr) { mpView->UnmarkAllObj( pPageView ); lcl_markSdrObjectOfShape( xShape, *mpView, *pPageView ); @@ -430,14 +430,14 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< { SolarMutexGuard aGuard; - if( (mpModel == 0) || (mpPage == 0) ) + if( (mpModel == nullptr) || (mpPage == nullptr) ) throw lang::DisposedException(); SAL_WARN_IF(!mpPage , "svx", "SdrPage is NULL!"); SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!"); Reference< css::drawing::XShapeGroup > xShapeGroup; - if(mpPage==NULL||mpView==NULL||!xShapes.is()) + if(mpPage==nullptr||mpView==nullptr||!xShapes.is()) return xShapeGroup; SdrPageView* pPageView = mpView->ShowSdrPage( mpPage ); @@ -468,13 +468,13 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr { SolarMutexGuard aGuard; - if( (mpModel == 0) || (mpPage == 0) ) + if( (mpModel == nullptr) || (mpPage == nullptr) ) throw lang::DisposedException(); SAL_WARN_IF(!mpPage, "svx", "SdrPage is NULL!"); SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!"); - if(mpPage==NULL||mpView==NULL||!aGroup.is()) + if(mpPage==nullptr||mpView==nullptr||!aGroup.is()) return; SdrPageView* pPageView = mpView->ShowSdrPage( mpPage ); @@ -497,7 +497,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS GetTypeAndInventor( nType, nInventor, xShape->getShapeType() ); if (!nType) - return NULL; + return nullptr; awt::Size aSize = xShape->getSize(); aSize.Width += 1; @@ -507,7 +507,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS SdrObject* pNewObj = SdrObjFactory::MakeNewObject(nInventor, nType, aRect, mpPage); if (!pNewObj) - return NULL; + return nullptr; if( dynamic_cast<const E3dPolyScene* >(pNewObj) != nullptr) { @@ -603,7 +603,7 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj, SvxDrawPage *mpPage, OUString const & referer ) throw (css::uno::RuntimeException) { - SvxShape* pRet = NULL; + SvxShape* pRet = nullptr; switch( nInventor ) { case E3dInventor: @@ -739,7 +739,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 } } } - if( pRet == NULL ) + if( pRet == nullptr ) { SvxUnoPropertyMapProvider& rSvxMapProvider = getSvxMapProvider(); pRet = new SvxOle2Shape( pObj, rSvxMapProvider.GetMap(SVXMAP_OLE2), rSvxMapProvider.GetPropertySet(SVXMAP_OLE2, SdrObject::GetGlobalDrawObjectItemPool()) ); @@ -873,7 +873,7 @@ uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, sal_uInt32 nInventor, OUString const & referer) throw (css::uno::RuntimeException, std::exception) { - return SvxDrawPage::CreateShapeByTypeAndInventor( nType, nInventor, 0, 0, referer ); + return SvxDrawPage::CreateShapeByTypeAndInventor( nType, nInventor, nullptr, nullptr, referer ); } void SvxDrawPage::ChangeModel( SdrModel* pNewModel ) @@ -923,7 +923,7 @@ SdrPage* GetSdrPageFromXDrawPage( uno::Reference< drawing::XDrawPage > xDrawPage } } - return NULL; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 949df3e5731c..aae498f1cd9d 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -88,7 +88,7 @@ SfxItemPool* SvxUnoDrawPool::getModelPool( bool bReadOnly ) throw() if( bReadOnly ) return mpDefaultsPool; else - return NULL; + return nullptr; } } @@ -206,7 +206,7 @@ void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** pp SfxItemPool* pPool = getModelPool( false ); DBG_ASSERT( pPool, "I need a SfxItemPool!" ); - if( NULL == pPool ) + if( nullptr == pPool ) throw beans::UnknownPropertyException(); while( *ppEntries ) @@ -221,7 +221,7 @@ void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** pp SfxItemPool* pPool = getModelPool( true ); DBG_ASSERT( pPool, "I need a SfxItemPool!" ); - if( NULL == pPool ) + if( nullptr == pPool ) throw beans::UnknownPropertyException(); while( *ppEntries ) diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 1b414e54b995..7c9e150f9511 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -912,8 +912,8 @@ SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider() { for(sal_uInt16 i=0;i<SVXMAP_END; i++) { - aSetArr[i] = 0; - aMapArr[i] = 0; + aSetArr[i] = nullptr; + aMapArr[i] = nullptr; } } @@ -1384,10 +1384,10 @@ comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nSer if( nServiceId > SVXUNO_SERVICEID_LASTID ) { OSL_FAIL( "unknown service id!" ); - return NULL; + return nullptr; } - if( mpInfos[ nServiceId ] == NULL ) + if( mpInfos[ nServiceId ] == nullptr ) { mpInfos[nServiceId] = new comphelper::PropertySetInfo(); mpInfos[nServiceId]->acquire(); @@ -1412,6 +1412,6 @@ comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nSer return mpInfos[ nServiceId ]; } -comphelper::PropertySetInfo* SvxPropertySetInfoPool::mpInfos[SVXUNO_SERVICEID_LASTID+1] = { NULL }; +comphelper::PropertySetInfo* SvxPropertySetInfoPool::mpInfos[SVXUNO_SERVICEID_LASTID+1] = { nullptr }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index b9cb41a4bbfb..26e18ae690f6 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -198,7 +198,7 @@ void SvxShapeGroup::addUnoShape( const uno::Reference< drawing::XShape >& xShape } SdrObject* pSdrShape = pShape->GetSdrObject(); - if( pSdrShape == NULL ) + if( pSdrShape == nullptr ) pSdrShape = mxPage->_CreateSdrObject( xShape ); if( pSdrShape->IsInserted() ) @@ -240,13 +240,13 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS { ::SolarMutexGuard aGuard; - SdrObject* pSdrShape = NULL; + SdrObject* pSdrShape = nullptr; SvxShape* pShape = SvxShape::getImplementation( xShape ); if( pShape ) pSdrShape = pShape->GetSdrObject(); - if( !mpObj.is() || pSdrShape == NULL || pSdrShape->GetObjList()->GetOwnerObj() != mpObj.get() ) + if( !mpObj.is() || pSdrShape == nullptr || pSdrShape->GetObjList()->GetOwnerObj() != mpObj.get() ) throw uno::RuntimeException(); SdrObjList& rList = *pSdrShape->GetObjList(); @@ -328,7 +328,7 @@ uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) { ::SolarMutexGuard aGuard; - if( !mpObj.is() || mpObj->GetSubList() == NULL ) + if( !mpObj.is() || mpObj->GetSubList() == nullptr ) throw uno::RuntimeException(); if( Index<0 || mpObj->GetSubList()->GetObjCount() <= static_cast<size_t>(Index) ) @@ -336,7 +336,7 @@ uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) SdrObject* pDestObj = mpObj->GetSubList()->GetObj( Index ); - if(pDestObj == NULL) + if(pDestObj == nullptr) throw lang::IndexOutOfBoundsException(); Reference< drawing::XShape > xShape( pDestObj->getUnoShape(), uno::UNO_QUERY ); @@ -687,7 +687,7 @@ SvxShapeControlPropertyMapping[] = { RTL_CONSTASCII_STRINGPARAM("ControlTypeinMSO"), RTL_CONSTASCII_STRINGPARAM("ControlTypeinMSO") }, { RTL_CONSTASCII_STRINGPARAM("ObjIDinMSO"), RTL_CONSTASCII_STRINGPARAM("ObjIDinMSO") }, { RTL_CONSTASCII_STRINGPARAM("CharCaseMap"), RTL_CONSTASCII_STRINGPARAM("CharCaseMap") }, - { NULL,0, NULL, 0 } + { nullptr,0, nullptr, 0 } }; namespace @@ -1493,7 +1493,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte { // normal link OUString aFilterName; - const SfxFilter* pSfxFilter = NULL; + const SfxFilter* pSfxFilter = nullptr; SfxMedium aSfxMedium( aURL, referer_, StreamMode::READ | StreamMode::SHARE_DENYNONE ); SfxGetpApp()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter ); @@ -1590,7 +1590,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte { SvMemoryStream aDestStrm( 65535, 65535 ); - ConvertGDIMetaFileToWMF( rGraphic.GetGDIMetaFile(), aDestStrm, NULL, false ); + ConvertGDIMetaFileToWMF( rGraphic.GetGDIMetaFile(), aDestStrm, nullptr, false ); const uno::Sequence<sal_Int8> aSeq( static_cast< const sal_Int8* >(aDestStrm.GetData()), aDestStrm.GetEndOfData()); diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index a963a1a4ac9c..09a7c6579f3b 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -126,7 +126,7 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape SvxShape* pShape = SvxShape::getImplementation( xShape ); - if(!mpObj.is() || !mxPage.is() || pShape == NULL || NULL != pShape->GetSdrObject() ) + if(!mpObj.is() || !mxPage.is() || pShape == nullptr || nullptr != pShape->GetSdrObject() ) throw uno::RuntimeException(); SdrObject* pSdrShape = mxPage->_CreateSdrObject( xShape ); @@ -155,11 +155,11 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha SvxShape* pShape = SvxShape::getImplementation( xShape ); - if(!mpObj.is() || pShape == NULL) + if(!mpObj.is() || pShape == nullptr) throw uno::RuntimeException(); SdrObject* pSdrShape = pShape->GetSdrObject(); - if(pSdrShape == NULL || pSdrShape->GetObjList()->GetOwnerObj() != mpObj.get()) + if(pSdrShape == nullptr || pSdrShape->GetObjList()->GetOwnerObj() != mpObj.get()) { throw uno::RuntimeException(); } @@ -208,14 +208,14 @@ uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) { SolarMutexGuard aGuard; - if( !mpObj.is() || mpObj->GetSubList() == NULL ) + if( !mpObj.is() || mpObj->GetSubList() == nullptr ) throw uno::RuntimeException(); if( Index<0 || mpObj->GetSubList()->GetObjCount() <= static_cast<size_t>(Index) ) throw lang::IndexOutOfBoundsException(); SdrObject* pDestObj = mpObj->GetSubList()->GetObj( Index ); - if(pDestObj == NULL) + if(pDestObj == nullptr) throw lang::IndexOutOfBoundsException(); Reference< drawing::XShape > xShape( pDestObj->getUnoShape(), uno::UNO_QUERY ); diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 71e46ff5bab0..58c668a3a471 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -246,7 +246,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro // #i119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically GDIMetaFile aMtf(pObj->GetGraphic()->GetGDIMetaFile()); SvMemoryStream aDestStrm( 65535, 65535 ); - ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, false ); + ConvertGDIMetaFileToWMF( aMtf, aDestStrm, nullptr, false ); const uno::Sequence<sal_Int8> aSeq( static_cast< const sal_Int8* >(aDestStrm.GetData()), aDestStrm.GetEndOfData()); @@ -340,7 +340,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro // if there isn't already a preview graphic set, check if we need to generate // one if model says so - if( pGraphic == NULL && !pOle->IsEmptyPresObj() && mpModel->IsSaveOLEPreview() ) + if( pGraphic == nullptr && !pOle->IsEmptyPresObj() && mpModel->IsSaveOLEPreview() ) pGraphic = pOle->GetGraphic(); if( pGraphic ) @@ -365,7 +365,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro if( !aPersistName.isEmpty() ) { ::comphelper::IEmbeddedHelper *pPersist = mpObj->GetModel()->GetPersist(); - if( (NULL == pPersist) || !pPersist->getEmbeddedObjectContainer().HasEmbeddedObject( pOle->GetPersistName() ) ) + if( (nullptr == pPersist) || !pPersist->getEmbeddedObjectContainer().HasEmbeddedObject( pOle->GetPersistName() ) ) aPersistName.clear(); } } @@ -517,7 +517,7 @@ bool SvxOle2Shape::createLink( const OUString& aLinkURL ) void SvxOle2Shape::resetModifiedState() { - ::comphelper::IEmbeddedHelper* pPersist = mpModel ? mpModel->GetPersist() : 0; + ::comphelper::IEmbeddedHelper* pPersist = mpModel ? mpModel->GetPersist() : nullptr; if( pPersist && !pPersist->isEnableSetModified() ) { SdrOle2Obj* pOle = dynamic_cast< SdrOle2Obj* >( mpObj.get() ); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 8a62fcb5656d..0b682a624cbf 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -128,9 +128,9 @@ struct SvxShapeImpl SvxShapeImpl( SvxShape& _rAntiImpl, ::osl::Mutex& _rMutex ) :mrAntiImpl( _rAntiImpl ) - ,mpItemSet( NULL ) + ,mpItemSet( nullptr ) ,mnObjId( 0 ) - ,mpMaster( NULL ) + ,mpMaster( nullptr ) ,mbHasSdrObjectOwnership( false ) ,mbDisposing( false ) ,mpCreatedObj() @@ -178,7 +178,7 @@ SvxShape::SvxShape( SdrObject* pObject ) throw( uno::RuntimeException ) , mpPropSet(getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool())) , maPropMapEntries(getSvxMapProvider().GetMap(SVXMAP_SHAPE)) , mpObj(pObject) -, mpModel(NULL) +, mpModel(nullptr) , mnLockCount(0) { impl_construct(); @@ -192,7 +192,7 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, , mpPropSet(pPropertySet) , maPropMapEntries(pEntries) , mpObj(pObject) -, mpModel(NULL) +, mpModel(nullptr) , mnLockCount(0) { impl_construct(); @@ -205,8 +205,8 @@ SvxShape::SvxShape() throw( uno::RuntimeException ) , mbIsMultiPropertyCall(false) , mpPropSet(getSvxMapProvider().GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool())) , maPropMapEntries(getSvxMapProvider().GetMap(SVXMAP_SHAPE)) -, mpObj(NULL) -, mpModel(NULL) +, mpObj(nullptr) +, mpModel(nullptr) , mnLockCount(0) { impl_construct(); @@ -226,7 +226,7 @@ SvxShape::~SvxShape() throw() mpImpl->mpMaster->dispose(); if ( mpObj.is() ) - mpObj->setUnoShape(NULL); + mpObj->setUnoShape(nullptr); if( HasSdrObjectOwnership() && mpObj.is() ) { @@ -235,7 +235,7 @@ SvxShape::~SvxShape() throw() SdrObject::Free( pObject ); } - delete mpImpl, mpImpl = NULL; + delete mpImpl, mpImpl = nullptr; EndListeningAll(); // call explictily within SolarMutexGuard } @@ -310,7 +310,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& if( xUT.is() ) return reinterpret_cast<SvxShape*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( SvxShape::getUnoTunnelId()))); else - return NULL; + return nullptr; } @@ -409,7 +409,7 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ ) return; SdrObject* pCreatedObj = mpImpl->mpCreatedObj.get(); - OSL_ENSURE( ( pCreatedObj == NULL ) || ( pCreatedObj == pNewObj ), + OSL_ENSURE( ( pCreatedObj == nullptr ) || ( pCreatedObj == pNewObj ), "SvxShape::Create: the same shape used for two different objects?! Strange ..." ); // Correct condition (#i52126#) @@ -436,7 +436,7 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ ) // save user call SdrObjUserCall* pUser = mpObj->GetUserCall(); - mpObj->SetUserCall(NULL); + mpObj->SetUserCall(nullptr); setPosition( maPosition ); setSize( maSize ); @@ -666,7 +666,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const DBG_TESTSOLARMUTEX(); uno::Any aAny; - if( !mpObj.is() || mpModel == NULL || !mpObj->IsInserted() || NULL == mpObj->GetPage() ) + if( !mpObj.is() || mpModel == nullptr || !mpObj->IsInserted() || nullptr == mpObj->GetPage() ) return aAny; ScopedVclPtrInstance< VirtualDevice > pVDev; @@ -690,7 +690,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const if( bMetaFile ) { SvMemoryStream aDestStrm( 65535, 65535 ); - ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, false ); + ConvertGDIMetaFileToWMF( aMtf, aDestStrm, nullptr, false ); const uno::Sequence<sal_Int8> aSeq( static_cast< const sal_Int8* >(aDestStrm.GetData()), aDestStrm.GetEndOfData()); @@ -1029,7 +1029,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() uno::Reference< uno::XInterface > xSelf( mpObj->getWeakUnoShape() ); if( !xSelf.is() ) { - mpObj.reset( NULL ); + mpObj.reset( nullptr ); return; } @@ -1045,7 +1045,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() case HINT_MODELCLEARED: { bClearMe = true; - mpModel = NULL; + mpModel = nullptr; break; } default: @@ -1056,8 +1056,8 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() { if( !HasSdrObjectOwnership() ) { if( mpObj.is() ) - mpObj->setUnoShape( NULL ); - mpObj.reset( NULL ); + mpObj->setUnoShape( nullptr ); + mpObj.reset( nullptr ); } if ( !mpImpl->mbDisposing ) dispose(); @@ -1330,7 +1330,7 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception) } } - mpObj->setUnoShape(NULL); + mpObj->setUnoShape(nullptr); if ( bFreeSdrObject ) { @@ -1345,7 +1345,7 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception) if( mpModel ) { EndListening( *mpModel ); - mpModel = NULL; + mpModel = nullptr; } } @@ -1686,7 +1686,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const SfxItemSet* pSet; if( mbIsMultiPropertyCall && !bIsNotPersist ) { - if( mpImpl->mpItemSet == NULL ) + if( mpImpl->mpItemSet == nullptr ) { pSet = mpImpl->mpItemSet = mpObj->GetMergedItemSet().Clone(); } @@ -1769,7 +1769,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) uno::Any aAny; if( mpObj.is() && mpModel ) { - if(pMap == NULL ) + if(pMap == nullptr ) throw beans::UnknownPropertyException(); if( !getPropertyValueImpl( PropertyName, pMap, aAny ) ) @@ -1886,7 +1886,7 @@ void SvxShape::endSetPropertyValues() if( mpImpl->mpItemSet ) { delete mpImpl->mpItemSet; - mpImpl->mpItemSet = 0; + mpImpl->mpItemSet = nullptr; } } @@ -1958,7 +1958,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE { case SDRATTR_CIRCSTARTANGLE: { - const SfxPoolItem* pPoolItem=NULL; + const SfxPoolItem* pPoolItem=nullptr; if(aSet.GetItemState(SDRATTR_CIRCSTARTANGLE,false,&pPoolItem)==SfxItemState::SET) { sal_Int32 nAngle = static_cast<const SdrAngleItem*>(pPoolItem)->GetValue(); @@ -1969,7 +1969,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE case SDRATTR_CIRCENDANGLE: { - const SfxPoolItem* pPoolItem=NULL; + const SfxPoolItem* pPoolItem=nullptr; if (aSet.GetItemState(SDRATTR_CIRCENDANGLE,false,&pPoolItem)==SfxItemState::SET) { sal_Int32 nAngle = static_cast<const SdrAngleItem*>(pPoolItem)->GetValue(); @@ -2051,7 +2051,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); - if( !mpObj.is() || pMap == NULL ) + if( !mpObj.is() || pMap == nullptr ) throw beans::UnknownPropertyException(); beans::PropertyState eState; @@ -2087,7 +2087,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope case XATTR_LINEDASH: { const NameOrIndex* pItem = static_cast<const NameOrIndex*>(rSet.GetItem((sal_uInt16)pMap->nWID)); - if( ( pItem == NULL ) || pItem->GetName().isEmpty() ) + if( ( pItem == nullptr ) || pItem->GetName().isEmpty() ) eState = beans::PropertyState_DEFAULT_VALUE; } break; @@ -2102,7 +2102,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope case XATTR_FILLFLOATTRANSPARENCE: { const NameOrIndex* pItem = static_cast<const NameOrIndex*>(rSet.GetItem((sal_uInt16)pMap->nWID)); - if ( pItem == NULL ) + if ( pItem == nullptr ) eState = beans::PropertyState_DEFAULT_VALUE; } break; @@ -2372,7 +2372,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl if( rValue >>= aLayerName ) { const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, true); - if( pLayer != NULL ) + if( pLayer != nullptr ) { mpObj->SetLayer( pLayer->GetID() ); return true; @@ -2505,7 +2505,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl if( pPageObj ) { SdrModel* pModel = pPageObj->GetModel(); - SdrPage* pNewPage = 0L; + SdrPage* pNewPage = nullptr; const sal_uInt16 nDestinationPageNum((sal_uInt16)((nPageNum << 1L) - 1L)); if(pModel) @@ -2920,7 +2920,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically GDIMetaFile aMtf(pObj->GetGraphic()->GetGDIMetaFile()); SvMemoryStream aDestStrm( 65535, 65535 ); - ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, false ); + ConvertGDIMetaFileToWMF( aMtf, aDestStrm, nullptr, false ); const uno::Sequence<sal_Int8> aSeq( static_cast< const sal_Int8* >(aDestStrm.GetData()), aDestStrm.GetEndOfData()); @@ -3033,7 +3033,7 @@ void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) const SfxItemPropertySimpleEntry* pProperty = mpPropSet->getPropertyMapEntry(PropertyName); - if( !mpObj.is() || mpModel == NULL || pProperty == NULL ) + if( !mpObj.is() || mpModel == nullptr || pProperty == nullptr ) throw beans::UnknownPropertyException(); if( !setPropertyToDefaultImpl( pProperty ) ) @@ -3066,7 +3066,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName ) const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(aPropertyName); - if( !mpObj.is() || pMap == NULL || mpModel == NULL ) + if( !mpObj.is() || pMap == nullptr || mpModel == nullptr ) throw beans::UnknownPropertyException(); if(( pMap->nWID >= OWN_ATTR_VALUE_START && pMap->nWID <= OWN_ATTR_VALUE_END ) || @@ -3217,8 +3217,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { case OBJ_GRUP: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_GroupServices; @@ -3233,8 +3233,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() } case OBJ_CUSTOMSHAPE: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_CustomShapeServices; @@ -3260,8 +3260,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() } case OBJ_LINE: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_LineServices; @@ -3291,8 +3291,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_RECT: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_RectServices; @@ -3323,8 +3323,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_CARC: case OBJ_CCUT: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_CircServices; @@ -3356,8 +3356,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_PATHPLIN: case OBJ_PLIN: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_PathServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_PathServices,14, @@ -3387,8 +3387,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_PATHPOLY: case OBJ_POLY: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_PolyServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_PolyServices,15, @@ -3420,8 +3420,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_FREELINE: case OBJ_PATHLINE: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_FreeLineServices; @@ -3455,8 +3455,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_FREEFILL: case OBJ_PATHFILL: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_FreeFillServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_FreeFillServices,15, @@ -3489,8 +3489,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_TITLETEXT: case OBJ_TEXT: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_TextServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_TextServices,14, @@ -3519,8 +3519,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_GRAF: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_GrafServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_GrafServices, 12, @@ -3547,8 +3547,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_OLE2: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_Ole2Services; @@ -3576,8 +3576,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_CAPTION: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_CaptionServices; @@ -3608,8 +3608,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_PAGE: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_PageServices; @@ -3625,8 +3625,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_MEASURE: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_MeasureServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_MeasureServices,15, @@ -3658,8 +3658,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_FRAME: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_FrameServices; @@ -3675,8 +3675,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_UNO: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_UnoServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, @@ -3690,8 +3690,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() case OBJ_EDGE: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_EdgeServices; @@ -3721,8 +3721,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() } case OBJ_MEDIA: { - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_MediaServices; @@ -3742,8 +3742,8 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() const sal_uInt16 nIdent = mpObj->GetObjIdentifier(); OSL_ENSURE( nIdent == OBJ_UNO, "SvxShape::_getSupportedServiceNames: FmFormInventor, but no UNO object?" ); #endif - static uno::Sequence< OUString > *pSeq = 0; - if( 0 == pSeq ) + static uno::Sequence< OUString > *pSeq = nullptr; + if( nullptr == pSeq ) { static uno::Sequence< OUString > SvxShape_UnoServices; comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, @@ -3933,7 +3933,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject ) throw () : SvxShape( pObject, getSvxMapProvider().GetMap(SVXMAP_TEXT), getSvxMapProvider().GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) { if( pObject && pObject->GetModel() ) - SetEditSource( new SvxTextEditSource( pObject, 0 ) ); + SetEditSource( new SvxTextEditSource( pObject, nullptr ) ); } @@ -3941,21 +3941,21 @@ SvxShapeText::SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* p : SvxShape( pObject, pPropertyMap, pPropertySet ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) { if( pObject && pObject->GetModel() ) - SetEditSource( new SvxTextEditSource( pObject, 0 ) ); + SetEditSource( new SvxTextEditSource( pObject, nullptr ) ); } SvxShapeText::~SvxShapeText() throw () { // check if only this instance is registered at the ranges - DBG_ASSERT( (NULL == GetEditSource()) || (GetEditSource()->getRanges().size()==1), + DBG_ASSERT( (nullptr == GetEditSource()) || (GetEditSource()->getRanges().size()==1), "svx::SvxShapeText::~SvxShapeText(), text shape with living text ranges destroyed!"); } void SvxShapeText::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) { - if( pNewObj && (NULL == GetEditSource())) - SetEditSource( new SvxTextEditSource( pNewObj, 0 ) ); + if( pNewObj && (nullptr == GetEditSource())) + SetEditSource( new SvxTextEditSource( pNewObj, nullptr ) ); SvxShape::Create( pNewObj, pNewPage ); } @@ -4059,7 +4059,7 @@ void SvxShapeText::unlock() uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; - SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL; + SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; if( pForwarder ) ::GetSelection( maSelection, pForwarder ); return SvxUnoTextBase::getStart(); @@ -4069,7 +4069,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno:: uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; - SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL; + SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; if( pForwarder ) ::GetSelection( maSelection, pForwarder ); return SvxUnoTextBase::getEnd(); @@ -4078,7 +4078,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::Ru OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; - SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL; + SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; if( pForwarder ) ::GetSelection( maSelection, pForwarder ); return SvxUnoTextBase::getString(); @@ -4088,7 +4088,7 @@ OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException, std::ex void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; - SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : NULL; + SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; if( pForwarder ) ::GetSelection( maSelection, pForwarder ); SvxUnoTextBase::setString( aString ); @@ -4190,7 +4190,7 @@ uno::Reference< drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) throw() { SvxShape* pShape = SvxShape::getImplementation( xShape ); - return pShape ? pShape->GetSdrObject() : 0; + return pShape ? pShape->GetSdrObject() : nullptr; } @@ -4198,7 +4198,7 @@ SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) th SdrObject* SdrObject::getSdrObjectFromXShape( const css::uno::Reference< css::uno::XInterface >& xInt ) { SvxShape* pSvxShape = SvxShape::getImplementation( xInt ); - return pSvxShape ? pSvxShape->GetSdrObject() : 0; + return pSvxShape ? pSvxShape->GetSdrObject() : nullptr; } uno::Any SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 30c096d0bdab..c776fa98f956 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -163,12 +163,12 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText : maRefCount ( 0 ), mpObject ( pObject ), mpText ( pText ), - mpView ( NULL ), - mpWindow ( NULL ), - mpModel ( pObject ? pObject->GetModel() : NULL ), - mpOutliner ( NULL ), - mpTextForwarder ( NULL ), - mpViewForwarder ( NULL ), + mpView ( nullptr ), + mpWindow ( nullptr ), + mpModel ( pObject ? pObject->GetModel() : nullptr ), + mpOutliner ( nullptr ), + mpTextForwarder ( nullptr ), + mpViewForwarder ( nullptr ), mbDataValid ( false ), mbDestroyed ( false ), mbIsLocked ( false ), @@ -203,9 +203,9 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText mpView ( &rView ), mpWindow ( &rWindow ), mpModel ( rObject.GetModel() ), - mpOutliner ( NULL ), - mpTextForwarder ( NULL ), - mpViewForwarder ( NULL ), + mpOutliner ( nullptr ), + mpTextForwarder ( nullptr ), + mpViewForwarder ( nullptr ), mbDataValid ( false ), mbDestroyed ( false ), mbIsLocked ( false ), @@ -292,16 +292,16 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel ) mpModel->disposeOutliner( mpOutliner ); else delete mpOutliner; - mpOutliner = 0; + mpOutliner = nullptr; } if( mpView ) { EndListening( *mpView ); - mpView = 0; + mpView = nullptr; } - mpWindow = 0; + mpWindow = nullptr; m_xLinguServiceManager.clear(); mpModel = pNewModel; @@ -309,13 +309,13 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel ) if( mpTextForwarder ) { delete mpTextForwarder; - mpTextForwarder = 0; + mpTextForwarder = nullptr; } if( mpViewForwarder ) { delete mpViewForwarder; - mpViewForwarder = 0; + mpViewForwarder = nullptr; } if( mpModel ) @@ -340,11 +340,11 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { if (&rBC == mpView) { - mpView = 0; + mpView = nullptr; if (mpViewForwarder) { delete mpViewForwarder; - mpViewForwarder = 0; + mpViewForwarder = nullptr; } } } @@ -411,7 +411,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) if( !mbForwarderIsEditMode ) { delete mpTextForwarder; - mpTextForwarder = NULL; + mpTextForwarder = nullptr; } // register as listener - need to broadcast state change messages @@ -441,7 +441,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) // valid (no need for UpdateData(), it's been // synched on SdrEndTextEdit) delete mpViewForwarder; - mpViewForwarder = NULL; + mpViewForwarder = nullptr; // #100424# Invalidate text forwarder, we might // not be called again before entering edit mode a @@ -451,7 +451,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { mbForwarderIsEditMode = false; delete mpTextForwarder; - mpTextForwarder = NULL; + mpTextForwarder = nullptr; } } break; @@ -468,7 +468,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) /* this is a callback from the attached SdrObject when it is actually deleted */ void SvxTextEditSourceImpl::ObjectInDestruction(const SdrObject&) { - mpObject = 0; + mpObject = nullptr; dispose(); Broadcast( SfxSimpleHint( SFX_HINT_DYING ) ); } @@ -479,13 +479,13 @@ void SvxTextEditSourceImpl::dispose() if( mpTextForwarder ) { delete mpTextForwarder; - mpTextForwarder = 0; + mpTextForwarder = nullptr; } if( mpViewForwarder ) { delete mpViewForwarder; - mpViewForwarder = 0; + mpViewForwarder = nullptr; } if( mpOutliner ) @@ -498,27 +498,27 @@ void SvxTextEditSourceImpl::dispose() { delete mpOutliner; } - mpOutliner = 0; + mpOutliner = nullptr; } if( mpModel ) { EndListening( *mpModel ); - mpModel = 0; + mpModel = nullptr; } if( mpView ) { EndListening( *mpView ); - mpView = 0; + mpView = nullptr; } if( mpObject ) { mpObject->RemoveObjectUser( *this ); - mpObject = 0; + mpObject = nullptr; } - mpWindow = 0; + mpWindow = nullptr; } @@ -578,7 +578,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() if (!mpTextForwarder) { - if( mpOutliner == NULL ) + if( mpOutliner == nullptr ) { SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>( mpObject ); sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT; @@ -625,7 +625,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() { mpTextForwarder->flushCache(); - OutlinerParaObject* pOutlinerParaObject = NULL; + OutlinerParaObject* pOutlinerParaObject = nullptr; SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>( mpObject ); if( pTextObj && pTextObj->getActiveText() == mpText ) pOutlinerParaObject = pTextObj->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active @@ -725,14 +725,14 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder() SvxTextForwarder* SvxTextEditSourceImpl::GetTextForwarder() { - if( mbDestroyed || mpObject == NULL ) - return NULL; + if( mbDestroyed || mpObject == nullptr ) + return nullptr; - if( mpModel == NULL ) + if( mpModel == nullptr ) mpModel = mpObject->GetModel(); - if( mpModel == NULL ) - return NULL; + if( mpModel == nullptr ) + return nullptr; // distinguish the cases // a) connected to view, maybe edit mode is active, can work directly on the EditOutliner @@ -743,7 +743,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetTextForwarder() { // forwarder mismatch - create new delete mpTextForwarder; - mpTextForwarder = NULL; + mpTextForwarder = nullptr; } if( IsEditMode() ) @@ -774,19 +774,19 @@ SvxDrawOutlinerViewForwarder* SvxTextEditSourceImpl::CreateViewForwarder() } } - return NULL; + return nullptr; } SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( bool bCreate ) { - if( mbDestroyed || mpObject == NULL ) - return NULL; + if( mbDestroyed || mpObject == nullptr ) + return nullptr; - if( mpModel == NULL ) + if( mpModel == nullptr ) mpModel = mpObject->GetModel(); - if( mpModel == NULL ) - return NULL; + if( mpModel == nullptr ) + return nullptr; // shall we delete? if( mpViewForwarder ) @@ -796,7 +796,7 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( bool bCreate // destroy all forwarders (no need for UpdateData(), // it's been synched on SdrEndTextEdit) delete mpViewForwarder; - mpViewForwarder = NULL; + mpViewForwarder = nullptr; } } // which to create? Directly in edit mode, create new, or none? @@ -813,7 +813,7 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( bool bCreate UpdateData(); delete mpTextForwarder; - mpTextForwarder = NULL; + mpTextForwarder = nullptr; // enter edit mode mpView->SdrEndTextEdit(); @@ -878,7 +878,7 @@ void SvxTextEditSourceImpl::UpdateData() } else { - pTextObj->NbcSetOutlinerParaObjectForText( NULL,mpText ); + pTextObj->NbcSetOutlinerParaObjectForText( nullptr,mpText ); } } diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 76819413ca94..2cc2c892668b 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -73,7 +73,7 @@ GalleryItem::~GalleryItem() bool GalleryItem::isValid() const { - return( mpTheme != NULL ); + return( mpTheme != nullptr ); } @@ -269,7 +269,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt if( *pValues >>= aNewTitle ) { - ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL ); + ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr ); if( pGalTheme ) { @@ -316,7 +316,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt case( UNOGALLERY_URL ): { - ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL ); + ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr ); if( pGalTheme ) *pValue <<= OUString( implGetObject()->aURL.GetMainURL( INetURLObject::NO_DECODE ) ); @@ -325,7 +325,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt case( UNOGALLERY_TITLE ): { - ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL ); + ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr ); if( pGalTheme ) { @@ -342,7 +342,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt case( UNOGALLERY_THUMBNAIL ): { - ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL ); + ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr ); if( pGalTheme ) { @@ -366,7 +366,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt case( UNOGALLERY_GRAPHIC ): { - ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL ); + ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr ); Graphic aGraphic; if( pGalTheme && pGalTheme->GetGraphic( pGalTheme->ImplGetGalleryObjectPos( implGetObject() ), aGraphic ) ) @@ -378,7 +378,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt { if( gallery::GalleryItemType::DRAWING == getType() ) { - ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL ); + ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr ); FmFormModel* pModel = new FmFormModel; pModel->GetItemPool().FreezeIdRanges(); @@ -411,8 +411,8 @@ void GalleryItem::implSetInvalid() { if( mpTheme ) { - mpTheme = NULL; - mpGalleryObject = NULL; + mpTheme = nullptr; + mpGalleryObject = nullptr; } } diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index e4e937ab1ed3..1fd2dfabcb04 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -45,7 +45,7 @@ namespace unogallery { GalleryTheme::GalleryTheme( const OUString& rThemeName ) { mpGallery = ::Gallery::GetGalleryInstance(); - mpTheme = ( mpGallery ? mpGallery->AcquireTheme( rThemeName, *this ) : NULL ); + mpTheme = ( mpGallery ? mpGallery->AcquireTheme( rThemeName, *this ) : nullptr ); if( mpGallery ) StartListening( *mpGallery ); @@ -59,7 +59,7 @@ GalleryTheme::~GalleryTheme() DBG_ASSERT( !mpTheme || mpGallery, "Theme is living without Gallery" ); - implReleaseItems( NULL ); + implReleaseItems( nullptr ); if( mpGallery ) { @@ -144,7 +144,7 @@ sal_Bool SAL_CALL GalleryTheme::hasElements() { const SolarMutexGuard aGuard; - return( ( mpTheme != NULL ) && ( mpTheme->GetObjectCount() > 0 ) ); + return( ( mpTheme != nullptr ) && ( mpTheme->GetObjectCount() > 0 ) ); } @@ -302,9 +302,9 @@ void SAL_CALL GalleryTheme::update( ) uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSupplier( Drawing, uno::UNO_QUERY_THROW ); uno::Reference< drawing::XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), uno::UNO_QUERY_THROW ); uno::Reference< drawing::XDrawPage > xPage( xDrawPages->getByIndex( 0 ), uno::UNO_QUERY_THROW ); - SvxDrawPage* pUnoPage = xPage.is() ? SvxDrawPage::getImplementation( xPage ) : NULL; - SdrModel* pOrigModel = pUnoPage ? pUnoPage->GetSdrPage()->GetModel() : NULL; - SdrPage* pOrigPage = pUnoPage ? pUnoPage->GetSdrPage() : NULL; + SvxDrawPage* pUnoPage = xPage.is() ? SvxDrawPage::getImplementation( xPage ) : nullptr; + SdrModel* pOrigModel = pUnoPage ? pUnoPage->GetSdrPage()->GetModel() : nullptr; + SdrPage* pOrigPage = pUnoPage ? pUnoPage->GetSdrPage() : nullptr; if (pOrigPage && pOrigModel) { @@ -357,12 +357,12 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) { DBG_ASSERT( !mpTheme || mpGallery, "Theme is living without Gallery" ); - implReleaseItems( NULL ); + implReleaseItems( nullptr ); if( mpGallery && mpTheme ) { mpGallery->ReleaseTheme( mpTheme, *this ); - mpTheme = NULL; + mpTheme = nullptr; } } break; diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 09c17b92bdba..7dca671dd02d 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -123,7 +123,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements() { const SolarMutexGuard aGuard; - return( ( mpGallery != NULL ) && ( mpGallery->GetThemeCount() > 0 ) ); + return( ( mpGallery != nullptr ) && ( mpGallery->GetThemeCount() > 0 ) ); } diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 20fc5b87c943..ec40121adcaf 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -87,7 +87,7 @@ public: OutputStorageWrapper_Impl::OutputStorageWrapper_Impl() : bStreamClosed( false ) - , pStream(0) + , pStream(nullptr) { aTempFile.EnableKillingFile(); pStream = aTempFile.GetStream( STREAM_READWRITE ); @@ -102,7 +102,7 @@ SvStream *OutputStorageWrapper_Impl::GetStream() { if( bStreamClosed ) return pStream; - return NULL; + return nullptr; } void SAL_CALL OutputStorageWrapper_Impl::writeBytes( @@ -140,9 +140,9 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ), maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ), maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ), - mpDocPersist( 0 ), + mpDocPersist( nullptr ), meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ), - mpStreamMap( 0 ) + mpStreamMap( nullptr ) { } @@ -150,11 +150,11 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHel WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ), maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ), maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ), - mpDocPersist( 0 ), + mpDocPersist( nullptr ), meCreateMode( EMBEDDEDOBJECTHELPER_MODE_READ ), - mpStreamMap( 0 ) + mpStreamMap( nullptr ) { - Init( 0, rDocPersist, eCreateMode ); + Init( nullptr, rDocPersist, eCreateMode ); } SvXMLEmbeddedObjectHelper::~SvXMLEmbeddedObjectHelper() @@ -168,7 +168,7 @@ SvXMLEmbeddedObjectHelper::~SvXMLEmbeddedObjectHelper() if( aIter->second ) { aIter->second->release(); - aIter->second = 0; + aIter->second = nullptr; } } delete mpStreamMap; @@ -463,7 +463,7 @@ OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode ) { - OutputStorageWrapper_Impl *pOut = 0; + OutputStorageWrapper_Impl *pOut = nullptr; SvXMLEmbeddedObjectHelper_Impl::iterator aIter; if( mpStreamMap ) @@ -473,7 +473,7 @@ OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( pOut = aIter->second; } - SvGlobalName aClassId, *pClassId = 0; + SvGlobalName aClassId, *pClassId = nullptr; sal_Int32 nPos = aObjectStorageName.lastIndexOf( '!' ); if( -1 != nPos && aClassId.MakeId( aObjectStorageName.copy( nPos+1 ) ) ) { @@ -481,7 +481,7 @@ OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( pClassId = &aClassId; } - ImplReadObject( aContainerStorageName, aObjectStorageName, pClassId, pOut ? pOut->GetStream() : 0 ); + ImplReadObject( aContainerStorageName, aObjectStorageName, pClassId, pOut ? pOut->GetStream() : nullptr ); sRetURL = XML_EMBEDDEDOBJECT_URL_BASE; sRetURL += aObjectStorageName; @@ -583,7 +583,7 @@ SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create( SvXMLEmbeddedObjectHelper* pThis = new SvXMLEmbeddedObjectHelper; pThis->acquire(); - pThis->Init( 0, rDocPersist, eCreateMode ); + pThis->Init( nullptr, rDocPersist, eCreateMode ); return pThis; } diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index c642e0a376fa..f1c7b8311ae8 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -53,10 +53,10 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt bool bDocRet = xOut.is(); Reference< document::XGraphicObjectResolver > xGraphicResolver; - SvXMLGraphicHelper *pGraphicHelper = 0; + SvXMLGraphicHelper *pGraphicHelper = nullptr; Reference< document::XEmbeddedObjectResolver > xObjectResolver; - SvXMLEmbeddedObjectHelper *pObjectHelper = 0; + SvXMLEmbeddedObjectHelper *pObjectHelper = nullptr; Reference< lang::XComponent > xSourceDoc( xComponent ); try @@ -126,11 +126,11 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt if( pGraphicHelper ) SvXMLGraphicHelper::Destroy( pGraphicHelper ); - xGraphicResolver = 0; + xGraphicResolver = nullptr; if( pObjectHelper ) SvXMLEmbeddedObjectHelper::Destroy( pObjectHelper ); - xObjectResolver = 0; + xObjectResolver = nullptr; return bDocRet; } @@ -153,10 +153,10 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr sal_uInt32 nRet = 0; Reference< document::XGraphicObjectResolver > xGraphicResolver; - SvXMLGraphicHelper *pGraphicHelper = 0; + SvXMLGraphicHelper *pGraphicHelper = nullptr; Reference< document::XEmbeddedObjectResolver > xObjectResolver; - SvXMLEmbeddedObjectHelper *pObjectHelper = 0; + SvXMLEmbeddedObjectHelper *pObjectHelper = nullptr; Reference< lang::XComponent > xTargetDocument( xComponent ); if( !xTargetDocument.is() ) @@ -236,11 +236,11 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr if( pGraphicHelper ) SvXMLGraphicHelper::Destroy( pGraphicHelper ); - xGraphicResolver = 0; + xGraphicResolver = nullptr; if( pObjectHelper ) SvXMLEmbeddedObjectHelper::Destroy( pObjectHelper ); - xObjectResolver = 0; + xObjectResolver = nullptr; if ( xTargetModel.is() ) xTargetModel->unlockControllers(); diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 3964f445c615..da12446b6bb3 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -62,7 +62,7 @@ namespace { const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf ) { - const MetaCommentAction* pComment = NULL; + const MetaCommentAction* pComment = nullptr; if ( rMtf.GetActionSize() >= 2 && rMtf.GetAction(0)->GetType() == MetaActionType::EPS @@ -336,8 +336,8 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() maGrfObj = aGraphic; if( maGrfObj.GetType() != GRAPHIC_NONE ) { - delete mpOStm, mpOStm = NULL; - delete mpTmp, mpTmp = NULL; + delete mpOStm, mpOStm = nullptr; + delete mpTmp, mpTmp = nullptr; } } @@ -350,7 +350,7 @@ SvXMLGraphicHelper::SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ) : ::cppu::WeakComponentImplHelper2< css::document::XGraphicObjectResolver, css::document::XBinaryStreamResolver >( maMutex ) { - Init( NULL, eCreateMode, false ); + Init( nullptr, eCreateMode, false ); } SvXMLGraphicHelper::SvXMLGraphicHelper() @@ -764,7 +764,7 @@ SvXMLGraphicHelper* SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode eCreateMo SvXMLGraphicHelper* pThis = new SvXMLGraphicHelper; pThis->acquire(); - pThis->Init( NULL, eCreateMode, false ); + pThis->Init( nullptr, eCreateMode, false ); return pThis; } diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index bc56e5095df9..b0bf41d663aa 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -149,7 +149,7 @@ SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( const uno::Reference<xml::sax::XDocumentHandler> & rHandler, const uno::Reference<container::XNameContainer >& xTable, uno::Reference<document::XGraphicObjectResolver >& xGrfResolver ) -: SvXMLExport(rContext, "", rFileName, rHandler, NULL, FUNIT_100TH_MM), +: SvXMLExport(rContext, "", rFileName, rHandler, nullptr, FUNIT_100TH_MM), mxTable( xTable ) { @@ -208,8 +208,8 @@ bool SvxXMLXTableExportComponent::save( throw (css::uno::RuntimeException, std::exception) { bool bRet = false; - SfxMedium* pMedium = NULL; - SvXMLGraphicHelper* pGraphicHelper = NULL; + SfxMedium* pMedium = nullptr; + SvXMLGraphicHelper* pGraphicHelper = nullptr; sal_Int32 eCreate = embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE; INetURLObject aURLObj( rURL ); diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 02113f61b2d7..db53d1e07b9b 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -371,7 +371,7 @@ bool SvxXMLXTableImport::load( const OUString &rPath, const OUString &rReferer, bool *bOptLoadedFromStorage ) throw() { bool bRet = true; - SvXMLGraphicHelper* pGraphicHelper = 0; + SvXMLGraphicHelper* pGraphicHelper = nullptr; INetURLObject aURLObj( rPath ); bool bUseStorage = aURLObj.GetProtocol() == INetProtocol::NotValid; // a relative path diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index e9f042ccb02b..e445b0954c26 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -38,7 +38,7 @@ #define FORMAT_JPG "jpg" #define FORMAT_PNG "png" -GraphicFilter* XOutBitmap::pGrfFilter = NULL; +GraphicFilter* XOutBitmap::pGrfFilter = nullptr; Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, bool bHMirr, bool bVMirr ) { @@ -383,7 +383,7 @@ sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObje nRet = rFilter.ExportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pOStm, nFormat, pFilterData ); - pGrfFilter = NULL; + pGrfFilter = nullptr; aMedium.Commit(); if( aMedium.GetError() && ( GRFILTER_OK == nRet ) ) diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index cea38481999f..464a58fdf6e4 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -35,9 +35,9 @@ ImpXPolygon::ImpXPolygon(sal_uInt16 nInitSize, sal_uInt16 _nResize) - : pPointAry(NULL) - , pFlagAry(NULL) - , pOldPointAry(NULL) + : pPointAry(nullptr) + , pFlagAry(nullptr) + , pOldPointAry(nullptr) , bDeleteOldPoints(false) , nSize(0) , nResize(_nResize) @@ -48,9 +48,9 @@ ImpXPolygon::ImpXPolygon(sal_uInt16 nInitSize, sal_uInt16 _nResize) } ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly ) - : pPointAry(NULL) - , pFlagAry(NULL) - , pOldPointAry(NULL) + : pPointAry(nullptr) + , pFlagAry(nullptr) + , pOldPointAry(nullptr) , bDeleteOldPoints(false) , nSize(0) , nResize(rImpXPoly.nResize) @@ -861,7 +861,7 @@ basegfx::B2DPolygon XPolygon::getB2DPolygon() const // #i74631# use tools Polygon class for conversion to not have the code doubled // here. This needs one more conversion but avoids different convertors in // the long run - DBG_ASSERT(pImpXPolygon != 0, "XPolygon::getB2DPolygon(): XPolygon has no implementation incarnated (!)"); + DBG_ASSERT(pImpXPolygon != nullptr, "XPolygon::getB2DPolygon(): XPolygon has no implementation incarnated (!)"); const tools::Polygon aSource(GetPointCount(), pImpXPolygon->pPointAry, pImpXPolygon->pFlagAry); return aSource.getB2DPolygon(); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index eaa7d8cb4851..5d08e1e54ca3 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1002,7 +1002,7 @@ XLineDashItem* XLineDashItem::checkForUniqueItem( SdrModel* pModel ) const { const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, XATTR_LINEDASH, &pModel->GetItemPool(), - pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL, + pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XLineDashItem::CompareValueFunc, RID_SVXSTR_DASH11, pModel->GetPropertyList( XDASH_LIST ) ); @@ -1011,7 +1011,7 @@ XLineDashItem* XLineDashItem::checkForUniqueItem( SdrModel* pModel ) const return new XLineDashItem( aUniqueName, aDash ); } - return NULL; + return nullptr; } TYPEINIT1_AUTOFACTORY(XLineWidthItem, SfxMetricItem); @@ -1350,7 +1350,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const { if( pModel ) { - XLineStartItem* pTempItem = NULL; + XLineStartItem* pTempItem = nullptr; const XLineStartItem* pLineStartItem = this; OUString aUniqueName( GetName() ); @@ -1359,7 +1359,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const { // if the polygon is empty, check if the name is empty if( aUniqueName.isEmpty() ) - return NULL; + return nullptr; // force empty name for empty polygons return new XLineStartItem( "", maPolyPolygon ); @@ -1432,7 +1432,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const } } - const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL; + const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr; if( !aUniqueName.isEmpty() && pPool2) { nCount = pPool2->GetItemCount2( XATTR_LINESTART ); @@ -1561,7 +1561,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const } } - return NULL; + return nullptr; } TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex); @@ -1633,7 +1633,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const { if( pModel ) { - XLineEndItem* pTempItem = NULL; + XLineEndItem* pTempItem = nullptr; const XLineEndItem* pLineEndItem = this; OUString aUniqueName( GetName() ); @@ -1642,7 +1642,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const { // if the polygon is empty, check if the name is empty if( aUniqueName.isEmpty() ) - return NULL; + return nullptr; // force empty name for empty polygons return new XLineEndItem( "", maPolyPolygon ); @@ -1715,7 +1715,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const } } - const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL; + const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr; if( !aUniqueName.isEmpty() && pPool2) { nCount = pPool2->GetItemCount2( XATTR_LINESTART ); @@ -1844,7 +1844,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const } } - return NULL; + return nullptr; } bool XLineEndItem::GetPresentation @@ -2736,7 +2736,7 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con { const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, Which(), &pModel->GetItemPool(), - pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL, + pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XFillGradientItem::CompareValueFunc, RID_SVXSTR_GRADIENT, pModel->GetPropertyList( XGRADIENT_LIST ) ); @@ -2745,7 +2745,7 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con return new XFillGradientItem( aUniqueName, aGradient, Which() ); } - return NULL; + return nullptr; } TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem ); @@ -2830,7 +2830,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, XATTR_FILLFLOATTRANSPARENCE, &pModel->GetItemPool(), - pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL, + pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XFillFloatTransparenceItem::CompareValueFunc, RID_SVXSTR_TRASNGR0, XPropertyListRef() ); @@ -2851,7 +2851,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM } } - return NULL; + return nullptr; } XHatch::XHatch(const Color& rCol, css::drawing::HatchStyle eTheStyle, long nTheDistance, @@ -3142,7 +3142,7 @@ XFillHatchItem* XFillHatchItem::checkForUniqueItem( SdrModel* pModel ) const { const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, XATTR_FILLHATCH, &pModel->GetItemPool(), - pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL, + pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XFillHatchItem::CompareValueFunc, RID_SVXSTR_HATCH10, pModel->GetPropertyList( XHATCH_LIST ) ); @@ -3151,7 +3151,7 @@ XFillHatchItem* XFillHatchItem::checkForUniqueItem( SdrModel* pModel ) const return new XFillHatchItem( aUniqueName, aHatch ); } - return NULL; + return nullptr; } // --- form text attributes --- diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 1393104867c1..ac6c003f18b7 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -47,13 +47,13 @@ using namespace ::com::sun::star; XOBitmap::XOBitmap( const Bitmap& rBmp ) : eType ( XBITMAP_IMPORT ), aGraphicObject ( rBmp ), - pPixelArray ( NULL ), + pPixelArray ( nullptr ), bGraphicDirty ( false ) { } XOBitmap::XOBitmap( const XOBitmap& rXBmp ) : - pPixelArray ( NULL ) + pPixelArray ( nullptr ) { eType = rXBmp.eType; aGraphicObject = rXBmp.aGraphicObject; @@ -542,7 +542,7 @@ XFillBitmapItem* XFillBitmapItem::checkForUniqueItem( SdrModel* pModel ) const { const OUString aUniqueName = NameOrIndex::CheckNamedItem( this, XATTR_FILLBITMAP, &pModel->GetItemPool(), - pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL, + pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : nullptr, XFillBitmapItem::CompareValueFunc, RID_SVXSTR_BMP21, pModel->GetPropertyList( XBITMAP_LIST ) ); @@ -553,7 +553,7 @@ XFillBitmapItem* XFillBitmapItem::checkForUniqueItem( SdrModel* pModel ) const } } - return NULL; + return nullptr; } void XFillBitmapItem::dumpAsXml(xmlTextWriterPtr pWriter) const diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index 7e618275d83f..2993c5bc4395 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -32,8 +32,8 @@ /// default CTOR, for Assign() XFillExchangeData::XFillExchangeData() : - pXFillAttrSetItem( NULL ), - pPool( NULL ) + pXFillAttrSetItem( nullptr ), + pPool( nullptr ) { } @@ -132,8 +132,8 @@ XFillExchangeData& XFillExchangeData::operator=( const XFillExchangeData& rData pXFillAttrSetItem = static_cast<XFillAttrSetItem*>( rData.pXFillAttrSetItem->Clone( pPool = rData.pXFillAttrSetItem->GetItemSet().GetPool() ) ); else { - pPool = NULL; - pXFillAttrSetItem = NULL; + pPool = nullptr; + pXFillAttrSetItem = nullptr; } return( *this ); diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 1cbaff05599e..dc1085e8b4dc 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -29,7 +29,7 @@ XOutdevItemPool::XOutdevItemPool( sal_uInt16 nAttrStart, sal_uInt16 nAttrEnd, bool bLoadRefCounts) -: SfxItemPool("XOutdevItemPool", nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts) +: SfxItemPool("XOutdevItemPool", nAttrStart, nAttrEnd, nullptr, nullptr, bLoadRefCounts) { // prepare some defaults const OUString aNullStr; @@ -167,8 +167,8 @@ XOutdevItemPool::XOutdevItemPool( // copy ctor, clones all static defaults XOutdevItemPool::XOutdevItemPool(const XOutdevItemPool& rPool) : SfxItemPool(rPool, true), - mppLocalPoolDefaults(0L), - mpLocalItemInfos(0L) + mppLocalPoolDefaults(nullptr), + mpLocalItemInfos(nullptr) { } diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 32ffa31aa323..8bb9e5a7da93 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -193,7 +193,7 @@ Bitmap XDashList::GetBitmapForUISolidLine() const { if(maBitmapSolidLine.IsEmpty()) { - const_cast< XDashList* >(this)->maBitmapSolidLine = XDashList::ImpCreateBitmapForXDash(0); + const_cast< XDashList* >(this)->maBitmapSolidLine = XDashList::ImpCreateBitmapForXDash(nullptr); } return maBitmapSolidLine; diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index ca489fb5f1cf..f7776f15eb25 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -149,7 +149,7 @@ XPropertyEntry* XPropertyList::Get( long nIndex ) const if( !const_cast<XPropertyList*>(this)->Load() ) const_cast<XPropertyList*>(this)->Create(); } - return ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : NULL; + return ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : nullptr; } long XPropertyList::GetIndex(const OUString& rName) const @@ -171,7 +171,7 @@ long XPropertyList::GetIndex(const OUString& rName) const Bitmap XPropertyList::GetUiBitmap( long nIndex ) const { Bitmap aRetval; - XPropertyEntry* pEntry = ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : NULL; + XPropertyEntry* pEntry = ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : nullptr; if(pEntry) { aRetval = pEntry->GetUiBitmap(); @@ -196,7 +196,7 @@ void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex ) XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex ) { - XPropertyEntry* pOldEntry = (size_t)nIndex < maList.size() ? maList[ nIndex ] : NULL; + XPropertyEntry* pOldEntry = (size_t)nIndex < maList.size() ? maList[ nIndex ] : nullptr; if ( pOldEntry ) { maList[ nIndex ] = pEntry; } @@ -205,7 +205,7 @@ XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex ) XPropertyEntry* XPropertyList::Remove( long nIndex ) { - XPropertyEntry* pEntry = NULL; + XPropertyEntry* pEntry = nullptr; if ( (size_t)nIndex < maList.size() ) { pEntry = maList[ nIndex ]; maList.erase( maList.begin() + nIndex ); @@ -257,7 +257,7 @@ bool XPropertyList::Load() bool bRet = SvxXMLXTableImport::load(aURL.GetMainURL(INetURLObject::NO_DECODE), maReferer, uno::Reference < embed::XStorage >(), - createInstance(), NULL ); + createInstance(), nullptr ); if (bRet) return bRet; } @@ -300,7 +300,7 @@ bool XPropertyList::Save() return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), createInstance(), - uno::Reference< embed::XStorage >(), NULL ); + uno::Reference< embed::XStorage >(), nullptr ); } bool XPropertyList::SaveTo( const uno::Reference< embed::XStorage > &xStorage, |