summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-02-19 10:53:24 -0800
committerLei Zhang <thestig@chromium.org>2016-02-19 10:53:24 -0800
commit31c7b73b71bd7352f96a82716b5e81d7fa24f37f (patch)
tree292a068fb657e97cd0d11dc78a7528915f8a78e0 /xfa
parent490543247e07ce1c92f609bcc2fa484652a86e1f (diff)
downloadpdfium-31c7b73b71bd7352f96a82716b5e81d7fa24f37f.tar.xz
Remove CFX_{Byte,Wide}String::ConvertFrom().
Use/add CFX_{Byte,Wide}String::FromFoo() instead. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1711893003 .
Diffstat (limited to 'xfa')
-rw-r--r--xfa/src/fgas/src/crt/fx_system.cpp4
-rw-r--r--xfa/src/fgas/src/localization/fx_locale.cpp6
-rw-r--r--xfa/src/fxbarcode/BC_UtilCodingConvert.cpp18
3 files changed, 18 insertions, 10 deletions
diff --git a/xfa/src/fgas/src/crt/fx_system.cpp b/xfa/src/fgas/src/crt/fx_system.cpp
index b08236bb1d..b11fcd271e 100644
--- a/xfa/src/fgas/src/crt/fx_system.cpp
+++ b/xfa/src/fgas/src/crt/fx_system.cpp
@@ -86,8 +86,8 @@ FX_FLOAT FX_strtof(const FX_CHAR* pcsStr, int32_t iLength, int32_t* pUsedLen) {
if (iLength < 0) {
iLength = FXSYS_strlen(pcsStr);
}
- return FX_wcstof(CFX_WideString::FromLocal(pcsStr, iLength), iLength,
- pUsedLen);
+ return FX_wcstof(CFX_WideString::FromLocal(CFX_ByteString(pcsStr, iLength)),
+ iLength, pUsedLen);
}
FX_FLOAT FX_wcstof(const FX_WCHAR* pwsStr, int32_t iLength, int32_t* pUsedLen) {
FXSYS_assert(pwsStr != NULL);
diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp
index 4b69a5bbed..072d351a3a 100644
--- a/xfa/src/fgas/src/localization/fx_locale.cpp
+++ b/xfa/src/fgas/src/localization/fx_locale.cpp
@@ -4828,11 +4828,11 @@ CFX_Decimal::CFX_Decimal(const CFX_WideStringC& strObj) {
}
m_uFlags = FXMATH_DECIMAL_MAKEFLAGS(negmet && IsNotZero(), scale);
}
+
CFX_Decimal::CFX_Decimal(const CFX_ByteStringC& strObj) {
- CFX_WideString wstrObj;
- wstrObj.ConvertFrom(strObj);
- *this = CFX_Decimal(wstrObj);
+ *this = CFX_Decimal(CFX_WideString::FromLocal(strObj));
}
+
CFX_Decimal::operator CFX_WideString() const {
CFX_WideString retString;
CFX_WideString tmpbuf;
diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp
index 8b01512ef1..280d3a73b6 100644
--- a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp
+++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp
@@ -6,25 +6,31 @@
#include "barcode.h"
#include "BC_UtilCodingConvert.h"
+
CBC_UtilCodingConvert::CBC_UtilCodingConvert() {}
+
CBC_UtilCodingConvert::~CBC_UtilCodingConvert() {}
+
void CBC_UtilCodingConvert::UnicodeToLocale(const CFX_WideString& src,
CFX_ByteString& dst) {
- dst.ConvertFrom(src);
+ dst = CFX_ByteString::FromUnicode(src);
}
+
void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src,
CFX_ByteString& dst) {
- CFX_WideString unicode = CFX_WideString::FromLocal(src, src.GetLength());
+ CFX_WideString unicode = CFX_WideString::FromLocal(src);
dst = unicode.UTF8Encode();
}
+
void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src,
CFX_ByteArray& dst) {
- CFX_WideString unicode = CFX_WideString::FromLocal(src, src.GetLength());
+ CFX_WideString unicode = CFX_WideString::FromLocal(src);
CFX_ByteString utf8 = unicode.UTF8Encode();
for (int32_t i = 0; i < utf8.GetLength(); i++) {
dst.Add(utf8[i]);
}
}
+
void CBC_UtilCodingConvert::Utf8ToLocale(const CFX_ByteArray& src,
CFX_ByteString& dst) {
CFX_ByteString utf8;
@@ -32,14 +38,16 @@ void CBC_UtilCodingConvert::Utf8ToLocale(const CFX_ByteArray& src,
utf8 += src[i];
}
CFX_WideString unicode = CFX_WideString::FromUTF8(utf8, utf8.GetLength());
- dst.ConvertFrom(unicode);
+ dst = CFX_ByteString::FromUnicode(unicode);
}
+
void CBC_UtilCodingConvert::Utf8ToLocale(const uint8_t* src,
int32_t count,
CFX_ByteString& dst) {
CFX_WideString unicode = CFX_WideString::FromUTF8((const char*)src, count);
- dst.ConvertFrom(unicode);
+ dst = CFX_ByteString::FromUnicode(unicode);
}
+
void CBC_UtilCodingConvert::UnicodeToUTF8(const CFX_WideString& src,
CFX_ByteString& dst) {
dst = src.UTF8Encode();