6 files changed, 12 insertions, 12 deletions

diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx
index 4ba82addae71..17dcd9c77a58 100644
--- a/oox/source/vml/vmldrawingfragment.cxx
+++ b/oox/source/vml/vmldrawingfragment.cxx
@@ -66,7 +66,7 @@ ContextHandlerRef DrawingFragment::onCreateContext( sal_Int32 nElement, const At
             }
         break;
     }
-    return 0;
+    return nullptr;
 }
 
 void DrawingFragment::finalizeImport()
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index daeca3fbaf17..5090a29ad161 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -285,12 +285,12 @@ OUString ShapeBase::getShapeName() const
 
 const ShapeType* ShapeBase::getChildTypeById( const OUString& ) const
 {
-    return 0;
+    return nullptr;
 }
 
 const ShapeBase* ShapeBase::getChildById( const OUString& ) const
 {
-    return 0;
+    return nullptr;
 }
 
 Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxShapes, const ShapeParentAnchor* pParentAnchor ) const
@@ -432,7 +432,7 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS
                 /*  Notify the drawing that a new shape has been inserted. For
                     convenience, pass the rectangle that contains position and
                     size of the shape. */
-                bool bGroupChild = pParentAnchor != 0;
+                bool bGroupChild = pParentAnchor != nullptr;
                 mrDrawing.notifyXShapeInserted( xShape, aShapeRect, *this, bGroupChild );
             }
         }
diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx
index a7fbb785ab20..055365202d5d 100644
--- a/oox/source/vml/vmlshapecontainer.cxx
+++ b/oox/source/vml/vmlshapecontainer.cxx
@@ -87,7 +87,7 @@ const ShapeType* ShapeContainer::getShapeTypeById( const OUString& rShapeId, boo
         for( ShapeVector::const_iterator aVIt = maShapes.begin(), aVEnd = maShapes.end(); aVIt != aVEnd; ++aVIt )
             if( const ShapeType* pType = (*aVIt)->getChildTypeById( rShapeId ) )
                 return pType;
-   return 0;
+   return nullptr;
 }
 
 const ShapeBase* ShapeContainer::getShapeById( const OUString& rShapeId, bool bDeep ) const
@@ -100,7 +100,7 @@ const ShapeBase* ShapeContainer::getShapeById( const OUString& rShapeId, bool bD
         for( ShapeVector::const_iterator aVIt = maShapes.begin(), aVEnd = maShapes.end(); aVIt != aVEnd; ++aVIt )
             if( const ShapeBase* pShape = (*aVIt)->getChildById( rShapeId ) )
                 return pShape;
-   return 0;
+   return nullptr;
 }
 
 std::shared_ptr< ShapeBase > ShapeContainer::takeLastShape()
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 4ea10e87bd98..de0423c03689 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -155,7 +155,7 @@ ContextHandlerRef ShapeLayoutContext::onCreateContext( sal_Int32 nElement, const
         }
         break;
     }
-    return 0;
+    return nullptr;
 }
 
 ClientDataContext::ClientDataContext( ContextHandler2Helper& rParent,
@@ -173,7 +173,7 @@ ContextHandlerRef ClientDataContext::onCreateContext( sal_Int32 /*nElement*/, co
         maElementText.clear();
         return this;
     }
-    return 0;
+    return nullptr;
 }
 
 void ClientDataContext::onCharacters( const OUString& rChars )
@@ -259,7 +259,7 @@ ContextHandlerRef ShapeContextBase::createShapeContext( ContextHandler2Helper& r
         case VML_TOKEN( image ):
             return new ShapeContext( rParent, rShapes.createShape< ComplexShape >(), rAttribs );
     }
-    return 0;
+    return nullptr;
 }
 
 ShapeTypeContext::ShapeTypeContext( ContextHandler2Helper& rParent, ShapeType& rShapeType, const AttributeList& rAttribs ) :
@@ -368,7 +368,7 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( sal_Int32 nElement, const A
             mrTypeModel.maTextpathModel.moString.assignIfUsed(rAttribs.getString(XML_string));
         break;
     }
-    return 0;
+    return nullptr;
 }
 
 OptValue< OUString > ShapeTypeContext::decodeFragmentPath( const AttributeList& rAttribs, sal_Int32 nToken ) const
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index fbd821727883..4b9f363136ba 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -61,7 +61,7 @@ void TextBox::appendPortion( const TextParagraphModel& rParagraph, const TextFon
 
 const TextFontModel* TextBox::getFirstFont() const
 {
-    return maPortions.empty() ? 0 : &maPortions.front().maFont;
+    return maPortions.empty() ? nullptr : &maPortions.front().maFont;
 }
 
 OUString TextBox::getText() const
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index d1a8b1256d74..662fdb49695e 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -250,7 +250,7 @@ ContextHandlerRef TextBoxContext::onCreateContext( sal_Int32 nElement, const Att
             SAL_INFO("oox", "unhandled 0x" << std::hex << getCurrentElement());
         break;
     }
-    return 0;
+    return nullptr;
 }
 
 void TextBoxContext::onStartElement(const AttributeList& rAttribs)