diff options
Diffstat (limited to 'include/oox/export')
-rw-r--r-- | include/oox/export/chartexport.hxx | 2 | ||||
-rw-r--r-- | include/oox/export/drawingml.hxx | 6 | ||||
-rw-r--r-- | include/oox/export/shapes.hxx | 4 | ||||
-rw-r--r-- | include/oox/export/vmlexport.hxx | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index 7a4f2f73d8b1..9f2b8f586e3e 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -204,7 +204,7 @@ private: public: - ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, css::uno::Reference< css::frame::XModel >& xModel, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX ); + ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, css::uno::Reference< css::frame::XModel >& xModel, ::oox::core::XmlFilterBase* pFB = nullptr, DocumentType eDocumentType = DOCUMENT_PPTX ); virtual ~ChartExport() {} sal_Int32 GetChartID( ); diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index a58f4f7c46c4..988d34eed315 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -125,7 +125,7 @@ protected: static bool EqualGradients( css::awt::Gradient aGradient1, css::awt::Gradient aGradient2 ); public: - DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = 0 ) + DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = nullptr, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = nullptr ) : meDocumentType( eDocumentType ), mpTextExport(pTextExport), mpFS( pFS ), mpFB( pFB ), mbIsBackgroundDark( false ) {} void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; } ::sax_fastparser::FSHelperPtr GetFS() { return mpFS; } @@ -168,7 +168,7 @@ public: void WriteLinespacing( css::style::LineSpacing& rLineSpacing ); OUString WriteBlip( css::uno::Reference< css::beans::XPropertySet > rXPropSet, - const OUString& rURL, bool bRelPathToMedia = false , const Graphic *pGraphic=NULL ); + const OUString& rURL, bool bRelPathToMedia = false , const Graphic *pGraphic=nullptr ); void WriteBlipMode( css::uno::Reference< css::beans::XPropertySet > rXPropSet, const OUString& rURL ); void WriteShapeTransformation( css::uno::Reference< css::drawing::XShape > rXShape, @@ -213,7 +213,7 @@ public: const css::uno::Reference< css::io::XOutputStream >& xParentRelation, const char* sContentType, const char* sRelationshipType, - OUString* pRelationshipId = NULL ); + OUString* pRelationshipId = nullptr ); }; diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index 3a9ccbec4ff0..67e52cbcc99b 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -73,7 +73,7 @@ public: protected: sal_Int32 mnShapeIdMax, mnPictureIdMax; - void WriteGraphicObjectShapePart( css::uno::Reference< css::drawing::XShape > xShape, const Graphic *pGraphic=NULL ); + void WriteGraphicObjectShapePart( css::uno::Reference< css::drawing::XShape > xShape, const Graphic *pGraphic=nullptr ); private: sal_Int32 mnXmlNamespace; @@ -89,7 +89,7 @@ private: public: - ShapeExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, ShapeHashMap* pShapeMap = NULL, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = 0 ); + ShapeExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, ShapeHashMap* pShapeMap = nullptr, ::oox::core::XmlFilterBase* pFB = nullptr, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = nullptr ); virtual ~ShapeExport() {} void SetURLTranslator(std::shared_ptr<URLTransformer> pTransformer); diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 5c17c910b456..2a57963ba248 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -81,7 +81,7 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx bool *m_pShapeTypeWritten; public: - VMLExport( ::sax_fastparser::FSHelperPtr pSerializer, VMLTextExport* pTextExport = 0 ); + VMLExport( ::sax_fastparser::FSHelperPtr pSerializer, VMLTextExport* pTextExport = nullptr ); virtual ~VMLExport(); ::sax_fastparser::FSHelperPtr @@ -94,7 +94,7 @@ public: /// Call this when you need to export the object as VML. sal_uInt32 AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1, sal_Int16 eVOri = -1, sal_Int16 eHRel = -1, - sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0, const bool bOOxmlExport = false ); + sal_Int16 eVRel = -1, const Point* pNdTopLeft = nullptr, const bool bOOxmlExport = false ); virtual void AddSdrObjectVMLObject( const SdrObject& rObj) override; static bool IsWaterMarkShape(const OUString& rStr); protected: @@ -123,7 +123,7 @@ private: virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ) override; virtual void CloseContainer() override; - virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 ) override; + virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = nullptr ) override; virtual void LeaveGroup() override; virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ) override; |