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/reflow | |
parent | e4503ea9947d2f9c61704da20271b413a364a9c0 (diff) | |
download | pdfium-6f0a64a1bf18ab6636404cdfb883897459083a4d.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/reflow')
-rw-r--r-- | core/src/reflow/layoutprovider_taggedpdf.cpp | 4 | ||||
-rw-r--r-- | core/src/reflow/layoutprovider_taggedpdf.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/reflow/layoutprovider_taggedpdf.cpp b/core/src/reflow/layoutprovider_taggedpdf.cpp index 4a5a22bd61..57ce4303e2 100644 --- a/core/src/reflow/layoutprovider_taggedpdf.cpp +++ b/core/src/reflow/layoutprovider_taggedpdf.cpp @@ -21,7 +21,7 @@ CPDF_LayoutElement::~CPDF_LayoutElement() } m_ChildArray.RemoveAll(); } -LayoutType CPDF_LayoutElement::ConvertLayoutType(FX_BSTR name) +LayoutType CPDF_LayoutElement::ConvertLayoutType(const CFX_ByteStringC& name) { if(name == (const char*)("Document")) { return LayoutDocument; @@ -127,7 +127,7 @@ LayoutType CPDF_LayoutElement::ConvertLayoutType(FX_BSTR name) } CFX_ByteStringC CPDF_LayoutElement::ConvertLayoutType(LayoutType type) { - FX_BSTR name = ""; + const CFX_ByteStringC& name = ""; if(type == LayoutArifact) { return "Arifact"; } else if( type == LayoutDocument) { diff --git a/core/src/reflow/layoutprovider_taggedpdf.h b/core/src/reflow/layoutprovider_taggedpdf.h index 3e11f17067..fa6c994bf0 100644 --- a/core/src/reflow/layoutprovider_taggedpdf.h +++ b/core/src/reflow/layoutprovider_taggedpdf.h @@ -36,7 +36,7 @@ public: CPDF_StructElement* m_pTaggedElement; CPDF_LayoutElement* m_pParentElement; CFX_PtrArray m_ChildArray; - LayoutType ConvertLayoutType(FX_BSTR name); + LayoutType ConvertLayoutType(const CFX_ByteStringC& name); CFX_ByteStringC ConvertLayoutType(LayoutType type); CFX_ByteStringC ConvertLayoutAttr(LayoutAttr attr); LayoutEnum ConvertLayoutEnum(CFX_ByteStringC Enum); |