diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
| commit | d7e5cc754a937605d1f73db5e7967c58ddd80742 (patch) | |
| tree | ed28e012c4d6a46b7f29f15a0c060474c27d4286 /xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp | |
| parent | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (diff) | |
| download | pdfium-d7e5cc754a937605d1f73db5e7967c58ddd80742.tar.xz | |
Merge to XFA: Remove typdefs for pointer types in fx_system.h.
Original Review URL: https://codereview.chromium.org/1171733003
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1178613002.
Diffstat (limited to 'xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp')
| -rw-r--r-- | xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index 0044683a5c..587bdd3128 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -217,24 +217,24 @@ int32_t CBC_SymbolInfo::getErrorLengthForInterleavedBlock(int32_t index) CFX_WideString CBC_SymbolInfo::toString(int32_t &e)
{
CFX_WideString sb;
- sb += (FX_LPWSTR)(m_rectangular ? "Rectangular Symbol:" : "Square Symbol:");
- sb += (FX_LPWSTR)" data region ";
+ sb += (FX_WCHAR*)(m_rectangular ? "Rectangular Symbol:" : "Square Symbol:");
+ sb += (FX_WCHAR*)" data region ";
sb += m_matrixWidth;
sb += (FX_WCHAR)'x';
sb += m_matrixHeight;
- sb += (FX_LPWSTR)", symbol size ";
+ sb += (FX_WCHAR*)", symbol size ";
sb += getSymbolWidth(e);
- BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");
+ BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");
sb += (FX_WCHAR)'x';
sb += getSymbolHeight(e);
- BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");
- sb += (FX_LPWSTR)", symbol data size ";
+ BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");
+ sb += (FX_WCHAR*)", symbol data size ";
sb += getSymbolDataWidth(e);
- BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");
+ BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");
sb += (FX_WCHAR)'x';
sb += getSymbolDataHeight(e);
- BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");
- sb += (FX_LPWSTR)", codewords ";
+ BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");
+ sb += (FX_WCHAR*)", codewords ";
sb += m_dataCapacity;
sb += (FX_WCHAR)'+';
sb += m_errorCodewords;
|