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

[Tor Lillqvist]

 tools/source/fsys/urlobj.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0f64ec11a3c80308075b8786fb0a2757a2d7efe8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 26 20:05:20 2014 +0300

    WaE: implicit conversion of NULL constant to 'nullptr_t'
    
    Change-Id: I47ebbac21f48854eb737dd7e8119bd863a5d7ed9

diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index e8331e8..cceadee 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -604,7 +604,7 @@ std::unique_ptr<SvMemoryStream> INetURLObject::getData()
 {
     if( GetProtocol() != INET_PROT_DATA )
     {
-        return NULL;
+        return nullptr;
     }
 
     OUString sURLPath = GetURLPath( DECODE_WITH_CHARSET, RTL_TEXTENCODING_ISO_8859_1 );
@@ -633,7 +633,7 @@ std::unique_ptr<SvMemoryStream> INetURLObject::getData()
                 aDecodedData.getArray(), aDecodedData.getLength());
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 namespace unnamed_tools_urlobj {