Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fgas / src / layout / fx_textbreak.h
index c38fc0b..13e79da 100644 (file)
@@ -45,7 +45,7 @@ public:
     void GetString(CFX_WideString &wsStr) const\r
     {\r
         int32_t iCount = m_pLineChars->GetSize();\r
-        FX_LPWSTR pBuf = wsStr.GetBuffer(iCount);\r
+        FX_WCHAR* pBuf = wsStr.GetBuffer(iCount);\r
         CFX_Char *pChar;\r
         for (int32_t i = 0; i < iCount; i ++) {\r
             pChar = m_pLineChars->GetDataPtr(i);\r
@@ -96,7 +96,7 @@ public:
     virtual FX_DWORD           GetContextCharStyles() const;\r
     virtual void                       SetContextCharStyles(FX_DWORD dwCharStyles);\r
     virtual void                       SetCombWidth(FX_FLOAT fCombWidth);\r
-    virtual void                       SetUserData(FX_LPVOID pUserData);\r
+    virtual void                       SetUserData(void* pUserData);\r
     virtual FX_DWORD                           AppendChar(FX_WCHAR wch);\r
     virtual FX_DWORD                           EndBreak(FX_DWORD dwStatus = FX_TXTBREAK_PieceBreak);\r
     virtual int32_t                            CountBreakChars() const;\r
@@ -139,7 +139,7 @@ protected:
     int32_t                    m_iAlignment;\r
     FX_DWORD                   m_dwContextCharStyles;\r
     int32_t                    m_iCombWidth;\r
-    FX_LPVOID                  m_pUserData;\r
+    void*                      m_pUserData;\r
     FX_DWORD                   m_dwCharType;\r
     FX_BOOL                            m_bCurRTL;\r
     int32_t                    m_iCurAlignment;\r