summaryrefslogtreecommitdiff
path: root/core/src/fpdftext
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-05-08 13:52:49 -0700
committerLei Zhang <thestig@chromium.org>2015-05-08 13:52:49 -0700
commitea7b333c73ea3e1847e79cabdd85853af67d6d6c (patch)
tree4f04b9ab62d02b4a3050d914008260611ea575c8 /core/src/fpdftext
parenteff208f03dc7ea7606a3dc03150291f264147d60 (diff)
downloadpdfium-ea7b333c73ea3e1847e79cabdd85853af67d6d6c.tar.xz
Merge to XFA: Fix a bunch of -Wunused-but-set-variable warnings.
Also fix a few nits and other errors along the way. Review URL: https://codereview.chromium.org/1098583002 Review URL: https://codereview.chromium.org/1135713004 (cherry picked from commit f0a169e6fd5718995fa6ef8749c8d16cdad84985) (cherry picked from commit 470408c2ffe71e99cebad0d1d6887f1723f02cef) R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1133453006
Diffstat (limited to 'core/src/fpdftext')
-rw-r--r--core/src/fpdftext/fpdf_text.cpp1
-rw-r--r--core/src/fpdftext/fpdf_text_int.cpp7
2 files changed, 0 insertions, 8 deletions
diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp
index d6d6de9a83..e1902a3764 100644
--- a/core/src/fpdftext/fpdf_text.cpp
+++ b/core/src/fpdftext/fpdf_text.cpp
@@ -148,7 +148,6 @@ void CTextPage::ProcessObject(CPDF_PageObject* pObject)
topy, bottomy, spacew, fontsize_v, segment, pFont);
FX_Free(pPosArray);
}
-static void ConvertPDFString(CFX_ByteString& result, CFX_ByteString& src, CPDF_Font* pFont);
CTextBaseLine* CTextPage::InsertTextBox(CTextBaseLine* pBaseLine, FX_FLOAT basey, FX_FLOAT leftx,
FX_FLOAT rightx, FX_FLOAT topy, FX_FLOAT bottomy, FX_FLOAT spacew, FX_FLOAT fontsize_v,
CFX_ByteString& str, CPDF_Font* pFont)
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp
index 54dc915e56..f19d3de9dc 100644
--- a/core/src/fpdftext/fpdf_text_int.cpp
+++ b/core/src/fpdftext/fpdf_text_int.cpp
@@ -1364,8 +1364,6 @@ void CPDF_TextPage::CloseTempLine()
}
}
}
- int ntext = m_TextBuf.GetSize();
- ntext = m_charList.GetSize();
order.RemoveAll();
m_TempCharList.RemoveAll();
m_TempTextBuf.Delete(0, m_TempTextBuf.GetLength());
@@ -2500,7 +2498,6 @@ void CPDF_TextPageFind::ExtractFindWhat(const CFX_WideString& findwhat)
}
}
int pos = 0;
- FX_BOOL bLastIgnore = FALSE;
while(pos < csWord.GetLength()) {
CFX_WideString curStr = csWord.Mid(pos, 1);
FX_WCHAR curChar = csWord.GetAt(pos);
@@ -2520,10 +2517,7 @@ void CPDF_TextPageFind::ExtractFindWhat(const CFX_WideString& findwhat)
}
csWord = csWord.Right(csWord.GetLength() - pos - 1);
pos = 0;
- bLastIgnore = TRUE;
continue;
- } else {
- bLastIgnore = FALSE;
}
pos++;
}
@@ -2532,7 +2526,6 @@ void CPDF_TextPageFind::ExtractFindWhat(const CFX_WideString& findwhat)
}
index++;
}
- return;
}
FX_BOOL CPDF_TextPageFind::IsMatchWholeWord(const CFX_WideString& csPageText, int startPos, int endPos)
{