From 7f1c6a5cd4ad7fea6b7534db2cb4517b75840dbc Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 5 Oct 2017 15:29:59 -0400 Subject: Remove CPVT_Section The CPVT_Section only contained a single rect which was used in one place. The place it was used never used the variable it assigned it too. Removed. Change-Id: I5c3fccff4fad6deca4945e301bffb5348692b23c Reviewed-on: https://pdfium-review.googlesource.com/15675 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- core/fpdfdoc/cpdf_variabletext.cpp | 10 ---------- core/fpdfdoc/cpdf_variabletext.h | 2 -- core/fpdfdoc/cpvt_section.h | 17 ----------------- 3 files changed, 29 deletions(-) delete mode 100644 core/fpdfdoc/cpvt_section.h (limited to 'core/fpdfdoc') diff --git a/core/fpdfdoc/cpdf_variabletext.cpp b/core/fpdfdoc/cpdf_variabletext.cpp index d2643e8d64..e12f9491a2 100644 --- a/core/fpdfdoc/cpdf_variabletext.cpp +++ b/core/fpdfdoc/cpdf_variabletext.cpp @@ -11,7 +11,6 @@ #include "core/fpdfapi/font/cpdf_font.h" #include "core/fpdfdoc/cline.h" -#include "core/fpdfdoc/cpvt_section.h" #include "core/fpdfdoc/cpvt_word.h" #include "core/fpdfdoc/cpvt_wordinfo.h" #include "core/fpdfdoc/csection.h" @@ -178,15 +177,6 @@ bool CPDF_VariableText::Iterator::GetLine(CPVT_Line& line) const { return true; } -bool CPDF_VariableText::Iterator::GetSection(CPVT_Section& section) const { - if (!pdfium::IndexInBounds(m_pVT->m_SectionArray, m_CurPos.nSecIndex)) - return false; - - CSection* pSection = m_pVT->m_SectionArray[m_CurPos.nSecIndex].get(); - section.rcSection = m_pVT->InToOut(pSection->m_SecInfo.rcSection); - return true; -} - CPDF_VariableText::CPDF_VariableText() : m_nLimitChar(0), m_nCharArray(0), diff --git a/core/fpdfdoc/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h index a438a1c1c9..22ed09ad31 100644 --- a/core/fpdfdoc/cpdf_variabletext.h +++ b/core/fpdfdoc/cpdf_variabletext.h @@ -23,7 +23,6 @@ class CPVT_Word; class CSection; class IPVT_FontMap; -struct CPVT_Section; struct CPVT_SectionInfo; struct CPVT_WordInfo; @@ -44,7 +43,6 @@ class CPDF_VariableText { bool NextLine(); bool GetWord(CPVT_Word& word) const; bool GetLine(CPVT_Line& line) const; - bool GetSection(CPVT_Section& section) const; void SetAt(int32_t nWordIndex); void SetAt(const CPVT_WordPlace& place); const CPVT_WordPlace& GetAt() const { return m_CurPos; } diff --git a/core/fpdfdoc/cpvt_section.h b/core/fpdfdoc/cpvt_section.h deleted file mode 100644 index 2a89034c35..0000000000 --- a/core/fpdfdoc/cpvt_section.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef CORE_FPDFDOC_CPVT_SECTION_H_ -#define CORE_FPDFDOC_CPVT_SECTION_H_ - -#include "core/fpdfdoc/cpvt_wordplace.h" -#include "core/fxcrt/fx_coordinates.h" - -struct CPVT_Section { - CFX_FloatRect rcSection; -}; - -#endif // CORE_FPDFDOC_CPVT_SECTION_H_ -- cgit v1.2.3