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 --- xfa/src/fee/include/ifde_txtedtengine.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/src/fee/include') diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h index a47739c3c5..5c16696845 100644 --- a/xfa/src/fee/include/ifde_txtedtengine.h +++ b/xfa/src/fee/include/ifde_txtedtengine.h @@ -79,7 +79,7 @@ enum FDE_TXTEDIT_LINEEND { FDE_TXTEDIT_LINEEND_CR, FDE_TXTEDIT_LINEEND_LF, }; -struct _FDE_TXTEDTPARAMS : public CFX_Object { +struct _FDE_TXTEDTPARAMS { _FDE_TXTEDTPARAMS() : fPlateWidth(0) , fPlateHeight(0) @@ -129,7 +129,7 @@ enum FDE_TXTEDT_TEXTCHANGE_TYPE { FDE_TXTEDT_TEXTCHANGE_TYPE_Delete , FDE_TXTEDT_TEXTCHANGE_TYPE_Replace , }; -struct _FDE_TXTEDT_TEXTCHANGE_INFO : public CFX_Object { +struct _FDE_TXTEDT_TEXTCHANGE_INFO { FX_INT32 nChangeType; CFX_WideString wsInsert; CFX_WideString wsDelete; -- cgit v1.2.3