diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-05 12:01:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-05 12:01:42 -0700 |
| commit | c7a7349cf316af37d4ad4b71c5742159deccbf33 (patch) | |
| tree | 5006913b93a6d498e3df158bc644400e3a1a0c7c /fpdfsdk/pdfwindow/PWL_Utils.cpp | |
| parent | 179bebb9a14dfd3ba91e9e068d4d436657a7c780 (diff) | |
| download | pdfium-c7a7349cf316af37d4ad4b71c5742159deccbf33.tar.xz | |
Remove core/include/fpdfdoc/fpdf_vt.h
This CL removes the core/include/fpdfdoc/fpdf_vt.h file. The IPDF_VariableText
class was removed in favour of the only concrete class of CPD_VariableText.
CPVT_Provider was moved to CPDF_VariableText::Provider and
CPDF_VariableText_Iterator was moved to CPDF_VariableText::Iterator.
The IFX_Edit_FontMap interface was merged into the IPVT_FontMap interface so
there is only one.
Other classes were split out as needed in order to keep things compiling.
BUG=pdfium:468
Review URL: https://codereview.chromium.org/1860063002
Diffstat (limited to 'fpdfsdk/pdfwindow/PWL_Utils.cpp')
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_Utils.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp index 3622a84912..acd362a29c 100644 --- a/fpdfsdk/pdfwindow/PWL_Utils.cpp +++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp @@ -8,7 +8,9 @@ #include <algorithm> +#include "core/fpdfdoc/include/cpvt_word.h" #include "core/include/fxge/fx_ge.h" +#include "fpdfsdk/include/fxedit/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_Icon.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" @@ -575,7 +577,7 @@ CFX_ByteString CPWL_Utils::GetSpellCheckAppStream( } CFX_ByteString CPWL_Utils::GetTextAppStream(const CFX_FloatRect& rcBBox, - IFX_Edit_FontMap* pFontMap, + IPVT_FontMap* pFontMap, const CFX_WideString& sText, int32_t nAlignmentH, int32_t nAlignmentV, @@ -613,7 +615,7 @@ CFX_ByteString CPWL_Utils::GetTextAppStream(const CFX_FloatRect& rcBBox, } CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, - IFX_Edit_FontMap* pFontMap, + IPVT_FontMap* pFontMap, CPDF_Stream* pIconStream, CPDF_IconFit& IconFit, const CFX_WideString& sLabel, |