From f4bb580add3824196dc49cd7de2f7d051019ede8 Mon Sep 17 00:00:00 2001 From: weili Date: Tue, 14 Jun 2016 17:21:14 -0700 Subject: 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 --- core/fpdfdoc/include/cpdf_variabletext.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'core/fpdfdoc/include/cpdf_variabletext.h') diff --git a/core/fpdfdoc/include/cpdf_variabletext.h b/core/fpdfdoc/include/cpdf_variabletext.h index 06b41f186c..5e64ab29a9 100644 --- a/core/fpdfdoc/include/cpdf_variabletext.h +++ b/core/fpdfdoc/include/cpdf_variabletext.h @@ -87,13 +87,9 @@ class CPDF_VariableText : private CPDF_EditContainer { CPDF_VariableText::Iterator* GetIterator(); // CPDF_EditContainer. - void SetPlateRect(const CFX_FloatRect& rect) override { - CPDF_EditContainer::SetPlateRect(rect); - } + void SetPlateRect(const CFX_FloatRect& rect) override; CFX_FloatRect GetContentRect() const override; - const CFX_FloatRect& GetPlateRect() const override { - return CPDF_EditContainer::GetPlateRect(); - } + const CFX_FloatRect& GetPlateRect() const override; void SetAlignment(int32_t nFormat = 0) { m_nAlignment = nFormat; } void SetPasswordChar(uint16_t wSubWord = '*') { m_wSubWord = wSubWord; } @@ -108,8 +104,10 @@ class CPDF_VariableText : private CPDF_EditContainer { void SetRichText(FX_BOOL bRichText) { m_bRichText = bRichText; } void SetLineLeading(FX_FLOAT fLineLeading) { m_fLineLeading = fLineLeading; } void Initialize(); + FX_BOOL IsValid() const { return m_bInitial; } FX_BOOL IsRichText() const { return m_bRichText; } + void RearrangeAll(); void RearrangePart(const CPVT_WordRange& PlaceRange); void ResetAll(); -- cgit v1.2.3