diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-09-27 14:31:23 +0200 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-09-29 10:46:56 +0200 |
commit | 644c69ccc99a2a02ec20dfb6f6bfe77857f142f5 (patch) | |
tree | aa12e66a7ba46ee1cc1e210bf9d325433f23fa2e /sw/source/ui/fldui | |
parent | 3b6f16d24af54fa236a910de2fc49051a1a1fb3e (diff) |
Use consistent naming for data members
Change-Id: I01b5695d33ef96b1771b3c8a62f2964dc0295da8
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r-- | sw/source/ui/fldui/flddb.cxx | 22 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddb.hxx | 12 |
2 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 96973b2736f9..866a3abd4171 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -60,7 +60,7 @@ SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet) m_pTypeLB->set_width_request(nWidth); m_pDatabaseTLB->set_width_request(nWidth*2); - aOldNumSelectHdl = m_pNumFormatLB->GetSelectHdl(); + m_aOldNumSelectHdl = m_pNumFormatLB->GetSelectHdl(); m_pNumFormatLB->SetSelectHdl(LINK(this, SwFldDBPage, NumSelectHdl)); m_pDatabaseTLB->SetSelectHdl(LINK(this, SwFldDBPage, TreeSelectHdl)); @@ -83,7 +83,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) m_pTypeLB->SetUpdateMode(sal_False); sal_uInt16 nOldPos = m_pTypeLB->GetSelectEntryPos(); - sOldDBName = m_pDatabaseTLB->GetDBName(sOldTableName, sOldColumnName); + m_sOldDBName = m_pDatabaseTLB->GetDBName(m_sOldTableName, m_sOldColumnName); m_pTypeLB->Clear(); @@ -129,9 +129,9 @@ void SwFldDBPage::Reset(const SfxItemSet&) if (nOldPos != LISTBOX_ENTRY_NOTFOUND) m_pTypeLB->SelectEntryPos(nOldPos); - if (!sOldDBName.isEmpty()) + if (!m_sOldDBName.isEmpty()) { - m_pDatabaseTLB->Select(sOldDBName, sOldTableName, sOldColumnName); + m_pDatabaseTLB->Select(m_sOldDBName, m_sOldTableName, m_sOldColumnName); } else { @@ -174,9 +174,9 @@ void SwFldDBPage::Reset(const SfxItemSet&) { m_pConditionED->SaveValue(); m_pValueED->SaveValue(); - sOldDBName = m_pDatabaseTLB->GetDBName(sOldTableName, sOldColumnName); - nOldFormat = GetCurField()->GetFormat(); - nOldSubType = GetCurField()->GetSubType(); + m_sOldDBName = m_pDatabaseTLB->GetDBName(m_sOldTableName, m_sOldColumnName); + m_nOldFormat = GetCurField()->GetFormat(); + m_nOldSubType = GetCurField()->GetSubType(); } } @@ -233,13 +233,13 @@ sal_Bool SwFldDBPage::FillItemSet(SfxItemSet& ) OUString sTempTableName; OUString sTempColumnName; OUString sTempDBName = m_pDatabaseTLB->GetDBName(sTempTableName, sTempColumnName); - sal_Bool bDBListBoxChanged = sOldDBName != sTempDBName || - sOldTableName != sTempTableName || sOldColumnName != sTempColumnName; + sal_Bool bDBListBoxChanged = m_sOldDBName != sTempDBName || + m_sOldTableName != sTempTableName || m_sOldColumnName != sTempColumnName; if (!IsFldEdit() || m_pConditionED->GetSavedValue() != m_pConditionED->GetText() || m_pValueED->GetSavedValue() != m_pValueED->GetText() || bDBListBoxChanged || - nOldFormat != nFormat || nOldSubType != nSubType) + m_nOldFormat != nFormat || m_nOldSubType != nSubType) { InsertFld( nTypeId, nSubType, aName, aVal, nFormat); } @@ -384,7 +384,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) IMPL_LINK( SwFldDBPage, NumSelectHdl, NumFormatListBox *, pLB ) { m_pNewFormatRB->Check(); - aOldNumSelectHdl.Call(pLB); + m_aOldNumSelectHdl.Call(pLB); return 0; } diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index eb6fdac60215..5655f628315d 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -47,12 +47,12 @@ class SwFldDBPage : public SwFldPage ListBox* m_pFormatLB; VclContainer* m_pFormat; - OUString sOldDBName; - OUString sOldTableName; - OUString sOldColumnName; - sal_uLong nOldFormat; - sal_uInt16 nOldSubType; - Link aOldNumSelectHdl; + OUString m_sOldDBName; + OUString m_sOldTableName; + OUString m_sOldColumnName; + sal_uLong m_nOldFormat; + sal_uInt16 m_nOldSubType; + Link m_aOldNumSelectHdl; DECL_LINK( TypeHdl, ListBox* ); DECL_LINK( NumSelectHdl, NumFormatListBox* pLB = 0); |