summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/fxedit
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-04-04 15:24:20 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-04 15:24:20 -0700
commited9c4386713084f37548b46ab36f618021f716f5 (patch)
treec5d3bca40a87d9beb9fea03c680f13cc8eb2400c /fpdfsdk/include/fxedit
parentc220e59f36a1a5664fc795c801968083adda1722 (diff)
downloadpdfium-ed9c4386713084f37548b46ab36f618021f716f5.tar.xz
Make IPDF_VariableText_{Provider,Iterator} inner classes.
This CL moves the IPDF_VariableText_Provider and IPDF_VariableText_Iterator classes to be nested sub-classes of IPDF_VariableText. BUG=pdfium:455 Review URL: https://codereview.chromium.org/1855403002
Diffstat (limited to 'fpdfsdk/include/fxedit')
-rw-r--r--fpdfsdk/include/fxedit/fx_edit.h6
-rw-r--r--fpdfsdk/include/fxedit/fxet_edit.h11
2 files changed, 8 insertions, 9 deletions
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h
index 905ad392a9..2adf97b882 100644
--- a/fpdfsdk/include/fxedit/fx_edit.h
+++ b/fpdfsdk/include/fxedit/fx_edit.h
@@ -8,6 +8,7 @@
#define FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
#include "core/fxcrt/include/fx_basic.h"
+#include "core/include/fpdfdoc/fpdf_vt.h"
#include "core/include/fxge/fx_dib.h"
class CFX_RenderDevice;
@@ -24,8 +25,7 @@ class IFX_Edit_UndoItem;
class IFX_List;
class IFX_List_Notify;
class IFX_SystemHandler;
-class IPDF_VariableText;
-class IPDF_VariableText_Provider;
+
struct CPVT_Line;
struct CPVT_SecProps;
struct CPVT_Section;
@@ -187,7 +187,7 @@ class IFX_Edit {
virtual void SetFontMap(IFX_Edit_FontMap* pFontMap) = 0;
// if user don't like to use FontMap, implement VTProvider and set it
// directly.
- virtual void SetVTProvider(IPDF_VariableText_Provider* pProvider) = 0;
+ virtual void SetVTProvider(IPDF_VariableText::Provider* pProvider) = 0;
// set a IFX_Edit_Notify pointer implemented by user.
virtual void SetNotify(IFX_Edit_Notify* pNotify) = 0;
virtual void SetOprNotify(IFX_Edit_OprNotify* pOprNotify) = 0;
diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/include/fxedit/fxet_edit.h
index d3383ac2cd..a9df992bf2 100644
--- a/fpdfsdk/include/fxedit/fxet_edit.h
+++ b/fpdfsdk/include/fxedit/fxet_edit.h
@@ -7,7 +7,6 @@
#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
#define FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
-#include "core/fpdfdoc/include/ipdf_variabletext_provider.h"
#include "core/include/fpdfdoc/fpdf_vt.h"
#include "fpdfsdk/include/fxedit/fx_edit.h"
@@ -516,7 +515,7 @@ class CFX_Edit : public IFX_Edit {
// IFX_Edit
void SetFontMap(IFX_Edit_FontMap* pFontMap) override;
- void SetVTProvider(IPDF_VariableText_Provider* pProvider) override;
+ void SetVTProvider(IPDF_VariableText::Provider* pProvider) override;
void SetNotify(IFX_Edit_Notify* pNotify) override;
void SetOprNotify(IFX_Edit_OprNotify* pOprNotify) override;
IFX_Edit_Iterator* GetIterator() override;
@@ -755,7 +754,7 @@ class CFX_Edit : public IFX_Edit {
class CFX_Edit_Iterator : public IFX_Edit_Iterator {
public:
- CFX_Edit_Iterator(CFX_Edit* pEdit, IPDF_VariableText_Iterator* pVTIterator);
+ CFX_Edit_Iterator(CFX_Edit* pEdit, IPDF_VariableText::Iterator* pVTIterator);
~CFX_Edit_Iterator() override;
// IFX_Edit_Iterator
@@ -775,17 +774,17 @@ class CFX_Edit_Iterator : public IFX_Edit_Iterator {
private:
CFX_Edit* m_pEdit;
- IPDF_VariableText_Iterator* m_pVTIterator;
+ IPDF_VariableText::Iterator* m_pVTIterator;
};
-class CFX_Edit_Provider : public IPDF_VariableText_Provider {
+class CFX_Edit_Provider : public IPDF_VariableText::Provider {
public:
explicit CFX_Edit_Provider(IFX_Edit_FontMap* pFontMap);
~CFX_Edit_Provider() override;
IFX_Edit_FontMap* GetFontMap();
- // IPDF_VariableText_Provider:
+ // IPDF_VariableText::Provider:
int32_t GetCharWidth(int32_t nFontIndex,
uint16_t word,
int32_t nWordStyle) override;