diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 17:38:11 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 17:38:11 -0700 |
commit | ca3ac5e9ffc936066267fbb1c329e5297d8e23e6 (patch) | |
tree | 986e666023ae0eec649051613d83c6c60ef3dac0 /core/include/fpdfdoc/fpdf_tagged.h | |
parent | 0aa0e7331b3512066df3e33d6642456a0de63de7 (diff) | |
download | pdfium-ca3ac5e9ffc936066267fbb1c329e5297d8e23e6.tar.xz |
Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
Nearly automatic merge + re-run script on new files.
Original Review URL: https://codereview.chromium.org/1180593004.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1174303002.
Diffstat (limited to 'core/include/fpdfdoc/fpdf_tagged.h')
-rw-r--r-- | core/include/fpdfdoc/fpdf_tagged.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/include/fpdfdoc/fpdf_tagged.h b/core/include/fpdfdoc/fpdf_tagged.h index 4943ad0ce6..58f613bf96 100644 --- a/core/include/fpdfdoc/fpdf_tagged.h +++ b/core/include/fpdfdoc/fpdf_tagged.h @@ -85,17 +85,17 @@ public: virtual CFX_PtrArray* GetObjectArray() = 0; - virtual CPDF_Object* GetAttr(FX_BSTR owner, FX_BSTR name, FX_BOOL bInheritable = FALSE, FX_FLOAT fLevel = 0.0F) = 0; + virtual CPDF_Object* GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable = FALSE, FX_FLOAT fLevel = 0.0F) = 0; - virtual CFX_ByteString GetName(FX_BSTR owner, FX_BSTR name, FX_BSTR default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0; + virtual CFX_ByteString GetName(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, const CFX_ByteStringC& default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0; - virtual FX_ARGB GetColor(FX_BSTR owner, FX_BSTR name, FX_ARGB default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0; + virtual FX_ARGB GetColor(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_ARGB default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0; - virtual FX_FLOAT GetNumber(FX_BSTR owner, FX_BSTR name, FX_FLOAT default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0; + virtual FX_FLOAT GetNumber(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_FLOAT default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0; - virtual int GetInteger(FX_BSTR owner, FX_BSTR name, int default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0; + virtual int GetInteger(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, int default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0; }; |