| Index: core/src/fxcrt/fx_basic_bstring.cpp
|
| diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp
|
| index 60153fa45accf1a265ed108bd48d297589f20db2..c54148d799bebb9a865c7d227c8688e60d358bde 100644
|
| --- a/core/src/fxcrt/fx_basic_bstring.cpp
|
| +++ b/core/src/fxcrt/fx_basic_bstring.cpp
|
| @@ -971,7 +971,7 @@ CFX_ByteString CFX_ByteString::FromUnicode(FX_LPCWSTR str, FX_STRSIZE len)
|
| }
|
| CFX_ByteString CFX_ByteString::FromUnicode(const CFX_WideString& str)
|
| {
|
| - return FromUnicode((FX_LPCWSTR)str, str.GetLength());
|
| + return FromUnicode(str.c_str(), str.GetLength());
|
| }
|
| void CFX_ByteString::ConvertFrom(const CFX_WideString& str, CFX_CharMap* pCharMap)
|
| {
|
|
|