diff options
| author | dan sinclair <dsinclair@chromium.org> | 2016-11-24 10:45:29 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2016-11-24 16:34:32 +0000 |
| commit | 0354ccf37f05f25b1bf64fd60bb3b48efab4d7d0 (patch) | |
| tree | 378745e450e4f02128ab6766d6ca71bd0b27f4ab /xfa/fde/cfde_txtedtbuf.cpp | |
| parent | 41ba08e5552c2eccad0c34024dc680feb3f2b251 (diff) | |
| download | pdfium-0354ccf37f05f25b1bf64fd60bb3b48efab4d7d0.tar.xz | |
Change TxtEdtEngine to return CFX_WideStringchromium/2935chromium/2934chromium/2933chromium/2932
This Cl updates the TxtEdtEngine and TxtEdtBuf to return CFX_WideStrings on
a Get instead of taking an out param. The change is propagated out through
the various Get methods that call into the edit engine.
Change-Id: Iccf10a8ee06678ae3b59f3afd6e65308dacd16bd
Reviewed-on: https://pdfium-review.googlesource.com/2070
Commit-Queue: ooo 11-24 -- 12-05 (dsinclair) <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'xfa/fde/cfde_txtedtbuf.cpp')
| -rw-r--r-- | xfa/fde/cfde_txtedtbuf.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xfa/fde/cfde_txtedtbuf.cpp b/xfa/fde/cfde_txtedtbuf.cpp index b01081e3c9..94383c261c 100644 --- a/xfa/fde/cfde_txtedtbuf.cpp +++ b/xfa/fde/cfde_txtedtbuf.cpp @@ -67,8 +67,8 @@ void CFDE_TxtEdtBuf::SetText(const CFX_WideString& wsText) { m_bChanged = true; } -void CFDE_TxtEdtBuf::GetText(CFX_WideString& wsText) const { - GetRange(wsText, 0, m_nTotal); +CFX_WideString CFDE_TxtEdtBuf::GetText() const { + return GetRange(0, m_nTotal); } FX_WCHAR CFDE_TxtEdtBuf::GetCharByIndex(int32_t nIndex) const { @@ -88,13 +88,13 @@ FX_WCHAR CFDE_TxtEdtBuf::GetCharByIndex(int32_t nIndex) const { return pChunkHeader->wChars[pChunkHeader->nUsed - (nTotal - nIndex)]; } -void CFDE_TxtEdtBuf::GetRange(CFX_WideString& wsText, - int32_t nBegin, - int32_t nLength) const { +CFX_WideString CFDE_TxtEdtBuf::GetRange(int32_t nBegin, int32_t nLength) const { FDE_CHUNKPLACE cp; Index2CP(nBegin, cp); int32_t nLeave = nLength; int32_t nCount = m_Chunks.GetSize(); + + CFX_WideString wsText; FX_WCHAR* lpDstBuf = wsText.GetBuffer(nLength); int32_t nChunkIndex = cp.nChunkIndex; FDE_CHUNKHEADER* lpChunkHeader = m_Chunks[nChunkIndex]; @@ -116,6 +116,8 @@ void CFDE_TxtEdtBuf::GetRange(CFX_WideString& wsText, nCopyLength = lpChunkHeader->nUsed; } wsText.ReleaseBuffer(); + + return wsText; } void CFDE_TxtEdtBuf::Insert(int32_t nPos, |