summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-01-13 21:28:10 +0200
committerTor Lillqvist <tml@collabora.com>2014-01-13 22:04:40 +0200
commit26c7505734384e8574a729138a26193f500c6b90 (patch)
tree8d25a41e5a34469b6bbfe8360fa13dde983afee9
parentprepare WPXSvInputStream for librevenge (diff)
downloadcore-private/tml/iculess.tar.gz
core-private/tml/iculess.zip
WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t' private/tml/iculess
Change-Id: I4dc6267003e12c960b82efa54ed3af4a3c6376c4
-rw-r--r--oox/source/drawingml/shape.cxx2
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;