diff options
Diffstat (limited to 'include/svx/unoshape.hxx')
| -rw-r--r-- | include/svx/unoshape.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
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; |