Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fxfa / src / app / xfa_fontmgr.h
index 3a41cea..d8f7784 100644 (file)
@@ -18,8 +18,8 @@ class CXFA_DefFontMgr : public IXFA_FontMgr
 public:\r
     CXFA_DefFontMgr() {}\r
     ~CXFA_DefFontMgr() override;\r
-    virtual IFX_Font*          GetFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF);\r
-    virtual IFX_Font*          GetDefaultFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF);\r
+    virtual IFX_Font*          GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF);\r
+    virtual IFX_Font*          GetDefaultFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF);\r
 protected:\r
     CFX_PtrArray                       m_CacheFonts;\r
 };\r
@@ -28,13 +28,13 @@ class CXFA_PDFFontMgr : public IFX_FontProvider
 public:\r
     CXFA_PDFFontMgr(CXFA_FFDoc* pDoc);\r
     ~CXFA_PDFFontMgr();\r
-    IFX_Font*                          GetFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, CPDF_Font** pPDFFont, FX_BOOL bStrictMatch = TRUE);\r
+    IFX_Font*                          GetFont(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, CPDF_Font** pPDFFont, FX_BOOL bStrictMatch = TRUE);\r
     FX_BOOL                                    GetCharWidth(IFX_Font* pFont, FX_WCHAR wUnicode, int32_t &iWidth, FX_BOOL bCharCode);\r
     CFX_MapPtrToPtr                    m_FDE2PDFFont;\r
 protected:\r
     IFX_Font*                          FindFont(CFX_ByteString strFamilyName, FX_BOOL bBold, FX_BOOL bItalic, CPDF_Font** pPDFFont, FX_BOOL bStrictMatch = TRUE);\r
     CFX_ByteString                     PsNameToFontName(const CFX_ByteString& strPsName, FX_BOOL bBold, FX_BOOL bItalic);\r
-    FX_BOOL                                    PsNameMatchDRFontName(FX_BSTR bsPsName, FX_BOOL bBold, FX_BOOL bItalic, const CFX_ByteString& bsDRFontName, FX_BOOL bStrictMatch = TRUE);\r
+    FX_BOOL                                    PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName, FX_BOOL bBold, FX_BOOL bItalic, const CFX_ByteString& bsDRFontName, FX_BOOL bStrictMatch = TRUE);\r
     CXFA_FFDoc*                                                                m_pDoc;\r
     CFX_CMapByteStringToPtr                                    m_FontArray;\r
 };\r
@@ -43,7 +43,7 @@ class CXFA_FontMgr
 public:\r
     CXFA_FontMgr();\r
     ~CXFA_FontMgr();\r
-    IFX_Font*          GetFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, FX_DWORD dwFontStyles,\r
+    IFX_Font*          GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles,\r
                             FX_WORD wCodePage = 0xFFFF);\r
     void                       LoadDocFonts(IXFA_Doc* hDoc);\r
     void                       ReleaseDocFonts(IXFA_Doc* hDoc);\r