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/fgas/include/fx_fnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xfa/src/fgas/include/fx_fnt.h') diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h index d664853df7..491feaea37 100644 --- a/xfa/src/fgas/include/fx_fnt.h +++ b/xfa/src/fgas/include/fx_fnt.h @@ -73,7 +73,7 @@ public: #endif }; #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -typedef struct _FX_FONTMATCHPARAMS : public CFX_Object { +typedef struct _FX_FONTMATCHPARAMS { FX_LPCWSTR pwsFamily; FX_DWORD dwFontStyles; FX_DWORD dwUSB; -- cgit v1.2.3