[Libreoffice-commits] core.git: sw/source xmloff/source
Peter Foley
pefoley2 at pefoley.com
Mon Jan 18 10:44:20 PST 2016
sw/source/core/text/inftxt.hxx | 2 +-
xmloff/source/core/xmltoken.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8633e6b3f5882508f23ed4dba2b3651ef7a4e524
Author: Peter Foley <pefoley2 at pefoley.com>
Date: Sun Jan 17 14:28:29 2016 -0500
Convert NULL/0 to nullptr
Change-Id: Iee6bb0867afd8aebe36e62b507f1332e3a581838
Reviewed-on: https://gerrit.libreoffice.org/21549
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 3753bbd..c463bd3 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -385,7 +385,7 @@ protected:
#ifdef DBG_UTIL
, pBrushItem(reinterpret_cast<SvxBrushItem*>(-1))
#else
- , pBrushItem(0)
+ , pBrushItem(nullptr)
#endif
, nSpaceIdx(0)
{}
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 1570301..d3af42f 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -45,7 +45,7 @@ namespace xmloff { namespace token {
#if OSL_DEBUG_LEVEL > 0
#define TOKEN( s, e ) { sizeof(s)-1, s, nullptr, e }
#else
- #define TOKEN( s, e ) { sizeof(s)-1, s, NULL }
+ #define TOKEN( s, e ) { sizeof(s)-1, s, nullptr }
#endif
struct XMLTokenEntry aTokenList[] =
@@ -53,7 +53,7 @@ namespace xmloff { namespace token {
#if OSL_DEBUG_LEVEL > 0
{ 0, nullptr, nullptr, XML_TOKEN_START },
#else
- { 0, NULL, NULL }, // XML_TOKEN_START
+ { 0, nullptr, nullptr }, // XML_TOKEN_START
#endif
// common XML
@@ -3260,7 +3260,7 @@ namespace xmloff { namespace token {
#if OSL_DEBUG_LEVEL > 0
{ 0, nullptr, nullptr, XML_TOKEN_END }
#else
- { 0, NULL, NULL /* XML_TOKEN_END */ }
+ { 0, nullptr, nullptr /* XML_TOKEN_END */ }
#endif
};
More information about the Libreoffice-commits
mailing list