diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-02-25 12:08:02 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-02-25 12:08:02 -0800 |
| commit | 6941d29a825a815bebf93e07c3f2e2274399c7a4 (patch) | |
| tree | 222d611e79399d49dce45be9bbb1e0bd0efbfcb3 /xfa/src/fwl | |
| parent | 6b7b5a52f42aa9b37be5307915885d5f4566c326 (diff) | |
| download | pdfium-6941d29a825a815bebf93e07c3f2e2274399c7a4.tar.xz | |
Remove set but unsed variables.
And other nearby dead code.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1740613002 .
Diffstat (limited to 'xfa/src/fwl')
| -rw-r--r-- | xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp | 4 | ||||
| -rw-r--r-- | xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fwl/src/core/fwl_gridimp.cpp | 7 |
3 files changed, 2 insertions, 11 deletions
diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index 6eca31c9ee..b5c59f35f6 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -1020,7 +1020,6 @@ int32_t CFWL_DateTimePickerImpDelegate::OnProcessMessage( if (!pMessage) return 0; FX_DWORD dwMsgCode = pMessage->GetClassID(); - int32_t iRet = 1; switch (dwMsgCode) { case FWL_MSGHASH_SetFocus: case FWL_MSGHASH_KillFocus: { @@ -1051,7 +1050,8 @@ int32_t CFWL_DateTimePickerImpDelegate::OnProcessMessage( } break; } - default: { iRet = 0; } + default: + break; } if (dwMsgCode == FWL_MSGHASH_Key && m_pOwner->m_pEdit->GetStates() & FWL_WGTSTATE_Focused) { diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index aee5cb60c3..2ce286b955 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -322,8 +322,6 @@ void CFWL_MonthCalendarImp::DrawWeek(CFX_Graphics* pGraphics, params.m_pGraphics = pGraphics; params.m_dwStates = FWL_PARTSTATE_MCD_Normal; params.m_iTTOAlign = FDE_TTOALIGNMENT_Center; - int32_t iWeek; - iWeek = m_pDateTime->GetDayOfWeek(); CFX_RectF rtDayOfWeek; if (pMatrix) { params.m_matrix.Concat(*pMatrix); diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index e9dd74e296..b7d255ce32 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); |