summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornpm <npm@chromium.org>2016-09-15 13:07:21 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-15 13:07:21 -0700
commit163a9a6ded2ef483cb81435fc6aefbf6a45a4cb5 (patch)
tree16cf0ae8e489d0979630955fb8c886f601f3fecd
parent8faac627c4562098c62f8497e56a44500c3c199b (diff)
downloadpdfium-163a9a6ded2ef483cb81435fc6aefbf6a45a4cb5.tar.xz
Deleted unused defintions and methods from PWL_FontMap
Some '#define' and methods are not being used. Review-Url: https://codereview.chromium.org/2340373002
-rw-r--r--fpdfsdk/pdfwindow/PWL_FontMap.cpp37
-rw-r--r--fpdfsdk/pdfwindow/PWL_FontMap.h5
2 files changed, 0 insertions, 42 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
index d0fa5e4c74..7bb9c76779 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
@@ -214,29 +214,6 @@ int32_t CPWL_FontMap::GetFontIndex(const CFX_ByteString& sFontName,
return AddFontData(pFont, sAlias, nCharset);
}
-int32_t CPWL_FontMap::GetPWLFontIndex(uint16_t word, int32_t nCharset) {
- int32_t nFind = -1;
-
- for (int32_t i = 0, sz = m_aData.GetSize(); i < sz; i++) {
- if (CPWL_FontMap_Data* pData = m_aData.GetAt(i)) {
- if (pData->nCharset == nCharset) {
- nFind = i;
- break;
- }
- }
- }
-
- CPDF_Font* pNewFont = GetPDFFont(nFind);
-
- if (!pNewFont)
- return -1;
-
- CFX_ByteString sAlias = EncodeFontAlias("Arial_Chrome", nCharset);
- AddedFont(pNewFont, sAlias);
-
- return AddFontData(pNewFont, sAlias, nCharset);
-}
-
CPDF_Font* CPWL_FontMap::FindFontSameCharset(CFX_ByteString& sFontAlias,
int32_t nCharset) {
return nullptr;
@@ -258,16 +235,6 @@ int32_t CPWL_FontMap::AddFontData(CPDF_Font* pFont,
void CPWL_FontMap::AddedFont(CPDF_Font* pFont,
const CFX_ByteString& sFontAlias) {}
-CFX_ByteString CPWL_FontMap::GetFontName(int32_t nFontIndex) {
- if (nFontIndex >= 0 && nFontIndex < m_aData.GetSize()) {
- if (CPWL_FontMap_Data* pData = m_aData.GetAt(nFontIndex)) {
- return pData->sFontName;
- }
- }
-
- return "";
-}
-
CFX_ByteString CPWL_FontMap::GetNativeFont(int32_t nCharset) {
if (nCharset == DEFAULT_CHARSET)
nCharset = GetNativeCharset();
@@ -334,10 +301,6 @@ CFX_ByteString CPWL_FontMap::EncodeFontAlias(const CFX_ByteString& sFontName) {
return sRet;
}
-int32_t CPWL_FontMap::GetFontMapCount() const {
- return m_aData.GetSize();
-}
-
const CPWL_FontMap_Data* CPWL_FontMap::GetFontMapData(int32_t nIndex) const {
if (nIndex >= 0 && nIndex < m_aData.GetSize()) {
return m_aData.GetAt(nIndex);
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h
index 3541be501a..0ebd059b08 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.h
@@ -33,11 +33,9 @@ struct CPWL_FontMap_Native {
#define DEFAULT_CHARSET 1
#define SYMBOL_CHARSET 2
#define SHIFTJIS_CHARSET 128
-#define HANGEUL_CHARSET 129
#define HANGUL_CHARSET 129
#define GB2312_CHARSET 134
#define CHINESEBIG5_CHARSET 136
-#define OEM_CHARSET 255
#define JOHAB_CHARSET 130
#define HEBREW_CHARSET 177
#define ARABIC_CHARSET 178
@@ -65,7 +63,6 @@ class CPWL_FontMap : public IPVT_FontMap {
int32_t CharCodeFromUnicode(int32_t nFontIndex, uint16_t word) override;
int32_t CharSetFromUnicode(uint16_t word, int32_t nOldCharset) override;
- int32_t GetFontMapCount() const;
const CPWL_FontMap_Data* GetFontMapData(int32_t nIndex) const;
static int32_t GetNativeCharset();
CFX_ByteString GetNativeFontName(int32_t nCharset);
@@ -86,7 +83,6 @@ class CPWL_FontMap : public IPVT_FontMap {
int32_t GetFontIndex(const CFX_ByteString& sFontName,
int32_t nCharset,
FX_BOOL bFind);
- int32_t GetPWLFontIndex(uint16_t word, int32_t nCharset);
int32_t AddFontData(CPDF_Font* pFont,
const CFX_ByteString& sFontAlias,
int32_t nCharset = DEFAULT_CHARSET);
@@ -99,7 +95,6 @@ class CPWL_FontMap : public IPVT_FontMap {
CFX_ArrayTemplate<CPWL_FontMap_Native*> m_aNativeFont;
private:
- CFX_ByteString GetFontName(int32_t nFontIndex);
int32_t FindFont(const CFX_ByteString& sFontName,
int32_t nCharset = DEFAULT_CHARSET);