Index: fpdfsdk/pdfwindow/PWL_Edit.cpp |
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp |
index e836594378ca91c838e6d8757e545b1b02f2e8b7..f75aa53a5407fbd08043348b0c5276bc53eb2386 100644 |
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp |
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp |
@@ -260,7 +260,7 @@ void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { |
case PBS_SOLID: { |
sLine << "q\n" << GetBorderWidth() << " w\n" |
<< CPWL_Utils::GetColorAppStream(GetBorderColor(), FALSE) |
- .AsByteStringC() |
+ .AsStringC() |
<< " 2 J 0 j\n"; |
for (int32_t i = 1; i < nCharArray; i++) { |
@@ -277,7 +277,7 @@ void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { |
case PBS_DASH: { |
sLine << "q\n" << GetBorderWidth() << " w\n" |
<< CPWL_Utils::GetColorAppStream(GetBorderColor(), FALSE) |
- .AsByteStringC() |
+ .AsStringC() |
<< " 2 J 0 j\n" |
<< "[" << GetBorderDash().nDash << " " << GetBorderDash().nGap |
<< "] " << GetBorderDash().nPhase << " d\n"; |
@@ -315,9 +315,8 @@ void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { |
CPWL_Utils::GetEditSelAppStream(m_pEdit, ptOffset, &wrTemp); |
if (sEditSel.GetLength() > 0) |
- sText << CPWL_Utils::GetColorAppStream(PWL_DEFAULT_SELBACKCOLOR) |
- .AsByteStringC() |
- << sEditSel.AsByteStringC(); |
+ sText << CPWL_Utils::GetColorAppStream(PWL_DEFAULT_SELBACKCOLOR).AsStringC() |
+ << sEditSel.AsStringC(); |
wrTemp = CPWL_Utils::OverlapWordRange(wrVisible, wrSelBefore); |
CFX_ByteString sEditBefore = CPWL_Utils::GetEditAppStream( |
@@ -325,9 +324,8 @@ void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { |
m_pEdit->GetPasswordChar()); |
if (sEditBefore.GetLength() > 0) |
- sText << "BT\n" |
- << CPWL_Utils::GetColorAppStream(GetTextColor()).AsByteStringC() |
- << sEditBefore.AsByteStringC() << "ET\n"; |
+ sText << "BT\n" << CPWL_Utils::GetColorAppStream(GetTextColor()).AsStringC() |
+ << sEditBefore.AsStringC() << "ET\n"; |
wrTemp = CPWL_Utils::OverlapWordRange(wrVisible, wrSelect); |
CFX_ByteString sEditMid = CPWL_Utils::GetEditAppStream( |
@@ -337,8 +335,8 @@ void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { |
if (sEditMid.GetLength() > 0) |
sText << "BT\n" |
<< CPWL_Utils::GetColorAppStream(CPWL_Color(COLORTYPE_GRAY, 1)) |
- .AsByteStringC() |
- << sEditMid.AsByteStringC() << "ET\n"; |
+ .AsStringC() |
+ << sEditMid.AsStringC() << "ET\n"; |
wrTemp = CPWL_Utils::OverlapWordRange(wrVisible, wrSelAfter); |
CFX_ByteString sEditAfter = CPWL_Utils::GetEditAppStream( |
@@ -346,9 +344,8 @@ void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { |
m_pEdit->GetPasswordChar()); |
if (sEditAfter.GetLength() > 0) |
- sText << "BT\n" |
- << CPWL_Utils::GetColorAppStream(GetTextColor()).AsByteStringC() |
- << sEditAfter.AsByteStringC() << "ET\n"; |
+ sText << "BT\n" << CPWL_Utils::GetColorAppStream(GetTextColor()).AsStringC() |
+ << sEditAfter.AsStringC() << "ET\n"; |
if (sText.GetLength() > 0) { |
CFX_FloatRect rcClient = GetClientRect(); |
@@ -707,9 +704,8 @@ CFX_ByteString CPWL_Edit::GetTextAppearanceStream( |
CFX_ByteString sEdit = CPWL_Utils::GetEditAppStream(m_pEdit, ptOffset); |
if (sEdit.GetLength() > 0) { |
- sRet << "BT\n" |
- << CPWL_Utils::GetColorAppStream(GetTextColor()).AsByteStringC() |
- << sEdit.AsByteStringC() << "ET\n"; |
+ sRet << "BT\n" << CPWL_Utils::GetColorAppStream(GetTextColor()).AsStringC() |
+ << sEdit.AsStringC() << "ET\n"; |
} |
return sRet.GetByteString(); |