summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/oox/drawingml/shape.hxx10
-rw-r--r--include/oox/dump/oledumper.hxx10
-rw-r--r--include/oox/export/chartexport.hxx2
-rw-r--r--include/oox/export/drawingml.hxx6
-rw-r--r--include/oox/export/shapes.hxx4
-rw-r--r--include/oox/export/vmlexport.hxx6
-rw-r--r--include/oox/helper/graphichelper.hxx6
-rw-r--r--include/oox/ole/axcontrol.hxx2
-rw-r--r--include/oox/ppt/pptshape.hxx6
-rw-r--r--include/oox/vml/vmlshape.hxx4
-rw-r--r--include/oox/vml/vmlshapecontainer.hxx2
11 files changed, 29 insertions, 29 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 486cd6c4f44e..0c1150ad932b 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -76,7 +76,7 @@ class OOX_DLLPUBLIC Shape
{
public:
- explicit Shape( const sal_Char* pServiceType = 0, bool bDefaultHeight = true );
+ explicit Shape( const sal_Char* pServiceType = nullptr, bool bDefaultHeight = true );
explicit Shape( const ShapePtr& pSourceShape );
virtual ~Shape();
@@ -152,16 +152,16 @@ public:
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const basegfx::B2DHomMatrix& aTransformation,
FillProperties& rShapeOrParentShapeFillProps,
- const css::awt::Rectangle* pShapeRect = 0,
- ShapeIdMap* pShapeMap = 0 );
+ const css::awt::Rectangle* pShapeRect = nullptr,
+ ShapeIdMap* pShapeMap = nullptr );
void addChildren(
::oox::core::XmlFilterBase& rFilterBase,
const Theme* pTheme,
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
basegfx::B2DHomMatrix& aTransformation,
- const css::awt::Rectangle* pShapeRect = 0,
- ShapeIdMap* pShapeMap = 0 );
+ const css::awt::Rectangle* pShapeRect = nullptr,
+ ShapeIdMap* pShapeMap = nullptr );
void setXShape( const css::uno::Reference< css::drawing::XShape >& rXShape )
{ mxShape = rXShape; };
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index e3940fe57d3f..ea9604dcc218 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -344,8 +344,8 @@ protected:
void dumpPosProperty();
void dumpSizeProperty();
- void dumpGuidProperty( OUString* pValue = 0 );
- void dumpStringProperty( OUString* pValue = 0 );
+ void dumpGuidProperty( OUString* pValue = nullptr );
+ void dumpStringProperty( OUString* pValue = nullptr );
void dumpStringArrayProperty();
void dumpStreamProperty();
@@ -369,7 +369,7 @@ private:
OUString maItemName;
sal_uInt32 mnDataSize;
OUString* mpItemValue;
- explicit LargeProperty( LargePropertyType ePropType, const String& rItemName, sal_uInt32 nDataSize, OUString* pItemValue = 0 ) :
+ explicit LargeProperty( LargePropertyType ePropType, const String& rItemName, sal_uInt32 nDataSize, OUString* pItemValue = nullptr ) :
mePropType( ePropType ), maItemName( rItemName ), mnDataSize( nDataSize ), mpItemValue( pItemValue ) {}
};
typedef ::std::vector< LargeProperty > LargePropertyVector;
@@ -547,11 +547,11 @@ public:
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
const OUString& rSysFileName,
- const OUString* pProgId = 0 );
+ const OUString* pProgId = nullptr );
explicit FormControlStreamObject(
const OutputObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const OUString* pProgId = 0 );
+ const OUString* pProgId = nullptr );
protected:
virtual void implDump() override;
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;
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index 0e7ebc931017..ce0b3655621a 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -110,7 +110,7 @@ public:
css::uno::Reference< css::graphic::XGraphic >
importGraphic(
const css::uno::Reference< css::io::XInputStream >& rxInStrm,
- const WMF_EXTERNALHEADER* pExtHeader = NULL ) const;
+ const WMF_EXTERNALHEADER* pExtHeader = nullptr ) const;
/** Imports a graphic from the passed binary memory block. */
css::uno::Reference< css::graphic::XGraphic >
@@ -120,7 +120,7 @@ public:
css::uno::Reference< css::graphic::XGraphic >
importEmbeddedGraphic(
const OUString& rStreamName,
- const WMF_EXTERNALHEADER* pExtHeader = NULL ) const;
+ const WMF_EXTERNALHEADER* pExtHeader = nullptr ) const;
/** Creates a persistent graphic object from the passed graphic.
@return The URL of the created and internally cached graphic object. */
@@ -131,7 +131,7 @@ public:
@return The URL of the created and internally cached graphic object. */
OUString importGraphicObject(
const css::uno::Reference< css::io::XInputStream >& rxInStrm,
- const WMF_EXTERNALHEADER* pExtHeader = NULL ) const;
+ const WMF_EXTERNALHEADER* pExtHeader = nullptr ) const;
/** Creates a persistent graphic object from the passed binary memory block.
@return The URL of the created and internally cached graphic object. */
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 442c5f32124f..befbf22bfdc2 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -942,7 +942,7 @@ public:
ControlModelBase* createModelFromGuid( const OUString& rClassId );
/** Returns true, if the internal control model exists. */
- bool hasModel() const { return mxModel.get() != 0; }
+ bool hasModel() const { return mxModel.get() != nullptr; }
/** Returns read-only access to the internal control model. */
const ControlModelBase* getModel() const { return mxModel.get(); }
/** Returns read/write access to the internal control model. */
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index f4d0798257f1..af2685423c60 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -35,7 +35,7 @@ class PPTShape : public oox::drawingml::Shape
public:
PPTShape( const oox::ppt::ShapeLocation eShapeLocation,
- const sal_Char* pServiceType = NULL );
+ const sal_Char* pServiceType = nullptr );
virtual ~PPTShape();
using oox::drawingml::Shape::addShape;
@@ -46,8 +46,8 @@ public:
const oox::drawingml::Theme* pTheme,
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
basegfx::B2DHomMatrix& aTransformation,
- const css::awt::Rectangle* pShapeRect = 0,
- ::oox::drawingml::ShapeIdMap* pShapeMap = 0 );
+ const css::awt::Rectangle* pShapeRect = nullptr,
+ ::oox::drawingml::ShapeIdMap* pShapeMap = nullptr );
virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) override;
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 7ccead9ad043..5c955dc171be 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -249,12 +249,12 @@ public:
css::uno::Reference< css::drawing::XShape >
convertAndInsert(
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
- const ShapeParentAnchor* pParentAnchor = 0 ) const;
+ const ShapeParentAnchor* pParentAnchor = nullptr ) const;
/** Converts position and formatting into the passed existing XShape. */
void convertFormatting(
const css::uno::Reference< css::drawing::XShape >& rxShape,
- const ShapeParentAnchor* pParentAnchor = 0 ) const;
+ const ShapeParentAnchor* pParentAnchor = nullptr ) const;
protected:
explicit ShapeBase( Drawing& rDrawing );
diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx
index cea21146d36c..b843c4d73f00 100644
--- a/include/oox/vml/vmlshapecontainer.hxx
+++ b/include/oox/vml/vmlshapecontainer.hxx
@@ -101,7 +101,7 @@ public:
/** Creates and inserts all UNO shapes into the passed container. */
void convertAndInsert(
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
- const ShapeParentAnchor* pParentAnchor = 0 ) const;
+ const ShapeParentAnchor* pParentAnchor = nullptr ) const;
private:
typedef RefVector< ShapeType > ShapeTypeVector;
generated by cgit (git 2.34.1) at 2025-01-31 16:43:29 +0000