From 8d12f43bb3668f4fdfcef0bd149d8b023e312e18 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 10 Nov 2015 10:20:17 +0100
Subject: loplugin:nullptr (automatic rewrite)

Change-Id: I62a20b440064aca6f102e61cb3984bb95e739a4f
---
 oox/source/shape/LockedCanvasContext.cxx | 2 +-
 oox/source/shape/ShapeContextHandler.cxx | 2 +-
 oox/source/shape/ShapeFilterBase.cxx     | 2 +-
 oox/source/shape/WpgContext.cxx          | 2 +-
 oox/source/shape/WpsContext.cxx          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'oox/source/shape')

diff --git a/oox/source/shape/LockedCanvasContext.cxx b/oox/source/shape/LockedCanvasContext.cxx
index 31b7dc1693b5..61728b248b16 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -54,7 +54,7 @@ LockedCanvasContext::~LockedCanvasContext()
         SAL_WARN("oox", "LockedCanvasContext::createFastChildContext: unhandled element:" << getBaseToken(aElementToken));
         break;
     }
-    return 0;
+    return nullptr;
 }
 
 }
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 6b288fda9755..35f64b9d34d1 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -532,7 +532,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception)
                 mxWpgContext.clear();
             }
         }
-        else if (mpShape.get() != NULL)
+        else if (mpShape.get() != nullptr)
         {
             basegfx::B2DHomMatrix aTransformation;
             mpShape->addShape(*mxFilterBase, mpThemePtr.get(), xShapes, aTransformation, mpShape->getFillProperties() );
diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx
index 3a69807ef08d..9071715cb24a 100644
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -49,7 +49,7 @@ void ShapeFilterBase::setCurrentTheme(::oox::drawingml::ThemePtr pTheme)
 
 ::oox::vml::Drawing* ShapeFilterBase::getVmlDrawing()
 {
-    return 0;
+    return nullptr;
 }
 
 const ::oox::drawingml::table::TableStyleListPtr ShapeFilterBase::getTableStyles()
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index 4cbf200f8ce2..e343bd5cb8db 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -64,7 +64,7 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken
         SAL_WARN("oox", "WpgContext::createFastChildContext: unhandled element: " << getBaseToken(nElementToken));
         break;
     }
-    return 0;
+    return nullptr;
 }
 
 }
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 0cf558c63cb5..894e504f7617 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -222,7 +222,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
         SAL_WARN("oox", "WpsContext::createFastChildContext: unhandled element: " << getBaseToken(nElementToken));
         break;
     }
-    return 0;
+    return nullptr;
 }
 
 }
-- 
cgit