From 76da8841aef9a60c1c65c646a9f943c25861bc33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 6 Feb 2017 15:10:48 -0800 Subject: Split CFX_STemplate from CFX_PSTemplate This will allow the compiler to distinguish between rectangle initialization from a point and a size vs. two points. Add corresponding ctors, and fix style noise induced in XFA, now that rects have become a complex type. Change-Id: Iaa5887db63dafd41ac95f5c623989ca1d6443fd6 Reviewed-on: https://pdfium-review.googlesource.com/2533 Reviewed-by: dsinclair Commit-Queue: dsinclair --- xfa/fde/fde_visualset.h | 5 +++++ xfa/fde/tto/fde_textout.h | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'xfa') diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h index 30703e795a..0c6341fead 100644 --- a/xfa/fde/fde_visualset.h +++ b/xfa/fde/fde_visualset.h @@ -25,12 +25,17 @@ enum FDE_VISUALOBJTYPE { }; struct FDE_TEXTEDITPIECE { + FDE_TEXTEDITPIECE(); + ~FDE_TEXTEDITPIECE(); + int32_t nStart; int32_t nCount; int32_t nBidiLevel; CFX_RectF rtPiece; uint32_t dwCharStyles; }; +inline FDE_TEXTEDITPIECE::FDE_TEXTEDITPIECE() = default; +inline FDE_TEXTEDITPIECE::~FDE_TEXTEDITPIECE() = default; class IFDE_VisualSet { public: diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index e1eb71cf3b..97ec1251f4 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -47,11 +47,16 @@ class CFX_TxtBreak; struct FX_TXTRUN; struct FDE_TTOPIECE { + FDE_TTOPIECE(); + ~FDE_TTOPIECE(); + int32_t iStartChar; int32_t iChars; uint32_t dwCharStyles; CFX_RectF rtPiece; }; +inline FDE_TTOPIECE::FDE_TTOPIECE() = default; +inline FDE_TTOPIECE::~FDE_TTOPIECE() = default; typedef CFX_MassArrayTemplate CFDE_TTOPieceArray; class CFDE_TTOLine { -- cgit v1.2.3