From 893822aa5b6254591f8e80fbffcbb4fa6ad849aa Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 13 Mar 2017 15:32:07 -0400 Subject: Merge text breaking helper classes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This Cl merges the CFX_TxtPiece and CFX_RTFPiece classes into CFX_BreakPiece. CFX_TxtLine and CFX_RTFLine into CFX_BreakLine and CFX_TxtChar and CFX_RTFChar into CFX_Char. Change-Id: I95421bdf4cafd5e394db9238dea3603ccb8349c3 Reviewed-on: https://pdfium-review.googlesource.com/2966 Reviewed-by: Nicolás Peña Commit-Queue: dsinclair --- core/fxcrt/fx_arabic.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'core/fxcrt/fx_arabic.h') diff --git a/core/fxcrt/fx_arabic.h b/core/fxcrt/fx_arabic.h index 9f6ec50ef6..1856f106c2 100644 --- a/core/fxcrt/fx_arabic.h +++ b/core/fxcrt/fx_arabic.h @@ -9,8 +9,8 @@ #include +#include "core/fxcrt/cfx_char.h" #include "core/fxcrt/fx_system.h" -#include "core/fxcrt/fx_ucd.h" #define FX_BIDIMAXLEVEL 61 #define FX_BidiDirection(a) (FX_IsOdd(a) ? FX_BIDICLASS_R : FX_BIDICLASS_L) @@ -164,10 +164,7 @@ const FX_ARBFORMTABLE* FX_GetArabicFormTable(FX_WCHAR unicode); FX_WCHAR FX_GetArabicFromAlefTable(FX_WCHAR alef); FX_WCHAR FX_GetArabicFromShaddaTable(FX_WCHAR shadda); -void FX_BidiLine(std::vector& chars, - int32_t iCount, - int32_t iBaseLevel = 0); -void FX_BidiLine(std::vector& chars, +void FX_BidiLine(std::vector& chars, int32_t iCount, int32_t iBaseLevel = 0); -- cgit v1.2.3