diff options
Diffstat (limited to 'sw/source/ui/config/optload.cxx')
-rw-r--r-- | sw/source/ui/config/optload.cxx | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 3a046a402f25..336395c7631f 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -171,16 +171,16 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) else if (m_pRequestRB->IsChecked()) nNewLinkMode = MANUAL; - SwFldUpdateFlags eFldFlags = m_pAutoUpdateFields->IsChecked() ? + SwFieldUpdateFlags eFieldFlags = m_pAutoUpdateFields->IsChecked() ? m_pAutoUpdateCharts->IsChecked() ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : AUTOUPD_OFF; if(m_pAutoUpdateFields->IsValueChangedFromSaved() || m_pAutoUpdateCharts->IsValueChangedFromSaved()) { - pMod->ApplyFldUpdateFlags(eFldFlags); + pMod->ApplyFieldUpdateFlags(eFieldFlags); if(m_pWrtShell) { - m_pWrtShell->SetFldUpdateFlags(eFldFlags); + m_pWrtShell->SetFieldUpdateFlags(eFieldFlags); m_pWrtShell->SetModified(); } } @@ -277,20 +277,20 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet) if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_WRTSHELL, false, &pItem)) m_pWrtShell = static_cast<SwWrtShell*>(static_cast<const SwPtrItem*>(pItem)->GetValue()); - SwFldUpdateFlags eFldFlags = AUTOUPD_GLOBALSETTING; + SwFieldUpdateFlags eFieldFlags = AUTOUPD_GLOBALSETTING; m_nOldLinkMode = GLOBALSETTING; if (m_pWrtShell) { - eFldFlags = m_pWrtShell->GetFldUpdateFlags(true); + eFieldFlags = m_pWrtShell->GetFieldUpdateFlags(true); m_nOldLinkMode = m_pWrtShell->GetLinkUpdMode(true); } if(GLOBALSETTING == m_nOldLinkMode) m_nOldLinkMode = pUsrPref->GetUpdateLinkMode(); - if(AUTOUPD_GLOBALSETTING == eFldFlags) - eFldFlags = pUsrPref->GetFldUpdateFlags(); + if(AUTOUPD_GLOBALSETTING == eFieldFlags) + eFieldFlags = pUsrPref->GetFieldUpdateFlags(); - m_pAutoUpdateFields->Check(eFldFlags != AUTOUPD_OFF); - m_pAutoUpdateCharts->Check(eFldFlags == AUTOUPD_FIELD_AND_CHARTS); + m_pAutoUpdateFields->Check(eFieldFlags != AUTOUPD_OFF); + m_pAutoUpdateCharts->Check(eFieldFlags == AUTOUPD_FIELD_AND_CHARTS); switch (m_nOldLinkMode) { @@ -453,7 +453,7 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet) , m_sAbove(SW_RESSTR(STR_CAPTION_ABOVE)) , m_sBelow(SW_RESSTR(STR_CAPTION_BELOW)) , m_sNone(SW_RESSTR(SW_STR_NONE)) - , pMgr(new SwFldMgr()) + , pMgr(new SwFieldMgr()) , bHTMLMode(false) { get(m_pCheckLB, "objects"); @@ -483,15 +483,15 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet) SwWrtShell* pSh = ::GetActiveWrtShell(); // m_pFormatBox - sal_uInt16 nSelFmt = SVX_NUM_ARABIC; + sal_uInt16 nSelFormat = SVX_NUM_ARABIC; if (pSh) { - for ( sal_uInt16 i = pMgr->GetFldTypeCount(); i; ) + for ( sal_uInt16 i = pMgr->GetFieldTypeCount(); i; ) { - SwFieldType* pFldType = pMgr->GetFldType(USHRT_MAX, --i); - if (pFldType->GetName().equals(m_pCategoryBox->GetText())) + SwFieldType* pFieldType = pMgr->GetFieldType(USHRT_MAX, --i); + if (pFieldType->GetName().equals(m_pCategoryBox->GetText())) { - nSelFmt = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFldType)->GetSeqFormat(); + nSelFormat = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFieldType)->GetSeqFormat(); break; } } @@ -503,9 +503,9 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet) for ( sal_uInt16 i = 0; i < nCount; ++i ) { m_pFormatBox->InsertEntry( pMgr->GetFormatStr(TYP_SEQFLD, i) ); - const sal_uInt16 nFmtId = pMgr->GetFormatId(TYP_SEQFLD, i); - m_pFormatBox->SetEntryData( i, reinterpret_cast<void*>(nFmtId) ); - if( nFmtId == nSelFmt ) + const sal_uInt16 nFormatId = pMgr->GetFormatId(TYP_SEQFLD, i); + m_pFormatBox->SetEntryData( i, reinterpret_cast<void*>(nFormatId) ); + if( nFormatId == nSelFormat ) m_pFormatBox->SelectEntryPos( i ); } @@ -517,12 +517,12 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet) if (pSh) { - SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(pMgr->GetFldType( + SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(pMgr->GetFieldType( RES_SETEXPFLD, m_pCategoryBox->GetText() )); - if( pFldType ) + if( pFieldType ) { - sDelim = pFldType->GetDelimiter(); - nLvl = pFldType->GetOutlineLvl(); + sDelim = pFieldType->GetDelimiter(); + nLvl = pFieldType->GetOutlineLvl(); } } @@ -706,11 +706,11 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) m_pCategoryBox->InsertEntry(m_sNone); if (pSh) { - const sal_uInt16 nCount = pMgr->GetFldTypeCount(); + const sal_uInt16 nCount = pMgr->GetFieldTypeCount(); for (sal_uInt16 i = 0; i < nCount; i++) { - SwFieldType *pType = pMgr->GetFldType( USHRT_MAX, i ); + SwFieldType *pType = pMgr->GetFieldType( USHRT_MAX, i ); if( pType->Which() == RES_SETEXPFLD && static_cast<SwSetExpFieldType *>( pType)->GetType() & nsSwGetSetExpType::GSE_SEQ ) m_pCategoryBox->InsertSwEntry(SwBoxEntry(pType->GetName())); @@ -832,13 +832,13 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry) IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl) { - const OUString sFldTypeName = m_pCategoryBox->GetText(); + const OUString sFieldTypeName = m_pCategoryBox->GetText(); SfxSingleTabDialog *pDlg = dynamic_cast<SfxSingleTabDialog*>(GetParentDialog()); PushButton *pBtn = pDlg ? pDlg->GetOKButton() : NULL; if (pBtn) - pBtn->Enable(!sFldTypeName.isEmpty()); - bool bEnable = m_pCategoryBox->IsEnabled() && sFldTypeName != m_sNone; + pBtn->Enable(!sFieldTypeName.isEmpty()); + bool bEnable = m_pCategoryBox->IsEnabled() && sFieldTypeName != m_sNone; m_pFormatText->Enable(bEnable); m_pFormatBox->Enable(bEnable); @@ -881,9 +881,9 @@ void SwCaptionOptPage::InvalidatePreview() //#i61007# order of captions bool bOrderNumberingFirst = m_pLbCaptionOrder->GetSelectEntryPos() == 1; // number - const sal_uInt16 nNumFmt = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetEntryData( + const sal_uInt16 nNumFormat = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetEntryData( m_pFormatBox->GetSelectEntryPos() )); - if( SVX_NUM_NUMBER_NONE != nNumFmt ) + if( SVX_NUM_NUMBER_NONE != nNumFormat ) { //#i61007# order of captions if( !bOrderNumberingFirst ) @@ -895,11 +895,11 @@ void SwCaptionOptPage::InvalidatePreview() SwWrtShell *pSh = ::GetActiveWrtShell(); if (pSh) { - SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(pMgr->GetFldType( + SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(pMgr->GetFieldType( RES_SETEXPFLD, m_pCategoryBox->GetText() )); - if( pFldType && pFldType->GetOutlineLvl() < MAXLEVEL ) + if( pFieldType && pFieldType->GetOutlineLvl() < MAXLEVEL ) { - sal_uInt8 nLvl = pFldType->GetOutlineLvl(); + sal_uInt8 nLvl = pFieldType->GetOutlineLvl(); SwNumberTree::tNumberVector aNumVector; for( sal_uInt8 i = 0; i <= nLvl; ++i ) aNumVector.push_back(1); @@ -907,11 +907,11 @@ void SwCaptionOptPage::InvalidatePreview() const OUString sNumber( pSh->GetOutlineNumRule()->MakeNumString( aNumVector, false )); if( !sNumber.isEmpty() ) - aStr += sNumber + pFldType->GetDelimiter(); + aStr += sNumber + pFieldType->GetDelimiter(); } } - switch( nNumFmt ) + switch( nNumFormat ) { case SVX_NUM_CHARS_UPPER_LETTER: aStr += "A"; break; case SVX_NUM_CHARS_UPPER_LETTER_N: aStr += "A"; break; |