diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-01-13 21:28:10 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-01-13 21:28:10 +0200 |
| commit | d4f94182cbc7f1499b692a35cabaa405dfd3a079 (patch) | |
| tree | 6a56d3488351b6cecf3c23b39704c05dfd4e7ca7 /oox | |
| parent | e71d6067e38e961964a5bfb836f8ef8cccf22c6d (diff) | |
WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t'
Change-Id: I4dc6267003e12c960b82efa54ed3af4a3c6376c4
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index eff9ad408424..c368363fc9ce 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -621,7 +621,7 @@ Reference< XShape > Shape::createAndInsert( { if (aServiceName == "com.sun.star.text.TextFrame") { - if (mpCustomShapePropertiesPtr != NULL && mpCustomShapePropertiesPtr->getShapeTypeOverride()) + if (mpCustomShapePropertiesPtr && mpCustomShapePropertiesPtr->getShapeTypeOverride()) { uno::Reference<beans::XPropertySet> propertySet (mxShape, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag; |