summaryrefslogtreecommitdiff
path: root/core/fpdftext/include
diff options
context:
space:
mode:
authorweili <weili@chromium.org>2016-06-14 17:21:14 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-14 17:21:14 -0700
commitf4bb580add3824196dc49cd7de2f7d051019ede8 (patch)
tree15c1db6fb7000330d48c105c66acf1d468ba56bd /core/fpdftext/include
parentee2abec93f22bd10522181dc0362f24d389fc66b (diff)
downloadpdfium-f4bb580add3824196dc49cd7de2f7d051019ede8.tar.xz
Make code compile with clang_use_chrome_plugin (part II)
This change contains files in core directory which were not covered in part I. This is part of the efforts to make PDFium code compilable by Clang chromium style plugins. The changes are mainly the following: -- move inline constructor/destructor of complex class/struct out-of-line; -- add constructor/destructor of complex class/struct if not explicitly defined; -- add explicit out-of-line copy constructor when needed; -- move inline virtual functions out-of-line; -- Properly mark virtual functions with 'override'; -- some minor cleanups; BUG=pdfium:469 Review-Url: https://codereview.chromium.org/2060913003
Diffstat (limited to 'core/fpdftext/include')
-rw-r--r--core/fpdftext/include/cpdf_textpage.h8
-rw-r--r--core/fpdftext/include/cpdf_textpagefind.h6
2 files changed, 5 insertions, 9 deletions
diff --git a/core/fpdftext/include/cpdf_textpage.h b/core/fpdftext/include/cpdf_textpage.h
index 0c1efdf34a..d414cbc829 100644
--- a/core/fpdftext/include/cpdf_textpage.h
+++ b/core/fpdftext/include/cpdf_textpage.h
@@ -61,11 +61,8 @@ struct PDFTEXT_Obj {
class CPDF_TextPage {
public:
- static FX_BOOL IsRectIntersect(const CFX_FloatRect& rect1,
- const CFX_FloatRect& rect2);
-
CPDF_TextPage(const CPDF_Page* pPage, FPDFText_Direction flags);
- ~CPDF_TextPage() {}
+ ~CPDF_TextPage();
// IPDF_TextPage:
void ParseTextPage();
@@ -98,6 +95,9 @@ class CPDF_TextPage {
FX_FLOAT bottom,
FX_BOOL bContains = FALSE);
+ static FX_BOOL IsRectIntersect(const CFX_FloatRect& rect1,
+ const CFX_FloatRect& rect2);
+
private:
enum class TextOrientation {
Unknown,
diff --git a/core/fpdftext/include/cpdf_textpagefind.h b/core/fpdftext/include/cpdf_textpagefind.h
index d9937772d1..4950bd1113 100644
--- a/core/fpdftext/include/cpdf_textpagefind.h
+++ b/core/fpdftext/include/cpdf_textpagefind.h
@@ -18,7 +18,7 @@ class CPDF_TextPage;
class CPDF_TextPageFind {
public:
explicit CPDF_TextPageFind(const CPDF_TextPage* pTextPage);
- ~CPDF_TextPageFind() {}
+ ~CPDF_TextPageFind();
FX_BOOL FindFirst(const CFX_WideString& findwhat,
int flags,
@@ -38,10 +38,6 @@ class CPDF_TextPageFind {
int iSubString,
FX_WCHAR chSep);
CFX_WideString MakeReverse(const CFX_WideString& str);
- int ReverseFind(const CFX_WideString& csPageText,
- const CFX_WideString& csWord,
- int nStartPos,
- int& WordLength);
int GetCharIndex(int index) const;
private: