diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:29:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:32:01 +0100 |
commit | 51b45df6bba163dec7ba91c700de695ad517e5dd (patch) | |
tree | 566633496f4048112c75edbbe250b0f01d86a8dd /include/xmloff | |
parent | 87bae0e188aa3ce3c31d1aa91707c0fad6b81b65 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I8690de2cb68dcfedc9f2239ce66cea06fd94bc16
Diffstat (limited to 'include/xmloff')
-rw-r--r-- | include/xmloff/XMLEventExport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/nmspmap.hxx | 8 | ||||
-rw-r--r-- | include/xmloff/shapeexport.hxx | 52 | ||||
-rw-r--r-- | include/xmloff/shapeimport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/styleexp.hxx | 8 | ||||
-rw-r--r-- | include/xmloff/txtimp.hxx | 6 | ||||
-rw-r--r-- | include/xmloff/txtparae.hxx | 26 | ||||
-rw-r--r-- | include/xmloff/unoatrcn.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/xmlement.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/xmlexp.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/xmlexppr.hxx | 6 | ||||
-rw-r--r-- | include/xmloff/xmlimp.hxx | 6 | ||||
-rw-r--r-- | include/xmloff/xmlimppr.hxx | 8 | ||||
-rw-r--r-- | include/xmloff/xmluconv.hxx | 2 |
14 files changed, 66 insertions, 66 deletions
diff --git a/include/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx index 58740e0752b7..7980fb007d4e 100644 --- a/include/xmloff/XMLEventExport.hxx +++ b/include/xmloff/XMLEventExport.hxx @@ -69,7 +69,7 @@ class XMLOFF_DLLPUBLIC XMLEventExport public: XMLEventExport(SvXMLExport& rExport, - const XMLEventNameTranslation* pTranslationTable = NULL); + const XMLEventNameTranslation* pTranslationTable = nullptr); ~XMLEventExport(); /// register an EventExportHandler for a particular script type diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx index a99c66270299..36d78f766b45 100644 --- a/include/xmloff/nmspmap.hxx +++ b/include/xmloff/nmspmap.hxx @@ -114,12 +114,12 @@ public: sal_uInt16 _GetKeyByAttrName( const OUString& rAttrName, OUString *pPrefix, OUString *pLocalName, - OUString *pNamespace = 0, + OUString *pNamespace = nullptr, bool bCache = true) const; /* This will replace the version with the unused 3rd default parameter */ sal_uInt16 _GetKeyByAttrName( const OUString& rAttrName, - OUString *pLocalName = 0, + OUString *pLocalName = nullptr, bool bCache = true) const; sal_uInt16 GetFirstKey() const; @@ -148,10 +148,10 @@ public: /* deprecated */ sal_uInt16 GetKeyByAttrName( const OUString& rAttrName, OUString *pPrefix, OUString *pLocalName, - OUString *pNamespace=0, + OUString *pNamespace=nullptr, sal_uInt16 nIdxGuess = USHRT_MAX ) const; /* deprecated */ sal_uInt16 GetKeyByAttrName( const OUString& rAttrName, - OUString *pLocalName = 0, + OUString *pLocalName = nullptr, sal_uInt16 nIdxGuess = USHRT_MAX ) const; }; diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index f754282eaa40..be7d2d261866 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -220,30 +220,30 @@ private: SAL_DLLPRIVATE void ImpExportGluePoints( const css::uno::Reference< css::drawing::XShape >& xShape ); // single shape exporters - SAL_DLLPRIVATE void ImpExportGroupShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExport3DSceneShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportRectangleShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportLineShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportEllipseShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportPolygonShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportTextBoxShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportGraphicObjectShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportChartShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL ); - SAL_DLLPRIVATE void ImpExportControlShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportConnectorShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportMeasureShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportOLE2Shape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL ); - SAL_DLLPRIVATE void ImpExportPageShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportCaptionShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExport3DShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportFrameShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportPluginShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportAppletShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportCustomShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportMediaShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportTableShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportGroupShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExport3DSceneShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportRectangleShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportLineShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportEllipseShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportPolygonShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportTextBoxShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportGraphicObjectShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportChartShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr, SvXMLAttributeList* pAttrList = nullptr ); + SAL_DLLPRIVATE void ImpExportControlShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportConnectorShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportMeasureShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportOLE2Shape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr, SvXMLAttributeList* pAttrList = nullptr ); + SAL_DLLPRIVATE void ImpExportPageShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportCaptionShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExport3DShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportFrameShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportPluginShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportAppletShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportCustomShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportMediaShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); + SAL_DLLPRIVATE void ImpExportTableShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); public: - XMLShapeExport(SvXMLExport& rExp, SvXMLExportPropertyMapper *pExtMapper=0 ); + XMLShapeExport(SvXMLExport& rExp, SvXMLExportPropertyMapper *pExtMapper=nullptr ); virtual ~XMLShapeExport(); // This method collects all automatic styles for the given XShape @@ -254,8 +254,8 @@ public: void exportShape( const css::uno::Reference < css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, - css::awt::Point* pRefPoint = NULL, - SvXMLAttributeList* pAttrList = NULL + css::awt::Point* pRefPoint = nullptr, + SvXMLAttributeList* pAttrList = nullptr ); // This method collects all automatic styles for the shapes inside the given XShapes collection @@ -266,7 +266,7 @@ public: void exportShapes( const css::uno::Reference < css::drawing::XShapes >& xShapes, XMLShapeExportFlags nFeatures = SEF_DEFAULT, - css::awt::Point* pRefPoint = NULL + css::awt::Point* pRefPoint = nullptr ); /** initializes some internal structures for fast access to the given XShapes collection diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index b8c34d18fac4..c8dff3c350fe 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -310,7 +310,7 @@ protected: public: XMLShapeImportHelper( SvXMLImport& rImporter, const css::uno::Reference< css::frame::XModel>& rModel, - SvXMLImportPropertyMapper *pExtMapper=0 ); + SvXMLImportPropertyMapper *pExtMapper=nullptr ); virtual ~XMLShapeImportHelper(); diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index 2482397932c7..1f4cb92995c8 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -75,7 +75,7 @@ protected: const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, const css::uno::Reference< css::container::XNameAccess > & xStyles, - const OUString* pPrefix = 0L ); + const OUString* pPrefix = nullptr ); virtual void exportStyleAttributes( const css::uno::Reference< css::style::XStyle > & rStyle ); @@ -86,7 +86,7 @@ public: XMLStyleExport( SvXMLExport& rExp, const OUString& rPoolStyleName, - SvXMLAutoStylePoolP *pAutoStyleP=0 ); + SvXMLAutoStylePoolP *pAutoStyleP=nullptr ); virtual ~XMLStyleExport(); // void exportStyleFamily( @@ -110,13 +110,13 @@ public: const OUString& rFamily, const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, bool bUsed, sal_uInt16 nFamily = 0, - const OUString* pPrefix = 0L); + const OUString* pPrefix = nullptr); void exportStyleFamily( const sal_Char *pFamily, const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, bool bUsed, sal_uInt16 nFamily = 0, - const OUString* pPrefix = 0L); + const OUString* pPrefix = nullptr); }; #endif diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index dd3afd774505..a4bfbd08cd34 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -485,7 +485,7 @@ public: const OUString& rTargetFrameName, const OUString& rStyleName, const OUString& rVisitedStyleName, - XMLEventsImportContext* pEvents = NULL); + XMLEventsImportContext* pEvents = nullptr); void SetRuby( SvXMLImport& rImport, const css::uno::Reference< css::text::XTextCursor >& rCursor, @@ -497,7 +497,7 @@ public: /// return -1 if style is not found /// (may return whether data style uses the system language) sal_Int32 GetDataStyleKey( const OUString& sStyleName, - bool* pIsSystemLanguage = NULL ); + bool* pIsSystemLanguage = nullptr ); const SvxXMLListStyleContext *FindAutoListStyle( const OUString& rName ) const; @@ -696,7 +696,7 @@ public: // forwards to TextListHelper; these are used in many places /// push a list context on the list context stack - void PushListContext(XMLTextListBlockContext *i_pListBlock = 0); + void PushListContext(XMLTextListBlockContext *i_pListBlock = nullptr); /// pop the list context stack void PopListContext(); diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 3bf3427e1d22..f8f411cf7041 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -250,7 +250,7 @@ public: bool& rbHyperlink, bool& rbHasCharStyle, bool& rbHasAutoStyle, - const XMLPropertyState** pAddState = NULL) const; + const XMLPropertyState** pAddState = nullptr) const; bool addHyperlinkAttributes( const css::uno::Reference< css::beans::XPropertySet > & rPropSet, const css::uno::Reference< css::beans::XPropertyState > & rPropState, @@ -266,15 +266,15 @@ protected: XMLShapeExportFlags addTextFrameAttributes( const css::uno::Reference< css::beans::XPropertySet >& rPropSet, bool bShape, - OUString *pMinHeightValue = 0, - OUString *pMinWidthValue = 0 ); + OUString *pMinHeightValue = nullptr, + OUString *pMinWidthValue = nullptr ); virtual void exportStyleAttributes( const css::uno::Reference< css::style::XStyle > & rStyle ) override; void exportPageFrames( bool bAutoStyles, bool bProgress ); void exportFrameFrames( bool bAutoStyles, bool bProgress, - const css::uno::Reference< css::text::XTextFrame > *pParentTxtFrame = 0 ); + const css::uno::Reference< css::text::XTextFrame > *pParentTxtFrame = nullptr ); void exportNumStyles( bool bUsed ); @@ -294,7 +294,7 @@ protected: const css::uno::Reference< css::text::XTextSection > & rBaseSection, bool bProgress, bool bExportParagraph = true, - const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0, + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = nullptr, bool bExportLevels = true, TextPNS eExtensionNS = TextPNS::ODF); void exportParagraph( @@ -321,7 +321,7 @@ protected: const css::uno::Reference< css::text::XTextContent > & rTextContent, FrameType eTxpe, bool bAutoStyles, bool bProgress, bool bExportContent, - const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = nullptr ); void _exportTextFrame( const css::uno::Reference< css::beans::XPropertySet > & rPropSet, const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo, @@ -329,11 +329,11 @@ protected: inline void exportTextFrame( const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, bool bProgress, bool bExportContent, - const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = nullptr ); inline void exportShape( const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, - const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = nullptr ); void exportContour( const css::uno::Reference< css::beans::XPropertySet > & rPropSet, @@ -344,7 +344,7 @@ protected: inline void exportTextGraphic( const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, - const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = nullptr ); virtual void _collectTextEmbeddedAutoStyles( const css::uno::Reference< css::beans::XPropertySet > & rPropSet ); @@ -354,7 +354,7 @@ protected: inline void exportTextEmbedded( const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, - const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = nullptr ); /// export a footnote and styles void exportTextFootnote( @@ -445,18 +445,18 @@ public: sal_uInt16 nFamily, MultiPropertySetHelper& rPropSetHelper, const css::uno::Reference< css::beans::XPropertySet > & rPropSet, - const XMLPropertyState** pAddState = NULL ); + const XMLPropertyState** pAddState = nullptr ); void Add( sal_uInt16 nFamily, const css::uno::Reference< css::beans::XPropertySet > & rPropSet, - const XMLPropertyState** pAddState = NULL, bool bDontSeek = false ); + const XMLPropertyState** pAddState = nullptr, bool bDontSeek = false ); /// find style name for specified family and parent OUString Find( sal_uInt16 nFamily, const css::uno::Reference< css::beans::XPropertySet > & rPropSet, const OUString& rParent, - const XMLPropertyState** pAddState = NULL ) const; + const XMLPropertyState** pAddState = nullptr ) const; static SvXMLExportPropertyMapper *CreateShapeExtPropMapper( SvXMLExport& rExport ); diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx index 59c2c2026e3b..1f81e9171321 100644 --- a/include/xmloff/unoatrcn.hxx +++ b/include/xmloff/unoatrcn.hxx @@ -47,7 +47,7 @@ private: const; public: - SvUnoAttributeContainer( SvXMLAttrContainerData* pContainer = NULL ); + SvUnoAttributeContainer( SvXMLAttrContainerData* pContainer = nullptr ); virtual ~SvUnoAttributeContainer(); SvXMLAttrContainerData* GetContainerImpl() const { return mpContainer; } diff --git a/include/xmloff/xmlement.hxx b/include/xmloff/xmlement.hxx index 844230297009..3300a93f32c0 100644 --- a/include/xmloff/xmlement.hxx +++ b/include/xmloff/xmlement.hxx @@ -34,7 +34,7 @@ struct SvXMLEnumMapEntry #define ENUM_STRING_MAP_ENTRY(name,tok) { name, sizeof(name)-1, tok } -#define ENUM_STRING_MAP_END() { NULL, 0, 0 } +#define ENUM_STRING_MAP_END() { nullptr, 0, 0 } /** Map a const sal_Char* (with length) to a sal_uInt16 value. * To be used with SvXMLUnitConverter::convertEnum(...) diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 7698d01b3490..fbf4a19d8fb9 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -491,7 +491,7 @@ public: const OUString& rEmbeddedObjectURL ); OUString EncodeStyleName( const OUString& rName, - bool *pEncoded=0 ) const; + bool *pEncoded=nullptr ) const; // save linked sections? inline bool IsSaveLinkedSections() { return mbSaveLinkedSections; } diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx index ad44774845e9..78f0678440bf 100644 --- a/include/xmloff/xmlexppr.hxx +++ b/include/xmloff/xmlexppr.hxx @@ -87,7 +87,7 @@ protected: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState > *pProperties = 0, + const ::std::vector< XMLPropertyState > *pProperties = nullptr, sal_uInt32 nIdx = 0 ) const; void exportElementItems( @@ -152,7 +152,7 @@ public: SvXMLExport& rExport, const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState > *pProperties = 0, + const ::std::vector< XMLPropertyState > *pProperties = nullptr, sal_uInt32 nIdx = 0 ) const; /** this method is called for every item that has the @@ -162,7 +162,7 @@ public: const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const ::std::vector< XMLPropertyState > *pProperties = 0, + const ::std::vector< XMLPropertyState > *pProperties = nullptr, sal_uInt32 nIdx = 0 ) const; const rtl::Reference<XMLPropertySetMapper>& getPropertySetMapper() const; diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 04a6e7223828..353b0ac2db67 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -175,10 +175,10 @@ protected: const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >& xAttrList ); virtual XMLTextImportHelper* CreateTextImport(); - inline void ClearTextImport() { mxTextImport = 0; } + inline void ClearTextImport() { mxTextImport = nullptr; } virtual XMLShapeImportHelper* CreateShapeImport(); inline bool HasShapeImport() const { return mxShapeImport.is(); } - inline void ClearShapeImport() { mxShapeImport = 0; } + inline void ClearShapeImport() { mxShapeImport = nullptr; } static SchXMLImportHelper* CreateChartImport(); ::xmloff::OFormLayerXMLImport* CreateFormImport(); @@ -571,7 +571,7 @@ inline css::uno::Reference< css::util::XNumberFormatsSupplier > & SvXMLImport::G inline SvXMLNumFmtHelper* SvXMLImport::GetDataStylesImport() { - if ( mpNumImport == NULL) + if ( mpNumImport == nullptr) _CreateDataStylesImport(); return mpNumImport; diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index 8469fe3f0df5..7878e27c2a46 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -111,7 +111,7 @@ public: bool FillPropertySet( const ::std::vector< XMLPropertyState >& rProperties, const css::uno::Reference< css::beans::XPropertySet >& rPropSet, - _ContextID_Index_Pair* pSpecialContextIds = NULL ) const; + _ContextID_Index_Pair* pSpecialContextIds = nullptr ) const; void FillPropertySequence( const ::std::vector< XMLPropertyState >& aProperties, @@ -134,7 +134,7 @@ public: // parameter for use by txtstyli.cxx; allows efficient // catching the combined characters property - _ContextID_Index_Pair* pSpecialContextIds = NULL ); + _ContextID_Index_Pair* pSpecialContextIds = nullptr ); /** implementation helper for FillPropertySet: fill an XMultiPropertySet. * If unsuccessul, set return value. */ @@ -146,7 +146,7 @@ public: // parameters for use by txtstyli.cxx; allows efficient // catching the combined characters property - _ContextID_Index_Pair* pSpecialContextIds = NULL ); + _ContextID_Index_Pair* pSpecialContextIds = nullptr ); /** implementation helper for FillPropertySet: fill an XTolerantMultiPropertySet. * If unsuccessul, set return value. */ @@ -158,7 +158,7 @@ public: // parameters for use by txtstyli.cxx; allows efficient // catching the combined characters property - _ContextID_Index_Pair* pSpecialContextIds = NULL ); + _ContextID_Index_Pair* pSpecialContextIds = nullptr ); static void _PrepareForMultiPropertySet( diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index 2074622d8864..31ba45faa815 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -211,7 +211,7 @@ public: const css::uno::Sequence<css::beans::PropertyValue>& aProps); OUString encodeStyleName( const OUString& rName, - bool *pEncoded=0 ) const; + bool *pEncoded=nullptr ) const; /** convert string (hex) to number (sal_uInt32) */ static bool convertHex( sal_uInt32& nVal, const OUString& rValue ); |