[Libreoffice-commits] core.git: sw/source

[Jan Holesovsky]

 sw/source/ui/chrdlg/swuiccoll.cxx |    4 ++--
 sw/source/ui/fldui/fldvar.cxx     |    8 ++++----
 sw/source/ui/frmdlg/frmpage.cxx   |   10 +++++-----
 sw/source/ui/table/tabledlg.cxx   |   10 +++++-----
 sw/source/ui/table/tautofmt.cxx   |    4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 2a2a180d610eb92a6d856336527f3f8388244832
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue May 12 16:17:43 2015 +0200

    sw: Hopefully the last round of renames.
    
    Change-Id: I85eb5e9ca018afa25a06947eed5af1ab529dd65d

diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 3757b44..6989e6e 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -295,9 +295,9 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
     return 0;
 }
 
-void SwCondCollPage::SetCollection( SwFmt* pFormat, bool bNew )
+void SwCondCollPage::SetCollection(SwFmt* pNewFormat, bool bNew)
 {
-    pFmt = pFormat;
+    pFmt = pNewFormat;
     bNewTemplate = bNew;
 }
 
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 615ff1e..72bfdcf 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1024,14 +1024,14 @@ IMPL_LINK_TYPED( SwFldVarPage, TBClickHdl, ToolBox *, pBox, void )
                 {
                     if (nNumFormatPos != LISTBOX_ENTRY_NOTFOUND)
                     {
-                        sal_uLong nFmt = nNumFormatPos == 0 ? 0 : m_pNumFormatLB->GetFormat();
-                        if (nFmt)
+                        sal_uLong nNumberFormat = nNumFormatPos == 0 ? 0 : m_pNumFormatLB->GetFormat();
+                        if (nNumberFormat)
                         {   // Switch language to office-language because Kalkulator expects
                             // String in office format and it should be fed into dialog like
                             // that
-                            nFmt = SwValueField::GetSystemFormat(pSh->GetNumberFormatter(), nFmt);
+                            nNumberFormat = SwValueField::GetSystemFormat(pSh->GetNumberFormatter(), nNumberFormat);
                         }
-                        static_cast<SwUserFieldType*>(pType)->SetContent(m_pValueED->GetText(), nFmt);
+                        static_cast<SwUserFieldType*>(pType)->SetContent(m_pValueED->GetText(), nNumberFormat);
                         static_cast<SwUserFieldType*>(pType)->SetType(
                             nNumFormatPos == 0 ? nsSwGetSetExpType::GSE_STRING : nsSwGetSetExpType::GSE_EXPR );
                     }
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 17e23f5..faa0ff4 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2358,10 +2358,10 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
         m_pRelHeightRelationLB->SelectEntryPos(0);
 }
 
-void SwFrmPage::SetFormatUsed(bool bFmt)
+void SwFrmPage::SetFormatUsed(bool bFormatUsed)
 {
-    bFormat = bFmt;
-    if(bFormat)
+    bFormat = bFormatUsed;
+    if (bFormat)
     {
         m_pAnchorFrame->Hide();
     }
@@ -3210,9 +3210,9 @@ IMPL_LINK_NOARG(SwFrmAddPage, EditModifyHdl)
     return 0;
 }
 
-void SwFrmAddPage::SetFormatUsed(bool bFmt)
+void SwFrmAddPage::SetFormatUsed(bool bFormatUsed)
 {
-    bFormat = bFmt;
+    bFormat = bFormatUsed;
     if (bFormat)
     {
         pNameFrame->Hide();
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 30f5dd4..19b3b79 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 96a61e4..345c7be 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");