diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-09-26 20:05:20 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-26 20:25:29 +0300 |
| commit | 0f64ec11a3c80308075b8786fb0a2757a2d7efe8 (patch) | |
| tree | f74a10b50e5754097da6f479913fb8b98c8b3425 | |
| parent | 7f9b242331327c5c1b137b91861a6bb57bfb0ecc (diff) | |
WaE: implicit conversion of NULL constant to 'nullptr_t'
Change-Id: I47ebbac21f48854eb737dd7e8119bd863a5d7ed9
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index e8331e85efbc..cceadeecab30 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 { |