Code alignment in issue 471991
authorJUN FANG <jun_fang@foxitsoftware.com>
Thu, 14 May 2015 01:24:09 +0000 (18:24 -0700)
committerJUN FANG <jun_fang@foxitsoftware.com>
Thu, 14 May 2015 01:24:09 +0000 (18:24 -0700)
BUG=471991
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1126273004

xfa/include/fxfa/fxfa_objectacc.h
xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h

index b03ebb5..d78a87d 100644 (file)
@@ -623,198 +623,152 @@ class CXFA_WidgetData : public CXFA_Data
 {\r
 public:\r
     CXFA_WidgetData(CXFA_Node *pNode);\r
-    CXFA_Node*         GetUIChild();\r
-\r
-    XFA_ELEMENT                GetUIType();\r
-    CFX_WideString     GetRawValue();\r
-\r
-    FX_INT32           GetAccess(FX_BOOL bTemplate = FALSE);\r
-\r
-    FX_BOOL                    GetAccessKey(CFX_WideStringC &wsAccessKey);\r
-\r
-    FX_INT32           GetAnchorType();\r
-\r
-    FX_INT32           GetColSpan();\r
-\r
-    FX_INT32           GetPresence();\r
-\r
-    FX_INT32           GetRotate();\r
-\r
-    CXFA_Border                GetBorder(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Caption       GetCaption(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Font          GetFont(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Margin                GetMargin(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Para          GetPara(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Keep          GetKeep(FX_BOOL bModified = FALSE);\r
-\r
-    void                       GetEventList(CXFA_NodeArray &events);\r
-    FX_INT32           GetEventByActivity(FX_INT32 iActivity, CXFA_NodeArray &events, FX_BOOL bIsFormReady = FALSE);\r
-\r
-    CXFA_Value         GetDefaultValue(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Value         GetFormValue(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Calculate     GetCalculate(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Validate      GetValidate(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Variables     GetVariables(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Bind          GetBind(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Assist                GetAssist(FX_BOOL bModified = FALSE);\r
-\r
-    void                       GetRelevant(CFX_WideStringC &wsRelevant);\r
-    FX_DWORD           GetRelevantStatus();\r
-\r
-    FX_BOOL                    GetWidth(FX_FLOAT &fWidth);\r
-    FX_BOOL                    GetHeight(FX_FLOAT &fHeight);\r
-\r
-    FX_BOOL                    GetMinWidth(FX_FLOAT &fMinWidth);\r
-    FX_BOOL                    GetMinHeight(FX_FLOAT &fMinHeight);\r
-\r
-    FX_BOOL                    GetMaxWidth(FX_FLOAT &fMaxWidth);\r
-    FX_BOOL                    GetMaxHeight(FX_FLOAT &fMaxHeight);\r
-\r
-    CXFA_BindItems     GetBindItems();\r
-    FX_BOOL                    SetAccess(FX_INT32 iAccess, FX_BOOL bNotify = TRUE);\r
-    FX_BOOL                    SetAccessKey(const CFX_WideString& wsAccessKey);\r
-    FX_BOOL                    SetAnchorType(FX_INT32 iType);\r
-    FX_BOOL                    SetColSpan(FX_INT32 iColSpan);\r
-    FX_BOOL                    SetPresence(FX_INT32 iPresence);\r
-    FX_BOOL                    SetRotate(FX_INT32 iRotate);\r
-    FX_BOOL                    SetRelevant(const CFX_WideString& wsRelevant);\r
-    FX_BOOL                    SetStatus(FX_DWORD dwStatus);\r
-    FX_BOOL                    SetWidth(FX_FLOAT fWidth);\r
-    FX_BOOL                    SetHeight(FX_FLOAT fHeight);\r
-    FX_BOOL                    SetMinWidth(FX_FLOAT fMinWidth);\r
-    FX_BOOL                    SetMinHeight(FX_FLOAT fMinHeight);\r
-    FX_BOOL                    SetMaxWidth(FX_FLOAT fMaxWidth);\r
-    FX_BOOL                    SetMaxHeight(FX_FLOAT fMaxHeight);\r
-    FX_BOOL                    SetPos(FX_FLOAT x, FX_FLOAT y);\r
-    FX_BOOL                    SetName(const CFX_WideString& wsName);\r
-    FX_BOOL                    SetButtonHighlight(FX_INT32 iButtonHighlight);\r
-    FX_BOOL                    SetButtonRollover(const CFX_WideString &wsRollover, FX_BOOL bRichText);\r
-    FX_BOOL                    SetButtonDown(const CFX_WideString& wsDown, FX_BOOL bRichText);\r
-    FX_BOOL                    SetCheckButtonShape(FX_INT32 iCheckButtonShape);\r
-    FX_BOOL                    SetCheckButtonMark(FX_INT32 iCheckButtonMark);\r
-    FX_BOOL                    SetCheckButtonSize(FX_FLOAT fCheckButtonMark);\r
-\r
-    CXFA_Border                GetUIBorder(FX_BOOL bModified = FALSE);\r
-\r
-    CXFA_Margin                GetUIMargin(FX_BOOL bModified = FALSE);\r
-    void                       GetUIMargin(CFX_RectF &rtUIMargin);\r
-\r
-    FX_INT32           GetButtonHighlight();\r
-    FX_BOOL                    GetButtonRollover(CFX_WideString &wsRollover, FX_BOOL &bRichText);\r
-    FX_BOOL                    GetButtonDown(CFX_WideString &wsDown, FX_BOOL &bRichText);\r
-\r
-\r
-    FX_INT32           GetCheckButtonShape();\r
-\r
-    FX_INT32           GetCheckButtonMark();\r
-\r
-    FX_FLOAT           GetCheckButtonSize();\r
-\r
-    FX_BOOL                    IsAllowNeutral();\r
-    FX_BOOL                    IsRadioButton();\r
-    XFA_CHECKSTATE     GetCheckState();\r
-    void                       SetCheckState(XFA_CHECKSTATE eCheckState, FX_BOOL bNotify = TRUE);\r
-\r
-    CXFA_Node*         GetExclGroupNode();\r
-\r
-    CXFA_Node*         GetSelectedMember();\r
-\r
-    CXFA_Node*         SetSelectedMember(FX_WSTR wsName, FX_BOOL bNotify = TRUE);\r
-\r
-    void                       SetSelectedMemberByValue(FX_WSTR wsValue, FX_BOOL bNotify = TRUE, FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);\r
-    CXFA_Node*         GetExclGroupFirstMember();\r
-    CXFA_Node*         GetExclGroupNextMember(CXFA_Node* pNode);\r
-\r
-    FX_INT32           GetChoiceListCommitOn();\r
-\r
-    FX_BOOL                    IsChoiceListAllowTextEntry();\r
-\r
-    FX_INT32           GetChoiceListOpen();\r
-    FX_BOOL                    IsListBox();\r
-    FX_INT32           CountChoiceListItems(FX_BOOL bSaveValue = FALSE);\r
-\r
-    FX_BOOL                    GetChoiceListItem(CFX_WideString &wsText, FX_INT32 nIndex, FX_BOOL bSaveValue = FALSE);\r
-    void                       GetChoiceListItems(CFX_WideStringArray &wsTextArray, FX_BOOL bSaveValue = FALSE);\r
-\r
-    FX_INT32           CountSelectedItems();\r
-\r
-    FX_INT32           GetSelectedItem(FX_INT32 nIndex = 0);\r
-    void                       GetSelectedItems(CFX_Int32Array &iSelArray);\r
-    void                       GetSelectedItemsValue(CFX_WideStringArray &wsSelTextArray);\r
-\r
-    FX_BOOL                    GetItemState(FX_INT32 nIndex);\r
-\r
-    void                       SetItemState(FX_INT32 nIndex, FX_BOOL bSelected, FX_BOOL bNotify = FALSE, FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);\r
-    void                       SetSelectdItems(CFX_Int32Array &iSelArray, FX_BOOL bNotify = FALSE, FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);\r
-    void                       ClearAllSelections();\r
-    void                       InsertItem(const CFX_WideString &wsLabel, const CFX_WideString &wsValue, FX_INT32 nIndex = -1, FX_BOOL bNotify = FALSE);\r
-    void                       GetItemLabel(FX_WSTR wsValue, CFX_WideString &wsLabel);\r
-    void                       GetItemValue(FX_WSTR wsLabel, CFX_WideString &wsValue);\r
-    FX_BOOL                    DeleteItem(FX_INT32 nIndex, FX_BOOL bNotify = FALSE, FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);\r
-\r
-    FX_INT32           GetHorizontalScrollPolicy();\r
-\r
-    FX_INT32           GetNumberOfCells();\r
-\r
-    FX_BOOL                    IsDateTimeEditUsePicker();\r
-\r
-    FX_BOOL            SetValue(const CFX_WideString& wsValue, XFA_VALUEPICTURE eValueType);\r
-    FX_BOOL            GetPictureContent(CFX_WideString &wsPicture, XFA_VALUEPICTURE ePicture);\r
-    IFX_Locale* GetLocal();\r
-    FX_BOOL            GetValue(CFX_WideString &wsValue, XFA_VALUEPICTURE eValueType);\r
-    FX_BOOL            GetNormalizeDataValue(FX_WSTR wsValue, CFX_WideString &wsNormalizeValue);\r
-    FX_BOOL            GetFormatDataValue(FX_WSTR wsValue, CFX_WideString &wsFormatedValue);\r
-    void               NormalizeNumStr(const CFX_WideString& wsValue, CFX_WideString& wsOutput);\r
-\r
-    CFX_WideString     GetBarcodeType();\r
-    FX_BOOL                    GetBarcodeAttribute_CharEncoding(FX_INT32& val);\r
-    FX_BOOL                    GetBarcodeAttribute_Checksum(FX_INT32& val);\r
-    FX_BOOL                    GetBarcodeAttribute_DataLength(FX_INT32& val);\r
-    FX_BOOL                    GetBarcodeAttribute_StartChar(FX_CHAR& val);\r
-    FX_BOOL                    GetBarcodeAttribute_EndChar(FX_CHAR& val);\r
-    FX_BOOL                    GetBarcodeAttribute_ECLevel(FX_INT32& val);\r
-    FX_BOOL                    GetBarcodeAttribute_ModuleWidth(FX_INT32& val);\r
-    FX_BOOL                    GetBarcodeAttribute_ModuleHeight(FX_INT32& val);\r
-    FX_BOOL                    GetBarcodeAttribute_PrintChecksum(FX_BOOL& val);\r
-    FX_BOOL                    GetBarcodeAttribute_TextLocation(FX_INT32& val);\r
-    FX_BOOL                    GetBarcodeAttribute_Truncate(FX_BOOL& val);\r
-    FX_BOOL                    GetBarcodeAttribute_WideNarrowRatio(FX_FLOAT& val);\r
-\r
-    void                       GetPasswordChar(CFX_WideString &wsPassWord);\r
-\r
-    FX_BOOL                    IsAllowRichText();\r
-\r
-    FX_BOOL                    IsMultiLine();\r
-\r
-    FX_INT32           GetVerticalScrollPolicy();\r
-\r
-    FX_INT32           GetMaxChars(XFA_ELEMENT& eType);\r
-\r
-    FX_BOOL                    GetFracDigits(FX_INT32 &iFracDigits);\r
-\r
-    FX_BOOL                    GetLeadDigits(FX_INT32 &iLeadDigits);\r
-\r
-    CXFA_Filter                GetFilter(FX_BOOL bModified = FALSE);\r
-    CXFA_Manifest      GetManifest(FX_BOOL bModified = FALSE);\r
-    FX_BOOL                    m_bIsNull;\r
-    FX_BOOL                    m_bPreNull;\r
+    CXFA_Node*          GetUIChild();\r
+\r
+    XFA_ELEMENT         GetUIType();\r
+    CFX_WideString      GetRawValue();\r
+    FX_INT32            GetAccess(FX_BOOL bTemplate = FALSE);\r
+    FX_BOOL             GetAccessKey(CFX_WideStringC &wsAccessKey);\r
+    FX_INT32            GetAnchorType();\r
+    FX_INT32            GetColSpan();\r
+    FX_INT32            GetPresence();\r
+    FX_INT32            GetRotate();\r
+    CXFA_Border         GetBorder(FX_BOOL bModified = FALSE);\r
+    CXFA_Caption        GetCaption(FX_BOOL bModified = FALSE);\r
+    CXFA_Font           GetFont(FX_BOOL bModified = FALSE);\r
+    CXFA_Margin         GetMargin(FX_BOOL bModified = FALSE);\r
+    CXFA_Para           GetPara(FX_BOOL bModified = FALSE);\r
+    CXFA_Keep           GetKeep(FX_BOOL bModified = FALSE);\r
+    void                GetEventList(CXFA_NodeArray &events);\r
+    FX_INT32            GetEventByActivity(FX_INT32 iActivity,\r
+                                           CXFA_NodeArray &events,\r
+                                           FX_BOOL bIsFormReady = FALSE);\r
+    CXFA_Value          GetDefaultValue(FX_BOOL bModified = FALSE);\r
+    CXFA_Value          GetFormValue(FX_BOOL bModified = FALSE);\r
+    CXFA_Calculate      GetCalculate(FX_BOOL bModified = FALSE);\r
+    CXFA_Validate       GetValidate(FX_BOOL bModified = FALSE);\r
+    CXFA_Variables      GetVariables(FX_BOOL bModified = FALSE);\r
+    CXFA_Bind           GetBind(FX_BOOL bModified = FALSE);\r
+    CXFA_Assist         GetAssist(FX_BOOL bModified = FALSE);\r
+    void                GetRelevant(CFX_WideStringC &wsRelevant);\r
+    FX_DWORD            GetRelevantStatus();\r
+    FX_BOOL             GetWidth(FX_FLOAT &fWidth);\r
+    FX_BOOL             GetHeight(FX_FLOAT &fHeight);\r
+    FX_BOOL             GetMinWidth(FX_FLOAT &fMinWidth);\r
+    FX_BOOL             GetMinHeight(FX_FLOAT &fMinHeight);\r
+    FX_BOOL             GetMaxWidth(FX_FLOAT &fMaxWidth);\r
+    FX_BOOL             GetMaxHeight(FX_FLOAT &fMaxHeight);\r
+    CXFA_BindItems      GetBindItems();\r
+    FX_BOOL             SetAccess(FX_INT32 iAccess, FX_BOOL bNotify = TRUE);\r
+    FX_BOOL             SetAccessKey(const CFX_WideString& wsAccessKey);\r
+    FX_BOOL             SetAnchorType(FX_INT32 iType);\r
+    FX_BOOL             SetColSpan(FX_INT32 iColSpan);\r
+    FX_BOOL             SetPresence(FX_INT32 iPresence);\r
+    FX_BOOL             SetRotate(FX_INT32 iRotate);\r
+    FX_BOOL             SetRelevant(const CFX_WideString& wsRelevant);\r
+    FX_BOOL             SetStatus(FX_DWORD dwStatus);\r
+    FX_BOOL             SetWidth(FX_FLOAT fWidth);\r
+    FX_BOOL             SetHeight(FX_FLOAT fHeight);\r
+    FX_BOOL             SetMinWidth(FX_FLOAT fMinWidth);\r
+    FX_BOOL             SetMinHeight(FX_FLOAT fMinHeight);\r
+    FX_BOOL             SetMaxWidth(FX_FLOAT fMaxWidth);\r
+    FX_BOOL             SetMaxHeight(FX_FLOAT fMaxHeight);\r
+    FX_BOOL             SetPos(FX_FLOAT x, FX_FLOAT y);\r
+    FX_BOOL             SetName(const CFX_WideString& wsName);\r
+    FX_BOOL             SetButtonHighlight(FX_INT32 iButtonHighlight);\r
+    FX_BOOL             SetButtonRollover(const CFX_WideString &wsRollover, FX_BOOL bRichText);\r
+    FX_BOOL             SetButtonDown(const CFX_WideString& wsDown, FX_BOOL bRichText);\r
+    FX_BOOL             SetCheckButtonShape(FX_INT32 iCheckButtonShape);\r
+    FX_BOOL             SetCheckButtonMark(FX_INT32 iCheckButtonMark);\r
+    FX_BOOL             SetCheckButtonSize(FX_FLOAT fCheckButtonMark);\r
+    CXFA_Border         GetUIBorder(FX_BOOL bModified = FALSE);\r
+    CXFA_Margin         GetUIMargin(FX_BOOL bModified = FALSE);\r
+    void                GetUIMargin(CFX_RectF &rtUIMargin);\r
+    FX_INT32            GetButtonHighlight();\r
+    FX_BOOL             GetButtonRollover(CFX_WideString &wsRollover, FX_BOOL &bRichText);\r
+    FX_BOOL             GetButtonDown(CFX_WideString &wsDown, FX_BOOL &bRichText);\r
+    FX_INT32            GetCheckButtonShape();\r
+    FX_INT32            GetCheckButtonMark();\r
+    FX_FLOAT            GetCheckButtonSize();\r
+    FX_BOOL             IsAllowNeutral();\r
+    FX_BOOL             IsRadioButton();\r
+    XFA_CHECKSTATE      GetCheckState();\r
+    void                SetCheckState(XFA_CHECKSTATE eCheckState, FX_BOOL bNotify = TRUE);\r
+    CXFA_Node*          GetExclGroupNode();\r
+    CXFA_Node*          GetSelectedMember();\r
+    CXFA_Node*          SetSelectedMember(FX_WSTR wsName, FX_BOOL bNotify = TRUE);\r
+    void                SetSelectedMemberByValue(FX_WSTR wsValue, \r
+                                                 FX_BOOL bNotify = TRUE,\r
+                                                 FX_BOOL bScriptModify = FALSE,\r
+                                                 FX_BOOL bSyncData = TRUE);\r
+    CXFA_Node*          GetExclGroupFirstMember();\r
+    CXFA_Node*          GetExclGroupNextMember(CXFA_Node* pNode);\r
+    FX_INT32            GetChoiceListCommitOn();\r
+    FX_BOOL             IsChoiceListAllowTextEntry();\r
+    FX_INT32            GetChoiceListOpen();\r
+    FX_BOOL             IsListBox();\r
+    FX_INT32            CountChoiceListItems(FX_BOOL bSaveValue = FALSE);\r
+    FX_BOOL             GetChoiceListItem(CFX_WideString &wsText, FX_INT32 nIndex, FX_BOOL bSaveValue = FALSE);\r
+    void                GetChoiceListItems(CFX_WideStringArray &wsTextArray, FX_BOOL bSaveValue = FALSE);\r
+    FX_INT32            CountSelectedItems();\r
+    FX_INT32            GetSelectedItem(FX_INT32 nIndex = 0);\r
+    void                GetSelectedItems(CFX_Int32Array &iSelArray);\r
+    void                GetSelectedItemsValue(CFX_WideStringArray &wsSelTextArray);\r
+    FX_BOOL             GetItemState(FX_INT32 nIndex);\r
+    void                SetItemState(FX_INT32 nIndex, FX_BOOL bSelected, \r
+                                     FX_BOOL bNotify = FALSE, FX_BOOL bScriptModify = FALSE, \r
+                                     FX_BOOL bSyncData = TRUE);\r
+    void                SetSelectdItems(CFX_Int32Array &iSelArray, FX_BOOL bNotify = FALSE,\r
+                                        FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);\r
+    void                ClearAllSelections();\r
+    void                InsertItem(const CFX_WideString &wsLabel, const CFX_WideString &wsValue,\r
+                                   FX_INT32 nIndex = -1, FX_BOOL bNotify = FALSE);\r
+    void                GetItemLabel(FX_WSTR wsValue, CFX_WideString &wsLabel);\r
+    void                GetItemValue(FX_WSTR wsLabel, CFX_WideString &wsValue);\r
+    FX_BOOL             DeleteItem(FX_INT32 nIndex, FX_BOOL bNotify = FALSE,\r
+                                   FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);\r
+    FX_INT32            GetHorizontalScrollPolicy();\r
+    FX_INT32            GetNumberOfCells();\r
+    FX_BOOL             IsDateTimeEditUsePicker();\r
+    FX_BOOL             SetValue(const CFX_WideString& wsValue, XFA_VALUEPICTURE eValueType);\r
+    FX_BOOL             GetPictureContent(CFX_WideString &wsPicture, XFA_VALUEPICTURE ePicture);\r
+    IFX_Locale*         GetLocal();\r
+    FX_BOOL             GetValue(CFX_WideString &wsValue, XFA_VALUEPICTURE eValueType);\r
+    FX_BOOL             GetNormalizeDataValue(FX_WSTR wsValue, CFX_WideString &wsNormalizeValue);\r
+    FX_BOOL             GetFormatDataValue(FX_WSTR wsValue, CFX_WideString &wsFormatedValue);\r
+    void                NormalizeNumStr(const CFX_WideString& wsValue, CFX_WideString& wsOutput);\r
+    CFX_WideString      GetBarcodeType();\r
+    FX_BOOL             GetBarcodeAttribute_CharEncoding(FX_INT32& val);\r
+    FX_BOOL             GetBarcodeAttribute_Checksum(FX_INT32& val);\r
+    FX_BOOL             GetBarcodeAttribute_DataLength(FX_INT32& val);\r
+    FX_BOOL             GetBarcodeAttribute_StartChar(FX_CHAR& val);\r
+    FX_BOOL             GetBarcodeAttribute_EndChar(FX_CHAR& val);\r
+    FX_BOOL             GetBarcodeAttribute_ECLevel(FX_INT32& val);\r
+    FX_BOOL             GetBarcodeAttribute_ModuleWidth(FX_INT32& val);\r
+    FX_BOOL             GetBarcodeAttribute_ModuleHeight(FX_INT32& val);\r
+    FX_BOOL             GetBarcodeAttribute_PrintChecksum(FX_BOOL& val);\r
+    FX_BOOL             GetBarcodeAttribute_TextLocation(FX_INT32& val);\r
+    FX_BOOL             GetBarcodeAttribute_Truncate(FX_BOOL& val);\r
+    FX_BOOL             GetBarcodeAttribute_WideNarrowRatio(FX_FLOAT& val);\r
+    void                GetPasswordChar(CFX_WideString &wsPassWord);\r
+    FX_BOOL             IsAllowRichText();\r
+    FX_BOOL             IsMultiLine();\r
+    FX_INT32            GetVerticalScrollPolicy();\r
+    FX_INT32            GetMaxChars(XFA_ELEMENT& eType);\r
+    FX_BOOL             GetFracDigits(FX_INT32 &iFracDigits);\r
+    FX_BOOL             GetLeadDigits(FX_INT32 &iLeadDigits);\r
+    CXFA_Filter         GetFilter(FX_BOOL bModified = FALSE);\r
+    CXFA_Manifest       GetManifest(FX_BOOL bModified = FALSE);\r
+\r
+    FX_BOOL             m_bIsNull;\r
+    FX_BOOL             m_bPreNull;\r
 protected:\r
-    void                       SyncValue(const CFX_WideString& wsValue, FX_BOOL bNotify);\r
-    void                       InsertListTextItem(CXFA_Node* pItems, FX_WSTR wsText, FX_INT32 nIndex = -1);\r
-    void                       FormatNumStr(const CFX_WideString& wsValue, IFX_Locale* pLocale, CFX_WideString& wsOutput);\r
-    CXFA_Node*         m_pUiChildNode;\r
-    XFA_ELEMENT                m_eUIType;\r
+    void                SyncValue(const CFX_WideString& wsValue, FX_BOOL bNotify);\r
+    void                InsertListTextItem(CXFA_Node* pItems, FX_WSTR wsText, FX_INT32 nIndex = -1);\r
+    void                FormatNumStr(const CFX_WideString& wsValue, IFX_Locale* pLocale, CFX_WideString& wsOutput);\r
+\r
+    CXFA_Node*          m_pUiChildNode;\r
+    XFA_ELEMENT         m_eUIType;\r
 };\r
 class CXFA_Occur : public CXFA_Data\r
 {\r
index eaa1a9b..68bd599 100644 (file)
@@ -30,6 +30,7 @@ enum XFA_ItemLayoutProcessorStages {
     XFA_ItemLayoutProcessorStages_BookendTrailer,\r
     XFA_ItemLayoutProcessorStages_Done,\r
 };\r
+\r
 class CXFA_LayoutContext\r
 {\r
 public:\r
@@ -44,89 +45,146 @@ public:
     {\r
         m_pOverflowProcessor = NULL;\r
     }\r
-    CFX_ArrayTemplate<FX_FLOAT>*       m_prgSpecifiedColumnWidths;\r
-    FX_FLOAT                                           m_fCurColumnWidth;\r
-    FX_BOOL                                                    m_bCurColumnWidthAvaiable;\r
-    CXFA_ItemLayoutProcessor*          m_pOverflowProcessor;\r
-    CXFA_Node*                                         m_pOverflowNode;\r
+    CFX_ArrayTemplate<FX_FLOAT>*    m_prgSpecifiedColumnWidths;\r
+    FX_FLOAT                        m_fCurColumnWidth;\r
+    FX_BOOL                         m_bCurColumnWidthAvaiable;\r
+    CXFA_ItemLayoutProcessor*       m_pOverflowProcessor;\r
+    CXFA_Node*                      m_pOverflowNode;\r
 };\r
+\r
 class CXFA_ItemLayoutProcessor\r
 {\r
 public:\r
     CXFA_ItemLayoutProcessor(CXFA_Node *pNode, CXFA_LayoutPageMgr* pPageMgr);\r
-    XFA_ItemLayoutProcessorResult DoLayout(FX_BOOL bUseBreakControl, FX_FLOAT fHeightLimit, FX_FLOAT fRealHeight = XFA_LAYOUT_FLOAT_MAX, CXFA_LayoutContext* pContext = NULL);\r
-    void GetCurrentComponentPos(FX_FLOAT& fAbsoluteX, FX_FLOAT& fAbsoluteY);\r
-    void GetCurrentComponentSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight);\r
-    void SetCurrentComponentPos(FX_FLOAT fAbsoluteX, FX_FLOAT fAbsoluteY);\r
-    void SetCurrentComponentSize(FX_FLOAT fWidth, FX_FLOAT fHeight);\r
-    inline CXFA_Node*                  GetFormNode()\r
+\r
+    XFA_ItemLayoutProcessorResult   DoLayout(FX_BOOL bUseBreakControl, \r
+                                             FX_FLOAT fHeightLimit,\r
+                                             FX_FLOAT fRealHeight = XFA_LAYOUT_FLOAT_MAX,\r
+                                             CXFA_LayoutContext* pContext = NULL);\r
+\r
+    void                            GetCurrentComponentPos(FX_FLOAT& fAbsoluteX,\r
+                                                           FX_FLOAT& fAbsoluteY);\r
+\r
+    void                            GetCurrentComponentSize(FX_FLOAT& fWidth, \r
+                                                            FX_FLOAT& fHeight);\r
+\r
+    void                            SetCurrentComponentPos(FX_FLOAT fAbsoluteX,\r
+                                                           FX_FLOAT fAbsoluteY);\r
+\r
+    void                            SetCurrentComponentSize(FX_FLOAT fWidth,\r
+                                                            FX_FLOAT fHeight);\r
+    inline CXFA_Node*               GetFormNode()\r
     {\r
         return m_pFormNode;\r
     }\r
-    inline FX_BOOL                             HasLayoutItem()\r
+    inline FX_BOOL                  HasLayoutItem()\r
     {\r
         return m_pLayoutItem != NULL;\r
     }\r
-    CXFA_ContentLayoutItemImpl* ExtractLayoutItem();\r
-\r
-    static FX_BOOL  IncrementRelayoutNode(CXFA_LayoutProcessor* pLayoutProcessor, CXFA_Node *pNode, CXFA_Node *pParentNode);\r
-    static void                CalculatePositionedContainerPos(CXFA_Node* pNode, FX_FLOAT fWidth, FX_FLOAT fHeight, FX_FLOAT& fAbsoluteX, FX_FLOAT& fAbsoluteY);\r
-    static FX_BOOL     FindLayoutItemSplitPos(CXFA_ContentLayoutItemImpl* pLayoutItem, FX_FLOAT fCurVerticalOffset, FX_FLOAT& fProposedSplitPos, FX_BOOL& bAppChange, FX_BOOL bCalculateMargin = TRUE);\r
-    FX_FLOAT           FindSplitPos(FX_FLOAT fProposedSplitPos);\r
-    void                       SplitLayoutItem(CXFA_ContentLayoutItemImpl* pLayoutItem, CXFA_ContentLayoutItemImpl* pSecondParent, FX_FLOAT fSplitPos);\r
-    void                       SplitLayoutItem(FX_FLOAT fSplitPos);\r
-    FX_BOOL                    JudgePutNextPage(CXFA_ContentLayoutItemImpl* pParentLayoutItem, FX_FLOAT fChildHeight, CFX_ArrayTemplate<CXFA_ContentLayoutItemImpl*> &pKeepItems);\r
-    FX_BOOL                    ProcessKeepForSplite(CXFA_ItemLayoutProcessor* pParentProcessor, CXFA_ItemLayoutProcessor* pChildProcessor, XFA_ItemLayoutProcessorResult eRetValue,\r
-                                         CFX_ArrayTemplate<CXFA_ContentLayoutItemImpl*>& rgCurLineLayoutItem, FX_FLOAT& fContentCurRowAvailWidth,\r
-                                         FX_FLOAT& fContentCurRowHeight, FX_FLOAT& fContentCurRowY, FX_BOOL& bAddedItemInRow, FX_BOOL& bForceEndPage, XFA_ItemLayoutProcessorResult& result);\r
-    FX_FLOAT           InsertKeepLayoutItems();\r
-    void                       DoLayoutPageArea(CXFA_ContainerLayoutItemImpl* pPageAreaLayoutItem);\r
-    FX_BOOL                    CalculateRowChildPosition(CFX_ArrayTemplate<CXFA_ContentLayoutItemImpl*>(&rgCurLineLayoutItems)[3], XFA_ATTRIBUTEENUM eFlowStrategy, FX_BOOL bContainerHeightAutoSize,\r
-            FX_BOOL bContainerWidthAutoSize, FX_FLOAT& fContentCalculatedWidth, FX_FLOAT& fContentCalculatedHeight, FX_FLOAT& fContentCurRowY,\r
-            FX_FLOAT fContentCurRowHeight, FX_FLOAT fContentWidthLimit, FX_BOOL bRootForceTb = FALSE);\r
-    void                       ProcessUnUseOverFlow(CXFA_Node* pLeaderNode, CXFA_Node* pTrailerNode, CXFA_ContentLayoutItemImpl* pTrailerItem, CXFA_Node* pFormNode);\r
-    void                       ProcessUnUseBinds(CXFA_Node* pFormNode);\r
-    FX_BOOL                    IsAddNewRowForTrailer(CXFA_ContentLayoutItemImpl* pTrailerItem);\r
-    FX_BOOL                    JudgeLeaderOrTrailerForOccur(CXFA_Node* pFormNode);\r
+    CXFA_ContentLayoutItemImpl*     ExtractLayoutItem();\r
+\r
+    static FX_BOOL      IncrementRelayoutNode(CXFA_LayoutProcessor* pLayoutProcessor, \r
+                                              CXFA_Node *pNode, CXFA_Node *pParentNode);\r
+    static void                CalculatePositionedContainerPos(CXFA_Node* pNode, FX_FLOAT fWidth,\r
+                                                        FX_FLOAT fHeight, FX_FLOAT& fAbsoluteX,\r
+                                                        FX_FLOAT& fAbsoluteY);\r
+    static FX_BOOL      FindLayoutItemSplitPos(CXFA_ContentLayoutItemImpl* pLayoutItem,\r
+                                               FX_FLOAT fCurVerticalOffset, FX_FLOAT& fProposedSplitPos,\r
+                                               FX_BOOL& bAppChange, FX_BOOL bCalculateMargin = TRUE);\r
+    FX_FLOAT            FindSplitPos(FX_FLOAT fProposedSplitPos);\r
+    void                SplitLayoutItem(CXFA_ContentLayoutItemImpl* pLayoutItem,\r
+                                        CXFA_ContentLayoutItemImpl* pSecondParent,\r
+                                        FX_FLOAT fSplitPos);\r
+    void                SplitLayoutItem(FX_FLOAT fSplitPos);\r
+    FX_BOOL             JudgePutNextPage(CXFA_ContentLayoutItemImpl* pParentLayoutItem,\r
+                                         FX_FLOAT fChildHeight, \r
+                                         CFX_ArrayTemplate<CXFA_ContentLayoutItemImpl*> &pKeepItems);\r
+    FX_BOOL             ProcessKeepForSplite(CXFA_ItemLayoutProcessor* pParentProcessor,\r
+                                             CXFA_ItemLayoutProcessor* pChildProcessor,\r
+                                             XFA_ItemLayoutProcessorResult eRetValue,\r
+                                             CFX_ArrayTemplate<CXFA_ContentLayoutItemImpl*>& rgCurLineLayoutItem,\r
+                                             FX_FLOAT& fContentCurRowAvailWidth,\r
+                                             FX_FLOAT& fContentCurRowHeight,\r
+                                             FX_FLOAT& fContentCurRowY,\r
+                                             FX_BOOL& bAddedItemInRow,\r
+                                             FX_BOOL& bForceEndPage,\r
+                                             XFA_ItemLayoutProcessorResult& result);\r
+    FX_FLOAT            InsertKeepLayoutItems();\r
+    void                DoLayoutPageArea(CXFA_ContainerLayoutItemImpl* pPageAreaLayoutItem);\r
+    FX_BOOL             CalculateRowChildPosition(CFX_ArrayTemplate<CXFA_ContentLayoutItemImpl*>(&rgCurLineLayoutItems)[3],\r
+                                                  XFA_ATTRIBUTEENUM eFlowStrategy,\r
+                                                  FX_BOOL bContainerHeightAutoSize,\r
+                                                  FX_BOOL bContainerWidthAutoSize,\r
+                                                  FX_FLOAT& fContentCalculatedWidth,\r
+                                                  FX_FLOAT& fContentCalculatedHeight,\r
+                                                  FX_FLOAT& fContentCurRowY,\r
+                                                  FX_FLOAT fContentCurRowHeight,\r
+                                                  FX_FLOAT fContentWidthLimit,\r
+                                                  FX_BOOL bRootForceTb = FALSE);\r
+\r
+    void                ProcessUnUseOverFlow(CXFA_Node* pLeaderNode,\r
+                                             CXFA_Node* pTrailerNode,\r
+                                             CXFA_ContentLayoutItemImpl* pTrailerItem,\r
+                                             CXFA_Node* pFormNode);\r
+    void                ProcessUnUseBinds(CXFA_Node* pFormNode);\r
+    FX_BOOL             IsAddNewRowForTrailer(CXFA_ContentLayoutItemImpl* pTrailerItem);\r
+    FX_BOOL             JudgeLeaderOrTrailerForOccur(CXFA_Node* pFormNode);\r
     CXFA_ContentLayoutItemImpl* CreateContentLayoutItem(CXFA_Node* pFormNode);\r
 protected:\r
-    void       DoLayoutPositionedContainer(CXFA_LayoutContext* pContext = NULL);\r
+\r
+    void        DoLayoutPositionedContainer(CXFA_LayoutContext* pContext = NULL);\r
     void       DoLayoutTableContainer(CXFA_Node* pLayoutNode);\r
-    XFA_ItemLayoutProcessorResult DoLayoutFlowedContainer(FX_BOOL bUseBreakControl, XFA_ATTRIBUTEENUM eFlowStrategy, FX_FLOAT fHeightLimit, FX_FLOAT fRealHeight, CXFA_LayoutContext* pContext = NULL, FX_BOOL bRootForceTb = FALSE);\r
+    XFA_ItemLayoutProcessorResult DoLayoutFlowedContainer(FX_BOOL bUseBreakControl,\r
+                                                          XFA_ATTRIBUTEENUM eFlowStrategy,\r
+                                                          FX_FLOAT fHeightLimit,\r
+                                                          FX_FLOAT fRealHeight,\r
+                                                          CXFA_LayoutContext* pContext = NULL,\r
+                                                          FX_BOOL bRootForceTb = FALSE);\r
     void       DoLayoutField();\r
-    void       XFA_ItemLayoutProcessor_GotoNextContainerNode(CXFA_Node*& pCurActionNode, XFA_ItemLayoutProcessorStages& nCurStage, CXFA_Node* pParentContainer, FX_BOOL bUsePageBreak);\r
-    FX_BOOL ProcessKeepNodesForCheckNext(CXFA_Node*& pCurActionNode, XFA_ItemLayoutProcessorStages& nCurStage, CXFA_Node*& pNextContainer, FX_BOOL& bLastKeepNode);\r
-    FX_BOOL ProcessKeepNodesForBreakBefore(CXFA_Node*& pCurActionNode, XFA_ItemLayoutProcessorStages& nCurStage, CXFA_Node* pContainerNode);\r
-    CXFA_Node* GetSubformSetParent(CXFA_Node* pSubformSet);\r
+    void       XFA_ItemLayoutProcessor_GotoNextContainerNode(CXFA_Node*& pCurActionNode,\r
+                                                              XFA_ItemLayoutProcessorStages& nCurStage,\r
+                                                              CXFA_Node* pParentContainer,\r
+                                                              FX_BOOL bUsePageBreak);\r
+\r
+    FX_BOOL     ProcessKeepNodesForCheckNext(CXFA_Node*& pCurActionNode,\r
+                                             XFA_ItemLayoutProcessorStages& nCurStage,\r
+                                             CXFA_Node*& pNextContainer,\r
+                                             FX_BOOL& bLastKeepNode);\r
+\r
+    FX_BOOL     ProcessKeepNodesForBreakBefore(CXFA_Node*& pCurActionNode,\r
+                                               XFA_ItemLayoutProcessorStages& nCurStage,\r
+                                               CXFA_Node* pContainerNode);\r
+\r
+    CXFA_Node*  GetSubformSetParent(CXFA_Node* pSubformSet);\r
 \r
 public:\r
-    FX_BOOL            m_bKeepBreakFinish;\r
-    FX_BOOL            m_bIsProcessKeep;\r
-    CXFA_Node* m_pKeepHeadNode;\r
-    CXFA_Node* m_pKeepTailNode;\r
-    CXFA_Node*                                         m_pFormNode;\r
-    CXFA_ContentLayoutItemImpl*                m_pLayoutItem;\r
+    FX_BOOL                                         m_bKeepBreakFinish;\r
+    FX_BOOL                                         m_bIsProcessKeep;\r
+    CXFA_Node*                                      m_pKeepHeadNode;\r
+    CXFA_Node*                                      m_pKeepTailNode;\r
+    CXFA_Node*                                      m_pFormNode;\r
+    CXFA_ContentLayoutItemImpl*                            m_pLayoutItem;\r
 #ifdef _XFA_LAYOUTITEM_ProcessCACHE_\r
-    CXFA_ContentLayoutItemImpl*                m_pOldLayoutItem;\r
+    CXFA_ContentLayoutItemImpl*                            m_pOldLayoutItem;\r
 #else\r
-    CXFA_LayoutPageMgr*                                m_pPageMgrCreateItem;\r
+    CXFA_LayoutPageMgr*                             m_pPageMgrCreateItem;\r
 #endif\r
-    CXFA_Node*                                         m_pCurChildNode;\r
-    CXFA_ItemLayoutProcessor*          m_pCurChildPreprocessor;\r
-    XFA_ItemLayoutProcessorStages      m_nCurChildNodeStage;\r
-    FX_FLOAT                                           m_fUsedSize;\r
-    CXFA_LayoutPageMgr*                                m_pPageMgr;\r
-    CFX_PtrList                                                m_rgPendingNodes;\r
-    FX_BOOL                                                    m_bBreakPending;\r
-    CFX_ArrayTemplate<FX_FLOAT>                m_rgSpecifiedColumnWidths;\r
-    CFX_ArrayTemplate<CXFA_ContentLayoutItemImpl*> m_arrayKeepItems;\r
-    CFX_MapPtrToPtr                                    m_PendingNodesCount;\r
-    FX_FLOAT                                           m_fLastRowWidth;\r
-    FX_FLOAT                                           m_fLastRowY;\r
-    FX_FLOAT                                           m_fWidthLimite;\r
-    FX_BOOL                                                    m_bUseInheriated;\r
-    XFA_ItemLayoutProcessorResult   m_ePreProcessRs;\r
-    FX_BOOL                                                    m_bHasAvailHeight;\r
+    CXFA_Node*                                      m_pCurChildNode;\r
+    CXFA_ItemLayoutProcessor*                       m_pCurChildPreprocessor;\r
+    XFA_ItemLayoutProcessorStages                   m_nCurChildNodeStage;\r
+    FX_FLOAT                                        m_fUsedSize;\r
+    CXFA_LayoutPageMgr*                                    m_pPageMgr;\r
+    CFX_PtrList                                     m_rgPendingNodes;\r
+    FX_BOOL                                         m_bBreakPending;\r
+    CFX_ArrayTemplate<FX_FLOAT>                     m_rgSpecifiedColumnWidths;\r
+    CFX_ArrayTemplate<CXFA_ContentLayoutItemImpl*>  m_arrayKeepItems;\r
+    CFX_MapPtrToPtr                                 m_PendingNodesCount;\r
+    FX_FLOAT                                        m_fLastRowWidth;\r
+    FX_FLOAT                                        m_fLastRowY;\r
+    FX_FLOAT                                        m_fWidthLimite;\r
+    FX_BOOL                                         m_bUseInheriated;\r
+    XFA_ItemLayoutProcessorResult                   m_ePreProcessRs;\r
+    FX_BOOL                                         m_bHasAvailHeight;\r
 };\r
 FX_BOOL XFA_ItemLayoutProcessor_IsTakingSpace(CXFA_Node* pNode);\r
 #endif\r