oox/source/drawingml/shape.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d4f94182cbc7f1499b692a35cabaa405dfd3a079
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jan 13 21:28:10 2014 +0200
WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t'
Change-Id: I4dc6267003e12c960b82efa54ed3af4a3c6376c4
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index eff9ad4..c368363 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
