summaryrefslogtreecommitdiff
path: root/oox/source/shape
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:20:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:32 +0100
commit8d12f43bb3668f4fdfcef0bd149d8b023e312e18 (patch)
tree989292510ee579777678940fcb5c93d75c3925dd /oox/source/shape
parent1ddbbfdda834965c861a67e275ab58ff4d1f0bf9 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I62a20b440064aca6f102e61cb3984bb95e739a4f
Diffstat (limited to 'oox/source/shape')
-rw-r--r--oox/source/shape/LockedCanvasContext.cxx2
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx2
-rw-r--r--oox/source/shape/ShapeFilterBase.cxx2
-rw-r--r--oox/source/shape/WpgContext.cxx2
-rw-r--r--oox/source/shape/WpsContext.cxx2
5 files changed, 5 insertions, 5 deletions
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;
}
}