Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fxbarcode / datamatrix / BC_HighLevelEncoder.cpp
index 3866f45..3aded2d 100644 (file)
@@ -72,7 +72,7 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg, CFX_Wid
 CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg,  CFX_WideString ecLevel, SymbolShapeHint shape, CBC_Dimension* minSize, CBC_Dimension* maxSize, int32_t &e)\r
 {\r
     CBC_EncoderContext context(msg, ecLevel, e);\r
-    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");\r
+    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");\r
     context.setSymbolShape(shape);\r
     context.setSizeConstraints(minSize, maxSize);\r
     if ((msg.Mid(0, 6) == MACRO_05_HEADER) && (msg.Mid(msg.GetLength() - 1, 1) == MACRO_TRAILER)) {\r
@@ -99,7 +99,7 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg,  CFX_Wi
                 delete (CBC_Encoder*)encoders.GetAt(i);\r
             }\r
             encoders.RemoveAll();\r
-            return (FX_LPWSTR)"";\r
+            return (FX_WCHAR*)"";\r
         }\r
         if (context.m_newEncoding >= 0) {\r
             encodingMode = context.m_newEncoding;\r
@@ -113,7 +113,7 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg,  CFX_Wi
             delete (CBC_Encoder*)encoders.GetAt(i);\r
         }\r
         encoders.RemoveAll();\r
-        return (FX_LPWSTR)"";\r
+        return (FX_WCHAR*)"";\r
     }\r
     int32_t capacity = context.m_symbolInfo->m_dataCapacity;\r
     if (len < capacity) {\r