summaryrefslogtreecommitdiff
path: root/core/include/fpdfdoc
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-12-14 16:58:33 -0800
committerLei Zhang <thestig@chromium.org>2015-12-14 16:58:33 -0800
commitd983b09c3ae29a97cba8e9ec9c6351545f6087ee (patch)
tree5641a4bc6eddaa8069904c29c3e3897043411646 /core/include/fpdfdoc
parentf86d3f946e2f1977c7eaea01dcb9d7ecb3064cd1 (diff)
downloadpdfium-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/include/fpdfdoc')
-rw-r--r--core/include/fpdfdoc/fpdf_doc.h26
1 files changed, 12 insertions, 14 deletions
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 07f735e21b..52be0dba0f 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -1099,42 +1099,40 @@ class CPDF_ApSettings {
int GetRotation() const;
FX_ARGB GetBorderColor(int& iColorType) const {
- return GetColor(iColorType, FX_BSTRC("BC"));
+ return GetColor(iColorType, "BC");
}
FX_FLOAT GetOriginalBorderColor(int index) const {
- return GetOriginalColor(index, FX_BSTRC("BC"));
+ return GetOriginalColor(index, "BC");
}
void GetOriginalBorderColor(int& iColorType, FX_FLOAT fc[4]) const {
- GetOriginalColor(iColorType, fc, FX_BSTRC("BC"));
+ GetOriginalColor(iColorType, fc, "BC");
}
FX_ARGB GetBackgroundColor(int& iColorType) const {
- return GetColor(iColorType, FX_BSTRC("BG"));
+ return GetColor(iColorType, "BG");
}
FX_FLOAT GetOriginalBackgroundColor(int index) const {
- return GetOriginalColor(index, FX_BSTRC("BG"));
+ return GetOriginalColor(index, "BG");
}
void GetOriginalBackgroundColor(int& iColorType, FX_FLOAT fc[4]) const {
- GetOriginalColor(iColorType, fc, FX_BSTRC("BG"));
+ GetOriginalColor(iColorType, fc, "BG");
}
- CFX_WideString GetNormalCaption() const { return GetCaption(FX_BSTRC("CA")); }
+ CFX_WideString GetNormalCaption() const { return GetCaption("CA"); }
- CFX_WideString GetRolloverCaption() const {
- return GetCaption(FX_BSTRC("RC"));
- }
+ CFX_WideString GetRolloverCaption() const { return GetCaption("RC"); }
- CFX_WideString GetDownCaption() const { return GetCaption(FX_BSTRC("AC")); }
+ CFX_WideString GetDownCaption() const { return GetCaption("AC"); }
- CPDF_Stream* GetNormalIcon() const { return GetIcon(FX_BSTRC("I")); }
+ CPDF_Stream* GetNormalIcon() const { return GetIcon("I"); }
- CPDF_Stream* GetRolloverIcon() const { return GetIcon(FX_BSTRC("RI")); }
+ CPDF_Stream* GetRolloverIcon() const { return GetIcon("RI"); }
- CPDF_Stream* GetDownIcon() const { return GetIcon(FX_BSTRC("IX")); }
+ CPDF_Stream* GetDownIcon() const { return GetIcon("IX"); }
CPDF_IconFit GetIconFit() const;