Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fdp / src / css / fde_cssstyleselector.h
index 803522b..9d1d02b 100644 (file)
@@ -33,18 +33,18 @@ public:
     }\r
     FDE_LPCSSRULEDATA                          GetIDRuleData(FX_DWORD dwIDHash)\r
     {\r
-        FX_LPVOID pData;\r
-        return m_IDRules.Lookup((FX_LPVOID)(uintptr_t)dwIDHash, pData) ? (FDE_LPCSSRULEDATA)pData : NULL;\r
+        void* pData;\r
+        return m_IDRules.Lookup((void*)(uintptr_t)dwIDHash, pData) ? (FDE_LPCSSRULEDATA)pData : NULL;\r
     }\r
     FDE_LPCSSRULEDATA                          GetTagRuleData(FX_DWORD dwTagHasn)\r
     {\r
-        FX_LPVOID pData;\r
-        return m_TagRules.Lookup((FX_LPVOID)(uintptr_t)dwTagHasn, pData) ? (FDE_LPCSSRULEDATA)pData : NULL;\r
+        void* pData;\r
+        return m_TagRules.Lookup((void*)(uintptr_t)dwTagHasn, pData) ? (FDE_LPCSSRULEDATA)pData : NULL;\r
     }\r
     FDE_LPCSSRULEDATA                          GetClassRuleData(FX_DWORD dwIDHash)\r
     {\r
-        FX_LPVOID pData;\r
-        return m_ClassRules.Lookup((FX_LPVOID)(uintptr_t)dwIDHash, pData) ? (FDE_LPCSSRULEDATA)pData : NULL;\r
+        void* pData;\r
+        return m_ClassRules.Lookup((void*)(uintptr_t)dwIDHash, pData) ? (FDE_LPCSSRULEDATA)pData : NULL;\r
     }\r
     FDE_LPCSSRULEDATA                          GetUniversalRuleData()\r
     {\r
@@ -95,7 +95,7 @@ protected:
     void                                                       MatchRules(FDE_LPCSSTAGCACHE pCache, FDE_LPCSSRULEDATA pList, FDE_CSSPERSUDO ePersudoType);\r
     void                                                       SortRulesTo(CFDE_CSSDeclarationArray &matchDecls);\r
     FX_BOOL                                                    MatchSelector(FDE_LPCSSTAGCACHE pCache, IFDE_CSSSelector *pSel, FDE_CSSPERSUDO ePersudoType);\r
-    void                                                       AppendInlineStyle(CFDE_CSSDeclaration *pDecl, FX_LPCWSTR psz, int32_t iLen);\r
+    void                                                       AppendInlineStyle(CFDE_CSSDeclaration *pDecl, const FX_WCHAR* psz, int32_t iLen);\r
     void                                                       ApplyDeclarations(FX_BOOL bPriority, const IFDE_CSSDeclaration **ppDeclArray, int32_t iDeclCount, IFDE_CSSComputedStyle *pDestStyle);\r
     void                                                       ApplyProperty(FDE_CSSPROPERTY eProperty, IFDE_CSSValue *pValue, CFDE_CSSComputedStyle *pComputedStyle);\r
 \r
@@ -161,7 +161,7 @@ public:
         iValue = m_iResetVal;\r
         return m_bReset;\r
     }\r
-    FX_LPCWSTR m_pszIdent;\r
+    const FX_WCHAR*    m_pszIdent;\r
     FX_BOOL            m_bIncrement;\r
     FX_BOOL            m_bReset;\r
     int32_t    m_iIncVal;\r
@@ -196,7 +196,7 @@ public:
         UpdateIndex();\r
         return m_arrCounterData.ElementAt(index).GetCounterReset(iValue);\r
     }\r
-    FX_LPCWSTR                                                         GetCounterIdentifier(int32_t index)\r
+    const FX_WCHAR*                                                            GetCounterIdentifier(int32_t index)\r
     {\r
         UpdateIndex();\r
         return m_arrCounterData.ElementAt(index).m_pszIdent;\r
@@ -204,7 +204,7 @@ public:
 protected:\r
     void                                                                       UpdateIndex();\r
     void                                                                       DoUpdateIndex(IFDE_CSSValueList *pList);\r
-    int32_t                                                            FindIndex(FX_LPCWSTR pszIdentifier);\r
+    int32_t                                                            FindIndex(const FX_WCHAR* pszIdentifier);\r
     IFDE_CSSValueList                                          *m_pCounterInc;\r
     IFDE_CSSValueList                                          *m_pCounterReset;\r
     CFX_ArrayTemplate<FDE_CSSCOUNTERDATA>      m_arrCounterData;\r
@@ -227,7 +227,7 @@ public:
         m_bTextEmphasisColorCurrent = TRUE;\r
         m_iOrphans = 2;\r
     }\r
-    FX_LPCWSTR                                         m_pszListStyleImage;\r
+    const FX_WCHAR*                                            m_pszListStyleImage;\r
     FDE_CSSLENGTH                                      m_LetterSpacing;\r
     FDE_CSSLENGTH                                      m_WordSpacing;\r
     FDE_CSSLENGTH                                      m_TextIndent;\r
@@ -242,7 +242,7 @@ public:
     FX_WORD                                                    m_wFontWeight;\r
     int32_t                                            m_iWidows;\r
     int32_t                                            m_iOrphans;\r
-    FX_LPCWSTR                                         m_pszTextEmphasisCustomMark;\r
+    const FX_WCHAR*                                            m_pszTextEmphasisCustomMark;\r
     FX_WORD                                                    m_eFontVariant          : 1;\r
     FX_WORD                                                    m_eFontStyle            : 1;\r
     FX_WORD                                                    m_bTextEmphasisColorCurrent: 1;\r
@@ -289,7 +289,7 @@ public:
     FDE_CSSSIZE                                                m_MinBoxSize;\r
     FDE_CSSSIZE                                                m_MaxBoxSize;\r
     FDE_CSSPOINT                                       m_BKGPosition;\r
-    FX_LPCWSTR                                         m_pszBKGImage;\r
+    const FX_WCHAR*                                            m_pszBKGImage;\r
     FX_ARGB                                                    m_dwBKGColor;\r
     FX_ARGB                                                    m_dwBDRLeftColor;\r
     FX_ARGB                                                    m_dwBDRTopColor;\r
@@ -411,7 +411,7 @@ public:
     {\r
         return (IFDE_CSSRubyStyle * const)this;\r
     }\r
-    virtual FX_BOOL                                    GetCustomStyle(FX_WSTR wsName, CFX_WideString &wsValue) const\r
+    virtual FX_BOOL                                    GetCustomStyle(const CFX_WideStringC& wsName, CFX_WideString &wsValue) const\r
     {\r
         for (int32_t i = m_CustomProperties.GetSize() - 2; i > -1; i -= 2) {\r
             if (wsName == m_CustomProperties[i]) {\r
@@ -449,7 +449,7 @@ public:
     {\r
         return (m_NonInheritedData.m_pCounterStyle == NULL) ? 0 : m_NonInheritedData.m_pCounterStyle->CountCounters();\r
     }\r
-    virtual FX_LPCWSTR                         GetCounterIdentifier(int32_t index)\r
+    virtual const FX_WCHAR*                            GetCounterIdentifier(int32_t index)\r
     {\r
         return m_NonInheritedData.m_pCounterStyle->GetCounterIdentifier(index);\r
     }\r
@@ -469,7 +469,7 @@ public:
     {\r
         return m_InheritedData.m_pQuotes == NULL ? 0 : m_InheritedData.m_pQuotes->CountValues();\r
     }\r
-    virtual FX_LPCWSTR                         GetQuotes(int32_t index) const\r
+    virtual const FX_WCHAR*                            GetQuotes(int32_t index) const\r
     {\r
         FXSYS_assert(m_InheritedData.m_pQuotes != NULL && m_InheritedData.m_pQuotes->CountValues() > index);\r
         return ((IFDE_CSSPrimitiveValue*)(m_InheritedData.m_pQuotes->GetValue(index)))->GetString(index);\r
@@ -526,7 +526,7 @@ public:
     {\r
         return m_InheritedData.m_pFontFamily ? m_InheritedData.m_pFontFamily->CountValues() : 0;\r
     }\r
-    virtual FX_LPCWSTR                         GetFontFamily(int32_t index) const\r
+    virtual const FX_WCHAR*                            GetFontFamily(int32_t index) const\r
     {\r
         return ((IFDE_CSSPrimitiveValue*)(m_InheritedData.m_pFontFamily->GetValue(index)))->GetString(index);\r
     }\r
@@ -815,7 +815,7 @@ public:
     {\r
         return (FDE_CSSTEXTEMPHASISFILL)m_InheritedData.m_eTextEmphasisFill;\r
     }\r
-    virtual FX_LPCWSTR                         GetTextEmphasisCustom() const\r
+    virtual const FX_WCHAR*                            GetTextEmphasisCustom() const\r
     {\r
         FXSYS_assert(m_InheritedData.m_eTextEmphasisMark == FDE_CSSTEXTEMPHASISMARK_Custom);\r
         return m_InheritedData.m_pszTextEmphasisCustomMark;\r
@@ -913,7 +913,7 @@ public:
     {\r
         return m_NonInheritedData.m_dwBKGColor;\r
     }\r
-    virtual FX_LPCWSTR                         GetBKGImage() const\r
+    virtual const FX_WCHAR*                            GetBKGImage() const\r
     {\r
         return m_NonInheritedData.m_pszBKGImage;\r
     }\r
@@ -953,7 +953,7 @@ public:
     {\r
         return m_InheritedData.m_pCursorUris == NULL ? 0 : m_InheritedData.m_pCursorUris->CountValues();\r
     }\r
-    virtual FX_LPCWSTR                         GetCursorUrl(int32_t index) const\r
+    virtual const FX_WCHAR*                            GetCursorUrl(int32_t index) const\r
     {\r
         FXSYS_assert(m_InheritedData.m_pCursorUris != NULL);\r
         return ((IFDE_CSSPrimitiveValue*)(m_InheritedData.m_pCursorUris->GetValue(index)))->GetString(index);\r
@@ -974,7 +974,7 @@ public:
     {\r
         return (FDE_CSSLISTSTYLEPOSITION)m_NonInheritedData.m_eListStylePosition;\r
     }\r
-    virtual FX_LPCWSTR                                 GetListStyleImage() const\r
+    virtual const FX_WCHAR*                                    GetListStyleImage() const\r
     {\r
         return m_InheritedData.m_pszListStyleImage;\r
     }\r