From c08dc39850188d96ad81f5800c7a51d2663eeb44 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 24 Jul 2017 08:57:35 -0400 Subject: Remove fx_edit.h This CL moves GetPDFWordString to be a method on CFX_Edit. The FX_EDIT_ISLATINWORD define is moved into fx_edit.h. CFWL_Edit::FX_EDIT_ISLATINWORD is renamed to FxEditIsLatinWord to make less confusing with the define. Change-Id: I47d12d41447b268894a1d0376ac4b2bdb409e2df Reviewed-on: https://pdfium-review.googlesource.com/8531 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fpdfsdk/pdfwindow/cpwl_appstream.cpp | 7 +++---- fpdfsdk/pdfwindow/cpwl_font_map.h | 1 - fpdfsdk/pdfwindow/cpwl_list_box.h | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/pdfwindow') diff --git a/fpdfsdk/pdfwindow/cpwl_appstream.cpp b/fpdfsdk/pdfwindow/cpwl_appstream.cpp index 969c521d68..f7ba4c465c 100644 --- a/fpdfsdk/pdfwindow/cpwl_appstream.cpp +++ b/fpdfsdk/pdfwindow/cpwl_appstream.cpp @@ -577,8 +577,7 @@ CFX_ByteString GetEditAppStream(CFX_Edit* pEdit, nCurFontIndex = word.nFontIndex; } - sWords << GetPDFWordString(pEdit->GetFontMap(), nCurFontIndex, - word.Word, SubWord); + sWords << pEdit->GetPDFWordString(nCurFontIndex, word.Word, SubWord); } oldplace = place; @@ -600,8 +599,8 @@ CFX_ByteString GetEditAppStream(CFX_Edit* pEdit, nCurFontIndex = word.nFontIndex; } - sEditStream << GetWordRenderString(GetPDFWordString( - pEdit->GetFontMap(), nCurFontIndex, word.Word, SubWord)); + sEditStream << GetWordRenderString( + pEdit->GetPDFWordString(nCurFontIndex, word.Word, SubWord)); } } } diff --git a/fpdfsdk/pdfwindow/cpwl_font_map.h b/fpdfsdk/pdfwindow/cpwl_font_map.h index de7a944425..e1a3edeb79 100644 --- a/fpdfsdk/pdfwindow/cpwl_font_map.h +++ b/fpdfsdk/pdfwindow/cpwl_font_map.h @@ -13,7 +13,6 @@ #include "core/fpdfdoc/ipvt_fontmap.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxge/fx_font.h" -#include "fpdfsdk/fxedit/fx_edit.h" #include "public/fpdf_sysfontinfo.h" class CPDF_Document; diff --git a/fpdfsdk/pdfwindow/cpwl_list_box.h b/fpdfsdk/pdfwindow/cpwl_list_box.h index 8bc7651ada..f41a6dd87f 100644 --- a/fpdfsdk/pdfwindow/cpwl_list_box.h +++ b/fpdfsdk/pdfwindow/cpwl_list_box.h @@ -10,7 +10,6 @@ #include #include "core/fxcrt/cfx_unowned_ptr.h" -#include "fpdfsdk/fxedit/fx_edit.h" #include "fpdfsdk/pdfwindow/cpwl_wnd.h" class CFX_ListCtrl; -- cgit v1.2.3