From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- core/include/fpdfdoc/fpdf_vt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/include/fpdfdoc/fpdf_vt.h') diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h index c9a66020d8..18ea709bcf 100644 --- a/core/include/fpdfdoc/fpdf_vt.h +++ b/core/include/fpdfdoc/fpdf_vt.h @@ -164,7 +164,7 @@ struct CPVT_WordRange { CPVT_WordPlace EndPos; }; -struct CPVT_SecProps : public CFX_Object { +struct CPVT_SecProps { CPVT_SecProps() : fLineLeading(0.0f), fLineIndent(0.0f), nAlignment(0) { @@ -186,7 +186,7 @@ struct CPVT_SecProps : public CFX_Object { FX_INT32 nAlignment; }; -struct CPVT_WordProps : public CFX_Object { +struct CPVT_WordProps { CPVT_WordProps() : nFontIndex(-1), fFontSize(0.0f), dwWordColor(0), nScriptType(0), nWordStyle(0), fCharSpace(0.0f), nHorzScale(0) -- cgit v1.2.3