diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-05-12 16:17:43 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-05-12 16:18:37 +0200 |
| commit | 2a2a180d610eb92a6d856336527f3f8388244832 (patch) | |
| tree | 053f6aa59e8c16e4afec4fb2327761f6805941ec /sw/source/ui/table | |
| parent | 2bb4d6cad41765db299db45511d2554984666085 (diff) | |
sw: Hopefully the last round of renames.
Change-Id: I85eb5e9ca018afa25a06947eed5af1ab529dd65d
Diffstat (limited to 'sw/source/ui/table')
| -rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 10 | ||||
| -rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 30f5dd4e76e9..19b3b79af16d 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -984,7 +984,7 @@ void SwTableColumnPage::ModifyHdl( MetricField* pField ) UpdateCols( aValueTbl[i] ); } -void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos ) +void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos ) { SwTwips nSum = 0; @@ -994,10 +994,10 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos ) } SwTwips nDiff = nSum - nTableWidth; - bool bModifyTable = m_pModifyTableCB->IsChecked(); + bool bModifyTableChecked = m_pModifyTableCB->IsChecked(); bool bProp = m_pProportionalCB->IsChecked(); - if(!bModifyTable && !bProp ) + if (!bModifyTableChecked && !bProp) { //The table width is constant, the difference is balanced with the other columns sal_uInt16 nLoopCount = 0; @@ -1037,7 +1037,7 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos ) } } } - else if(bModifyTable && !bProp) + else if (bModifyTableChecked && !bProp) { //Difference is balanced by the width of the table, //other columns remain unchanged. @@ -1053,7 +1053,7 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos ) nTableWidth += nDiff; } } - else if(bModifyTable && bProp) + else if (bModifyTableChecked && bProp) { //All columns will be changed proportionally with, //the table width is adjusted accordingly. diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 96a61e4f3800..345c7be87bc0 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -145,7 +145,7 @@ void SwStringInputDlg::dispose() // AutoFormat-Dialogue: SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell, - bool bSetAutoFormat, const SwTableAutoFmt* pSelFmt ) + bool bAutoFormat, const SwTableAutoFmt* pSelFmt ) : SfxModalDialog(pParent, "AutoFormatTableDialog", "modules/swriter/ui/autoformattable.ui") , aStrTitle(SW_RES(STR_ADD_AUTOFORMAT_TITLE)) , aStrLabel(SW_RES(STR_ADD_AUTOFORMAT_LABEL)) @@ -158,7 +158,7 @@ SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell, , nIndex(0) , nDfltStylePos(0) , bCoreDataChanged(false) - , bSetAutoFmt(bSetAutoFormat) + , bSetAutoFmt(bAutoFormat) { get(m_pLbFormat, "formatlb"); get(m_pFormatting, "formatting"); |