| Index: xfa/src/fwl/src/core/fwl_gridimp.cpp
|
| diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp
|
| index e9dd74e2967978add76a7bbe2bccaceabb92a77d..b7d255ce32c24bc86d0b7e13924667ab5b6b2cb0 100644
|
| --- a/xfa/src/fwl/src/core/fwl_gridimp.cpp
|
| +++ b/xfa/src/fwl/src/core/fwl_gridimp.cpp
|
| @@ -1164,16 +1164,11 @@ void CFWL_GridImp::SetAllWidgetsRect() {
|
| GetWidgetMargin(pWidget, FWL_GRIDMARGIN_Top, fTopMargin);
|
| FX_BOOL bBottomMargin =
|
| GetWidgetMargin(pWidget, FWL_GRIDMARGIN_Bottom, fBottomMargin);
|
| - FWL_LAYOUTDATA ltd;
|
| - ltd.fWidth = 0;
|
| - ltd.fHeight = 0;
|
| if (pInfo->m_Size[FWL_GRIDSIZE_Width].eUnit == FWL_GRIDUNIT_Fixed) {
|
| SetWidgetActualWidth(pInfo, pInfo->m_Size[FWL_GRIDSIZE_Width].fLength);
|
| - ltd.fWidth = pInfo->m_fActualWidth;
|
| } else {
|
| if (bLeftMargin && bRightMargin) {
|
| SetWidgetActualWidth(pInfo, fColumnWidth - fLeftMargin - fRightMargin);
|
| - ltd.fWidth = pInfo->m_fActualWidth;
|
| } else {
|
| CFX_RectF rtAuto;
|
| pWidget->GetWidgetRect(rtAuto, TRUE);
|
| @@ -1182,11 +1177,9 @@ void CFWL_GridImp::SetAllWidgetsRect() {
|
| }
|
| if (pInfo->m_Size[FWL_GRIDSIZE_Height].eUnit == FWL_GRIDUNIT_Fixed) {
|
| SetWidgetActualHeight(pInfo, pInfo->m_Size[FWL_GRIDSIZE_Height].fLength);
|
| - ltd.fHeight = pInfo->m_fActualHeight;
|
| } else {
|
| if (bTopMargin && bBottomMargin) {
|
| SetWidgetActualHeight(pInfo, fRowHeight - fTopMargin - fBottomMargin);
|
| - ltd.fHeight = pInfo->m_fActualHeight;
|
| } else {
|
| CFX_RectF rtAuto;
|
| pWidget->GetWidgetRect(rtAuto, TRUE);
|
|
|