diff options
Diffstat (limited to 'xfa/fxfa')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffbarcode.cpp | 6 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_ffbarcode.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp index de0638fb13..822029df3e 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.cpp +++ b/xfa/fxfa/app/xfa_ffbarcode.cpp @@ -92,7 +92,7 @@ const XFA_BARCODETYPEENUMINFO g_XFABarCodeTypeEnumData[] = { const int32_t g_iXFABarcodeTypeCount = sizeof(g_XFABarCodeTypeEnumData) / sizeof(XFA_BARCODETYPEENUMINFO); -XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName( +const XFA_BARCODETYPEENUMINFO* XFA_GetBarcodeTypeByName( const CFX_WideStringC& wsName) { if (wsName.IsEmpty()) return nullptr; @@ -102,7 +102,7 @@ XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName( int32_t iEnd = g_iXFABarcodeTypeCount - 1; do { int32_t iMid = (iStart + iEnd) / 2; - XFA_LPCBARCODETYPEENUMINFO pInfo = g_XFABarCodeTypeEnumData + iMid; + const XFA_BARCODETYPEENUMINFO* pInfo = g_XFABarCodeTypeEnumData + iMid; if (uHash == pInfo->uHash) { return pInfo; } else if (uHash < pInfo->uHash) { @@ -168,7 +168,7 @@ void CXFA_FFBarcode::UpdateWidgetProperty() { CXFA_FFTextEdit::UpdateWidgetProperty(); CFWL_Barcode* pBarCodeWidget = (CFWL_Barcode*)m_pNormalWidget; CFX_WideString wsType = GetDataAcc()->GetBarcodeType(); - XFA_LPCBARCODETYPEENUMINFO pBarcodeTypeInfo = + const XFA_BARCODETYPEENUMINFO* pBarcodeTypeInfo = XFA_GetBarcodeTypeByName(wsType.AsStringC()); if (!pBarcodeTypeInfo) return; diff --git a/xfa/fxfa/app/xfa_ffbarcode.h b/xfa/fxfa/app/xfa_ffbarcode.h index d2b5df3517..4690b3d612 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.h +++ b/xfa/fxfa/app/xfa_ffbarcode.h @@ -90,12 +90,12 @@ enum XFA_BARCODETYPEENUM { XFA_BARCODETYPE_upcean5, XFA_BARCODETYPE_upsMaxicode }; + struct XFA_BARCODETYPEENUMINFO { uint32_t uHash; const FX_WCHAR* pName; XFA_BARCODETYPEENUM eName; BC_TYPE eBCType; }; -typedef XFA_BARCODETYPEENUMINFO const* XFA_LPCBARCODETYPEENUMINFO; #endif // XFA_FXFA_APP_XFA_FFBARCODE_H_ |