diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-02 16:23:34 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-03 13:24:51 +0000 |
| commit | 69c743ff1034fc127fabfb9cc6fdb90dc7904e7d (patch) | |
| tree | 63cb354d871b17f0f75f2f5214d45933757b7f4d | |
| parent | cadb4711bdc9cb99113aad2acdbc47711f065626 (diff) | |
| download | pdfium-69c743ff1034fc127fabfb9cc6fdb90dc7904e7d.tar.xz | |
XFA Nits: Dead CreateCharIter(), auto CFXJSE_Value unique ptr.
Change-Id: I2525684dd5662ef9cb95f63a68443faa97f4e25b
Reviewed-on: https://pdfium-review.googlesource.com/4812
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
| -rw-r--r-- | xfa/fde/cfde_txtedtengine.cpp | 6 | ||||
| -rw-r--r-- | xfa/fde/cfde_txtedtengine.h | 1 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_widgetacc.cpp | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/xfa/fde/cfde_txtedtengine.cpp b/xfa/fde/cfde_txtedtengine.cpp index 762c16f4c9..7bd9259b5f 100644 --- a/xfa/fde/cfde_txtedtengine.cpp +++ b/xfa/fde/cfde_txtedtengine.cpp @@ -681,12 +681,6 @@ CFDE_TxtEdtParag* CFDE_TxtEdtEngine::GetParag(int32_t nParagIndex) const { return m_ParagPtrArray[nParagIndex].get(); } -IFX_CharIter* CFDE_TxtEdtEngine::CreateCharIter() { - if (!m_pTxtBuf) - return nullptr; - return new CFDE_TxtEdtBuf::Iterator(m_pTxtBuf.get()); -} - int32_t CFDE_TxtEdtEngine::Line2Parag(int32_t nStartParag, int32_t nStartLineofParag, int32_t nLineIndex, diff --git a/xfa/fde/cfde_txtedtengine.h b/xfa/fde/cfde_txtedtengine.h index 4a54c6df98..3166f1854c 100644 --- a/xfa/fde/cfde_txtedtengine.h +++ b/xfa/fde/cfde_txtedtengine.h @@ -73,7 +73,6 @@ class CFDE_TxtEdtEngine { int32_t CountParags() const; CFDE_TxtEdtParag* GetParag(int32_t nParagIndex) const; - IFX_CharIter* CreateCharIter(); CFDE_TxtEdtBuf* GetTextBuf() const; int32_t GetTextBufLength() const; CFX_TxtBreak* GetTextBreak() const; diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index 23327b7691..3e369d60e3 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -626,8 +626,7 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script, pEventParam->m_eType == XFA_EVENT_Calculate) { pContext->SetNodesOfRunScript(&refNodes); } - std::unique_ptr<CFXJSE_Value> pTmpRetValue( - new CFXJSE_Value(pContext->GetRuntime())); + auto pTmpRetValue = pdfium::MakeUnique<CFXJSE_Value>(pContext->GetRuntime()); ++m_nRecursionDepth; bool bRet = pContext->RunScript((XFA_SCRIPTLANGTYPE)eScriptType, wsExpression.AsStringC(), pTmpRetValue.get(), |