[Libreoffice-commits] core.git: extensions/source

[Stephan Bergmann]

 extensions/source/ole/unoconversionutilities.hxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a6960391accbe238a78c9b128342e4ad52a68a8b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 3 15:45:13 2016 +0200

    NULL -> nullptr
    
    Change-Id: I0bd2dc2e2ed1f699133e3e7753359b969fbee322

diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 1fdb038..a22157b 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -398,7 +398,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                 }
                 break;
             case TypeClass_VOID:
-                rAny.setValue(NULL,Type());
+                rAny.setValue(nullptr,Type());
                 break;
             case TypeClass_ANY:     //  Any
                 // There could be a JScript Array that needs special handling
@@ -1478,10 +1478,10 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
                 switch (var.vt)
                 {
                 case VT_EMPTY:
-                    rAny.setValue(NULL, Type());
+                    rAny.setValue(nullptr, Type());
                     break;
                 case VT_NULL:
-                    rAny.setValue(NULL, Type());
+                    rAny.setValue(nullptr, Type());
                     break;
                 case VT_I2:
                     rAny.setValue( & var.iVal, cppu::UnoType<sal_Int16>::get());
@@ -1580,7 +1580,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
                     rAny.setValue( & var.uintVal, cppu::UnoType<sal_uInt32>::get());
                     break;
                 case VT_VOID:
-                    rAny.setValue( NULL, Type());
+                    rAny.setValue( nullptr, Type());
                     break;
                 case VT_DECIMAL:
                 {