diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 16:51:15 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 16:51:15 -0700 |
| commit | 6f0a64a1bf18ab6636404cdfb883897459083a4d (patch) | |
| tree | 1ef1326c8bb015213e0cdf0d726a27a537d09c73 /core/src/fpdfdoc/doc_formcontrol.cpp | |
| parent | e4503ea9947d2f9c61704da20271b413a364a9c0 (diff) | |
| download | pdfium-chromium/2430.tar.xz | |
Remove FX_BSTR and FX_WSTR typedefs.chromium/2434chromium/2433chromium/2432chromium/2431chromium/2430
These stand for const CFX_{Byte,Wide}StringC&, which is just
monumentally confusing, since there are so many string types
running around here.
The following had manual changes:
core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp
core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
core/src/fpdfdoc/doc_form.cpp
fpdfsdk/src/fpdf_ext.cpp
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1180593004.
Diffstat (limited to 'core/src/fpdfdoc/doc_formcontrol.cpp')
| -rw-r--r-- | core/src/fpdfdoc/doc_formcontrol.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/src/fpdfdoc/doc_formcontrol.cpp b/core/src/fpdfdoc/doc_formcontrol.cpp index 1ab63234d6..da28a0b824 100644 --- a/core/src/fpdfdoc/doc_formcontrol.cpp +++ b/core/src/fpdfdoc/doc_formcontrol.cpp @@ -339,7 +339,7 @@ int CPDF_FormControl::GetControlAlignment() return pObj->GetInteger(); } } -FX_BOOL CPDF_ApSettings::HasMKEntry(FX_BSTR csEntry) +FX_BOOL CPDF_ApSettings::HasMKEntry(const CFX_ByteStringC& csEntry) { if (m_pDict == NULL) { return FALSE; @@ -353,7 +353,7 @@ int CPDF_ApSettings::GetRotation() } return m_pDict->GetInteger(FX_BSTRC("R")); } -FX_ARGB CPDF_ApSettings::GetColor(int& iColorType, FX_BSTR csEntry) +FX_ARGB CPDF_ApSettings::GetColor(int& iColorType, const CFX_ByteStringC& csEntry) { iColorType = COLORTYPE_TRANSPARENT; if (m_pDict == NULL) { @@ -388,7 +388,7 @@ FX_ARGB CPDF_ApSettings::GetColor(int& iColorType, FX_BSTR csEntry) } return color; } -FX_FLOAT CPDF_ApSettings::GetOriginalColor(int index, FX_BSTR csEntry) +FX_FLOAT CPDF_ApSettings::GetOriginalColor(int index, const CFX_ByteStringC& csEntry) { if (m_pDict == NULL) { return 0; @@ -399,7 +399,7 @@ FX_FLOAT CPDF_ApSettings::GetOriginalColor(int index, FX_BSTR csEntry) } return 0; } -void CPDF_ApSettings::GetOriginalColor(int& iColorType, FX_FLOAT fc[4], FX_BSTR csEntry) +void CPDF_ApSettings::GetOriginalColor(int& iColorType, FX_FLOAT fc[4], const CFX_ByteStringC& csEntry) { iColorType = COLORTYPE_TRANSPARENT; for (int i = 0; i < 4; i ++) { @@ -429,7 +429,7 @@ void CPDF_ApSettings::GetOriginalColor(int& iColorType, FX_FLOAT fc[4], FX_BSTR fc[3] = pEntry->GetNumber(3); } } -CFX_WideString CPDF_ApSettings::GetCaption(FX_BSTR csEntry) +CFX_WideString CPDF_ApSettings::GetCaption(const CFX_ByteStringC& csEntry) { CFX_WideString csCaption; if (m_pDict == NULL) { @@ -437,7 +437,7 @@ CFX_WideString CPDF_ApSettings::GetCaption(FX_BSTR csEntry) } return m_pDict->GetUnicodeText(csEntry); } -CPDF_Stream* CPDF_ApSettings::GetIcon(FX_BSTR csEntry) +CPDF_Stream* CPDF_ApSettings::GetIcon(const CFX_ByteStringC& csEntry) { if (m_pDict == NULL) { return NULL; |