diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-08 12:20:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-08 12:20:39 -0700 |
| commit | 4c3debb3c91f5842784be30a911b52cdabcab7df (patch) | |
| tree | e0534dcb43a71376be8da0b376a97de37080ecc5 /core/fpdfdoc/doc_formcontrol.cpp | |
| parent | f172290a8dc527cd8bc73b0d0ad59e78797968c1 (diff) | |
| download | pdfium-4c3debb3c91f5842784be30a911b52cdabcab7df.tar.xz | |
Rename both As{Byte,Wide}StringC() helpers to AsStringC().
The naming is redundant given the base type, and will stand
in the way of consolidating Byte and Wide code.
BUG=
Review URL: https://codereview.chromium.org/1862123003
Diffstat (limited to 'core/fpdfdoc/doc_formcontrol.cpp')
| -rw-r--r-- | core/fpdfdoc/doc_formcontrol.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/core/fpdfdoc/doc_formcontrol.cpp b/core/fpdfdoc/doc_formcontrol.cpp index 6435cfd76c..1fef183d80 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) { |