diff options
| author | tsepez <tsepez@chromium.org> | 2016-05-13 17:21:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-13 17:21:31 -0700 |
| commit | afe94306e3c542f0d499e7f7706ee5dec4028d8a (patch) | |
| tree | 5012c9356cf1af259c74da3008dc7fcad439db2a /core/fpdftext | |
| parent | 01e624fb699af3a8ee2f81620d59d366dac18f29 (diff) | |
| download | pdfium-afe94306e3c542f0d499e7f7706ee5dec4028d8a.tar.xz | |
Make CFX_WideString(const CFX_WideString&) explicit.
BUG=
Review-Url: https://codereview.chromium.org/1979723003
Diffstat (limited to 'core/fpdftext')
| -rw-r--r-- | core/fpdftext/fpdf_text_int.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/fpdftext/fpdf_text_int.cpp b/core/fpdftext/fpdf_text_int.cpp index f843da3061..136c44b5ed 100644 --- a/core/fpdftext/fpdf_text_int.cpp +++ b/core/fpdftext/fpdf_text_int.cpp @@ -537,7 +537,8 @@ CFX_WideString CPDF_TextPage::GetPageText(int start, int nCount) const { if (nCount == -1) { nCount = pdfium::CollectionSize<int>(m_CharList) - start; - return m_TextBuf.AsStringC().Mid(start, m_TextBuf.AsStringC().GetLength()); + return CFX_WideString( + m_TextBuf.AsStringC().Mid(start, m_TextBuf.AsStringC().GetLength())); } if (nCount <= 0 || m_CharList.empty()) { return L""; @@ -574,7 +575,7 @@ CFX_WideString CPDF_TextPage::GetPageText(int start, int nCount) const { if (nCount <= 0) { return L""; } - return m_TextBuf.AsStringC().Mid(startindex, nCount); + return CFX_WideString(m_TextBuf.AsStringC().Mid(startindex, nCount)); } int CPDF_TextPage::CountRects(int start, int nCount) { @@ -890,7 +891,7 @@ void CPDF_TextPage::CloseTempLine() { if (m_TempCharList.empty()) return; - CFX_WideString str = m_TempTextBuf.AsStringC(); + CFX_WideString str = m_TempTextBuf.MakeString(); FX_BOOL bPrevSpace = FALSE; for (int i = 0; i < str.GetLength(); i++) { if (str.GetAt(i) != ' ') { @@ -1299,7 +1300,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj) { charinfo.m_OriginY = 0; pTextObj->GetItemInfo(i, &item); if (item.m_CharCode == (uint32_t)-1) { - CFX_WideString str = m_TempTextBuf.AsStringC(); + CFX_WideString str = m_TempTextBuf.MakeString(); if (str.IsEmpty()) { str = m_TextBuf.AsStringC(); } @@ -1435,7 +1436,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj) { m_TempCharList.push_back(charinfo); } } else if (i == 0) { - CFX_WideString str = m_TempTextBuf.AsStringC(); + CFX_WideString str = m_TempTextBuf.MakeString(); if (!str.IsEmpty() && str.GetAt(str.GetLength() - 1) == TEXT_BLANK_CHAR) { m_TempTextBuf.Delete(m_TempTextBuf.GetLength() - 1, 1); @@ -1478,7 +1479,7 @@ int32_t CPDF_TextPage::GetTextObjectWritingMode( return m_TextlineDir; } FX_BOOL CPDF_TextPage::IsHyphen(FX_WCHAR curChar) { - CFX_WideString strCurText = m_TempTextBuf.AsStringC(); + CFX_WideString strCurText = m_TempTextBuf.MakeString(); if (strCurText.GetLength() == 0) { strCurText = m_TextBuf.AsStringC(); } |