diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:20:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:32 +0100 |
| commit | 8d12f43bb3668f4fdfcef0bd149d8b023e312e18 (patch) | |
| tree | 989292510ee579777678940fcb5c93d75c3925dd /oox/source/export/shapes.cxx | |
| parent | 1ddbbfdda834965c861a67e275ab58ff4d1f0bf9 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I62a20b440064aca6f102e61cb3984bb95e739a4f
Diffstat (limited to 'oox/source/export/shapes.cxx')
| -rw-r--r-- | oox/source/export/shapes.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 215183934b4e..0958986f7467 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -456,7 +456,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape ) pFS->startElementNS( mnXmlNamespace, XML_cNvPr, XML_id, I32S( GetNewShapeID( xShape ) ), XML_name, IDS( CustomShape ), - XML_hidden, isVisible ? NULL : "1", + XML_hidden, isVisible ? nullptr : "1", FSEND ); if( GETA( URL ) ) @@ -653,7 +653,7 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const pFS->singleElementNS( mnXmlNamespace, XML_cNvPr, XML_id, I32S( GetNewShapeID( xShape ) ), XML_name, bHaveName ? USS( sName ) : OString( "Picture " + OString::number( mnPictureIdMax++ )).getStr(), - XML_descr, bHaveDesc ? USS( sDescr ) : NULL, + XML_descr, bHaveDesc ? USS( sDescr ) : nullptr, FSEND ); // OOXTODO: //cNvPr children: XML_extLst, XML_hlinkClick, XML_hlinkHover @@ -1212,8 +1212,8 @@ void ShapeExport::WriteTableCellProperties(Reference< XPropertySet> xCellPropSet aRightMargin >>= nRightMargin; mpFS->startElementNS( XML_a, XML_tcPr, - XML_marL, nLeftMargin > 0 ? I32S( oox::drawingml::convertHmmToEmu( nLeftMargin ) ) : NULL, - XML_marR, nRightMargin > 0 ? I32S( oox::drawingml::convertHmmToEmu( nRightMargin ) ): NULL, + XML_marL, nLeftMargin > 0 ? I32S( oox::drawingml::convertHmmToEmu( nLeftMargin ) ) : nullptr, + XML_marR, nRightMargin > 0 ? I32S( oox::drawingml::convertHmmToEmu( nRightMargin ) ): nullptr, FSEND ); // Write background fill for table cell. |