diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-14 16:58:33 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 16:58:33 -0800 |
| commit | d983b09c3ae29a97cba8e9ec9c6351545f6087ee (patch) | |
| tree | 5641a4bc6eddaa8069904c29c3e3897043411646 /core/src/fpdfdoc/doc_formcontrol.cpp | |
| parent | f86d3f946e2f1977c7eaea01dcb9d7ecb3064cd1 (diff) | |
| download | pdfium-d983b09c3ae29a97cba8e9ec9c6351545f6087ee.tar.xz | |
Merge to XFA: Remove FX_BSTRC.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1521563002 .
(cherry picked from commit 1956a174020686f91cd3b34294e91f4560fe45aa)
Review URL: https://codereview.chromium.org/1526823002 .
Diffstat (limited to 'core/src/fpdfdoc/doc_formcontrol.cpp')
| -rw-r--r-- | core/src/fpdfdoc/doc_formcontrol.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/src/fpdfdoc/doc_formcontrol.cpp b/core/src/fpdfdoc/doc_formcontrol.cpp index 9bdf13bf85..0d2f9905d9 100644 --- a/core/src/fpdfdoc/doc_formcontrol.cpp +++ b/core/src/fpdfdoc/doc_formcontrol.cpp @@ -191,7 +191,7 @@ CPDF_FormControl::HighlightingMode CPDF_FormControl::GetHighlightingMode() { } CPDF_ApSettings CPDF_FormControl::GetMK() const { - return CPDF_ApSettings(m_pWidgetDict ? m_pWidgetDict->GetDict(FX_BSTRC("MK")) + return CPDF_ApSettings(m_pWidgetDict ? m_pWidgetDict->GetDict("MK") : nullptr); } @@ -330,7 +330,7 @@ bool CPDF_ApSettings::HasMKEntry(const CFX_ByteStringC& csEntry) const { } int CPDF_ApSettings::GetRotation() const { - return m_pDict ? m_pDict->GetInteger(FX_BSTRC("R")) : 0; + return m_pDict ? m_pDict->GetInteger("R") : 0; } FX_ARGB CPDF_ApSettings::GetColor(int& iColorType, @@ -421,10 +421,9 @@ CPDF_Stream* CPDF_ApSettings::GetIcon(const CFX_ByteStringC& csEntry) const { } CPDF_IconFit CPDF_ApSettings::GetIconFit() const { - return m_pDict ? m_pDict->GetDict(FX_BSTRC("IF")) : nullptr; + return m_pDict ? m_pDict->GetDict("IF") : nullptr; } int CPDF_ApSettings::GetTextPosition() const { - return m_pDict ? m_pDict->GetInteger(FX_BSTRC("TP"), TEXTPOS_CAPTION) - : TEXTPOS_CAPTION; + return m_pDict ? m_pDict->GetInteger("TP", TEXTPOS_CAPTION) : TEXTPOS_CAPTION; } |