| Index: core/fpdfdoc/doc_formcontrol.cpp
|
| diff --git a/core/fpdfdoc/doc_formcontrol.cpp b/core/fpdfdoc/doc_formcontrol.cpp
|
| index 6435cfd76c79da34cbea28624519248a191034cf..1fef183d80c3b6286a1c64af79a62faf47338ce0 100644
|
| --- a/core/fpdfdoc/doc_formcontrol.cpp
|
| +++ b/core/fpdfdoc/doc_formcontrol.cpp
|
| @@ -78,7 +78,7 @@ void CPDF_FormControl::SetOnStateName(const CFX_ByteString& csOn) {
|
| continue;
|
| }
|
| if (csKey2 != "Off") {
|
| - pSubDict->ReplaceKey(csKey2.AsByteStringC(), csValue.AsByteStringC());
|
| + pSubDict->ReplaceKey(csKey2.AsStringC(), csValue.AsStringC());
|
| break;
|
| }
|
| }
|
| @@ -202,7 +202,7 @@ CPDF_ApSettings CPDF_FormControl::GetMK() const {
|
| }
|
|
|
| bool CPDF_FormControl::HasMKEntry(CFX_ByteString csEntry) const {
|
| - return GetMK().HasMKEntry(csEntry.AsByteStringC());
|
| + return GetMK().HasMKEntry(csEntry.AsStringC());
|
| }
|
|
|
| int CPDF_FormControl::GetRotation() {
|
| @@ -210,24 +210,24 @@ int CPDF_FormControl::GetRotation() {
|
| }
|
|
|
| FX_ARGB CPDF_FormControl::GetColor(int& iColorType, CFX_ByteString csEntry) {
|
| - return GetMK().GetColor(iColorType, csEntry.AsByteStringC());
|
| + return GetMK().GetColor(iColorType, csEntry.AsStringC());
|
| }
|
|
|
| FX_FLOAT CPDF_FormControl::GetOriginalColor(int index, CFX_ByteString csEntry) {
|
| - return GetMK().GetOriginalColor(index, csEntry.AsByteStringC());
|
| + return GetMK().GetOriginalColor(index, csEntry.AsStringC());
|
| }
|
|
|
| void CPDF_FormControl::GetOriginalColor(int& iColorType,
|
| FX_FLOAT fc[4],
|
| CFX_ByteString csEntry) {
|
| - GetMK().GetOriginalColor(iColorType, fc, csEntry.AsByteStringC());
|
| + GetMK().GetOriginalColor(iColorType, fc, csEntry.AsStringC());
|
| }
|
| CFX_WideString CPDF_FormControl::GetCaption(CFX_ByteString csEntry) {
|
| - return GetMK().GetCaption(csEntry.AsByteStringC());
|
| + return GetMK().GetCaption(csEntry.AsStringC());
|
| }
|
|
|
| CPDF_Stream* CPDF_FormControl::GetIcon(CFX_ByteString csEntry) {
|
| - return GetMK().GetIcon(csEntry.AsByteStringC());
|
| + return GetMK().GetIcon(csEntry.AsStringC());
|
| }
|
|
|
| CPDF_IconFit CPDF_FormControl::GetIconFit() {
|
| @@ -286,8 +286,7 @@ CPDF_Font* CPDF_FormControl::GetDefaultControlFont() {
|
| if (CPDF_Dictionary* pDict = ToDictionary(pObj)) {
|
| CPDF_Dictionary* pFonts = pDict->GetDictBy("Font");
|
| if (pFonts) {
|
| - CPDF_Dictionary* pElement =
|
| - pFonts->GetDictBy(csFontNameTag.AsByteStringC());
|
| + CPDF_Dictionary* pElement = pFonts->GetDictBy(csFontNameTag.AsStringC());
|
| if (pElement) {
|
| CPDF_Font* pFont = m_pField->m_pForm->m_pDocument->LoadFont(pElement);
|
| if (pFont) {
|
| @@ -304,8 +303,7 @@ CPDF_Font* CPDF_FormControl::GetDefaultControlFont() {
|
| if (CPDF_Dictionary* pDict = ToDictionary(pObj)) {
|
| CPDF_Dictionary* pFonts = pDict->GetDictBy("Font");
|
| if (pFonts) {
|
| - CPDF_Dictionary* pElement =
|
| - pFonts->GetDictBy(csFontNameTag.AsByteStringC());
|
| + CPDF_Dictionary* pElement = pFonts->GetDictBy(csFontNameTag.AsStringC());
|
| if (pElement) {
|
| CPDF_Font* pFont = m_pField->m_pForm->m_pDocument->LoadFont(pElement);
|
| if (pFont) {
|
|
|