diff options
Diffstat (limited to 'sw/source/ui/frmdlg')
| -rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/cption.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index dd3213404c87..8839e65f9ce9 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -518,11 +518,10 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) // Fill the color listbox SfxObjectShell* pDocSh = SfxObjectShell::Current(); - const SfxPoolItem* pItem = NULL; XColorListRef pColorList; if ( pDocSh ) { - pItem = pDocSh->GetItem( SID_COLOR_TABLE ); + const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE ); if ( pItem != NULL ) pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index ac174bee2cc6..2f9bac874105 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -204,10 +204,9 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : // aFormatBox sal_uInt16 nSelFmt = SVX_NUM_ARABIC; nCount = pMgr->GetFldTypeCount(); - SwFieldType* pFldType; for ( sal_uInt16 i = nCount; i; ) { - pFldType = pMgr->GetFldType(USHRT_MAX, --i); + SwFieldType* pFldType = pMgr->GetFldType(USHRT_MAX, --i); if( pFldType->GetName().equals(m_pCategoryBox->GetText()) ) { nSelFmt = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFldType)->GetSeqFormat(); |