diff options
Diffstat (limited to 'fpicker/source/office/iodlg.cxx')
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index acb134732ebe..7f5aed991d30 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1479,11 +1479,11 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl { SvtFileDialogFilter_Impl* pFoundFilter = NULL; SvtFileDialogFilterList_Impl* pList = _pImp->_pFilter; - sal_uInt16 nFilter = pList->Count(); + sal_uInt16 nFilter = pList->size(); while ( nFilter-- ) { - SvtFileDialogFilter_Impl* pFilter = pList->GetObject( nFilter ); + SvtFileDialogFilter_Impl* pFilter = &(*pList)[ nFilter ]; const String& rType = pFilter->GetType(); String aSingleType = rType; @@ -2191,7 +2191,7 @@ short SvtFileDialog::PrepareExecute() break; } } - SvtFileDialogFilter_Impl* pNewCurFilter = _pImp->_pFilter->GetObject( nPos ); + SvtFileDialogFilter_Impl* pNewCurFilter = &(*_pImp->_pFilter)[ nPos ]; DBG_ASSERT( pNewCurFilter, "SvtFileDialog::Execute: invalid filter pos!" ); _pImp->SetCurFilter( pNewCurFilter, pNewCurFilter->GetName() ); } @@ -2366,7 +2366,7 @@ void SvtFileDialog::OpenURL_Impl( const String& _rURL ) SvtFileDialogFilter_Impl* SvtFileDialog::implAddFilter( const String& _rFilter, const String& _rType ) { SvtFileDialogFilter_Impl* pNewFilter = new SvtFileDialogFilter_Impl( _rFilter, _rType ); - _pImp->_pFilter->C40_INSERT( SvtFileDialogFilter_Impl, pNewFilter, (sal_uInt16)0 ); + _pImp->_pFilter->push_front( pNewFilter ); if ( !_pImp->GetCurFilter() ) _pImp->SetCurFilter( pNewFilter, _rFilter ); @@ -2400,11 +2400,11 @@ void SvtFileDialog::SetCurFilter( const String& rFilter ) DBG_ASSERT( !IsInExecute(), "SvtFileDialog::SetCurFilter: currently executing!" ); // look for corresponding filter - sal_uInt16 nPos = _pImp->_pFilter->Count(); + sal_uInt16 nPos = _pImp->_pFilter->size(); while ( nPos-- ) { - SvtFileDialogFilter_Impl* pFilter = _pImp->_pFilter->GetObject( nPos ); + SvtFileDialogFilter_Impl* pFilter = &(*_pImp->_pFilter)[ nPos ]; if ( pFilter->GetName() == rFilter ) { _pImp->SetCurFilter( pFilter, rFilter ); @@ -2435,7 +2435,7 @@ String SvtFileDialog::getCurFilter( ) const sal_uInt16 SvtFileDialog::GetFilterCount() const { - return _pImp->_pFilter->Count(); + return _pImp->_pFilter->size(); } //***************************************************************************** @@ -2443,7 +2443,7 @@ sal_uInt16 SvtFileDialog::GetFilterCount() const const String& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < GetFilterCount(), "invalid index" ); - return _pImp->_pFilter->GetObject( nPos )->GetName(); + return (*_pImp->_pFilter)[ nPos ].GetName(); } //***************************************************************************** |