| Index: xfa/fwl/basewidget/fxmath_barcodeimp.cpp
|
| diff --git a/xfa/fwl/basewidget/fxmath_barcodeimp.cpp b/xfa/fwl/basewidget/fxmath_barcodeimp.cpp
|
| index 1dc8afbaef77642d1cf09c3b2ee60388efda7c16..4b97520b4e029a51c33c11cce7e104d9b36242b7 100644
|
| --- a/xfa/fwl/basewidget/fxmath_barcodeimp.cpp
|
| +++ b/xfa/fwl/basewidget/fxmath_barcodeimp.cpp
|
| @@ -44,7 +44,7 @@ static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) {
|
| return new CBC_DataMatrix();
|
| case BC_UNKNOWN:
|
| default:
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| @@ -56,7 +56,7 @@ CFX_Barcode::~CFX_Barcode() {
|
|
|
| FX_BOOL CFX_Barcode::Create(BC_TYPE type) {
|
| m_pBCEngine = FX_Barcode_CreateBarCodeEngineObject(type);
|
| - return m_pBCEngine != NULL;
|
| + return !!m_pBCEngine;
|
| }
|
| BC_TYPE CFX_Barcode::GetType() {
|
| return m_pBCEngine ? m_pBCEngine->GetType() : BC_UNKNOWN;
|
| @@ -221,7 +221,7 @@ FX_BOOL CFX_Barcode::SetFontColor(FX_ARGB color) {
|
| }
|
| FX_BOOL CFX_Barcode::SetTextLocation(BC_TEXT_LOC location) {
|
| typedef FX_BOOL (CBC_CodeBase::*memptrtype)(BC_TEXT_LOC);
|
| - memptrtype memptr = NULL;
|
| + memptrtype memptr = nullptr;
|
| switch (GetType()) {
|
| case BC_CODE39:
|
| memptr = (memptrtype)&CBC_Code39::SetTextLocation;
|
| @@ -241,7 +241,7 @@ FX_BOOL CFX_Barcode::SetTextLocation(BC_TEXT_LOC location) {
|
| }
|
| FX_BOOL CFX_Barcode::SetWideNarrowRatio(int32_t ratio) {
|
| typedef FX_BOOL (CBC_CodeBase::*memptrtype)(int32_t);
|
| - memptrtype memptr = NULL;
|
| + memptrtype memptr = nullptr;
|
| switch (GetType()) {
|
| case BC_CODE39:
|
| memptr = (memptrtype)&CBC_Code39::SetWideNarrowRatio;
|
| @@ -256,7 +256,7 @@ FX_BOOL CFX_Barcode::SetWideNarrowRatio(int32_t ratio) {
|
| }
|
| FX_BOOL CFX_Barcode::SetStartChar(FX_CHAR start) {
|
| typedef FX_BOOL (CBC_CodeBase::*memptrtype)(FX_CHAR);
|
| - memptrtype memptr = NULL;
|
| + memptrtype memptr = nullptr;
|
| switch (GetType()) {
|
| case BC_CODABAR:
|
| memptr = (memptrtype)&CBC_Codabar::SetStartChar;
|
| @@ -268,7 +268,7 @@ FX_BOOL CFX_Barcode::SetStartChar(FX_CHAR start) {
|
| }
|
| FX_BOOL CFX_Barcode::SetEndChar(FX_CHAR end) {
|
| typedef FX_BOOL (CBC_CodeBase::*memptrtype)(FX_CHAR);
|
| - memptrtype memptr = NULL;
|
| + memptrtype memptr = nullptr;
|
| switch (GetType()) {
|
| case BC_CODABAR:
|
| memptr = (memptrtype)&CBC_Codabar::SetEndChar;
|
| @@ -280,7 +280,7 @@ FX_BOOL CFX_Barcode::SetEndChar(FX_CHAR end) {
|
| }
|
| FX_BOOL CFX_Barcode::SetVersion(int32_t version) {
|
| typedef FX_BOOL (CBC_CodeBase::*memptrtype)(int32_t);
|
| - memptrtype memptr = NULL;
|
| + memptrtype memptr = nullptr;
|
| switch (GetType()) {
|
| case BC_QR_CODE:
|
| memptr = (memptrtype)&CBC_QRCode::SetVersion;
|
| @@ -292,7 +292,7 @@ FX_BOOL CFX_Barcode::SetVersion(int32_t version) {
|
| }
|
| FX_BOOL CFX_Barcode::SetErrorCorrectionLevel(int32_t level) {
|
| typedef FX_BOOL (CBC_CodeBase::*memptrtype)(int32_t);
|
| - memptrtype memptr = NULL;
|
| + memptrtype memptr = nullptr;
|
| switch (GetType()) {
|
| case BC_QR_CODE:
|
| memptr = (memptrtype)&CBC_QRCode::SetErrorCorrectionLevel;
|
| @@ -307,7 +307,7 @@ FX_BOOL CFX_Barcode::SetErrorCorrectionLevel(int32_t level) {
|
| }
|
| FX_BOOL CFX_Barcode::SetTruncated(FX_BOOL truncated) {
|
| typedef void (CBC_CodeBase::*memptrtype)(FX_BOOL);
|
| - memptrtype memptr = NULL;
|
| + memptrtype memptr = nullptr;
|
| switch (GetType()) {
|
| case BC_PDF417:
|
| memptr = (memptrtype)&CBC_PDF417I::SetTruncated;
|
|
|