diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-01 08:40:17 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-09-01 11:05:21 +0200 |
commit | 3069878c60da990a603754ced4a64be4e7855538 (patch) | |
tree | fb63de0a75ee2216b97625bd658747b5d13ab6d0 /toolkit | |
parent | 47a72493a9106a4783bfcb7c34a8cde579a2cba0 (diff) |
std::list<sal_uInt16> -> vector
Change-Id: Ic08ac3fcb750ceff1f5b3201d4a3151ad567aa1f
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/inc/helper/unopropertyarrayhelper.hxx | 4 | ||||
-rw-r--r-- | toolkit/source/awt/vclxcontainer.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtabpagecontainer.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtopwindow.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 10 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 48 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/helper/unopropertyarrayhelper.cxx | 4 |
8 files changed, 38 insertions, 38 deletions
diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx index 3b5ae6a1c171..4d29030fc847 100644 --- a/toolkit/inc/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx @@ -23,7 +23,7 @@ #include <toolkit/dllapi.h> #include <cppuhelper/propshlp.hxx> -#include <list> +#include <vector> #include <set> @@ -39,7 +39,7 @@ protected: public: UnoPropertyArrayHelper( const css::uno::Sequence<sal_Int32>& rIDs ); - UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs ); + UnoPropertyArrayHelper( const std::vector< sal_uInt16 > &rIDs ); // ::cppu::IPropertyArrayHelper sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ) override; diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index c9d230e5555a..a0c7d305f156 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -34,7 +34,7 @@ // class VCLXContainer -void VCLXContainer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXContainer::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXWindow::ImplGetPropertyIds( rIds ); } diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 8af76d12b98a..c053aaead062 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::view; // class VCLXTabPageContainer -void VCLXTabPageContainer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXTabPageContainer::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXWindow::ImplGetPropertyIds( rIds ); } diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index a04f968ff219..e21d7bb2e416 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -241,7 +241,7 @@ void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (Runt // class VCLXTopWindow -void VCLXTopWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXTopWindow::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXContainer::ImplGetPropertyIds( rIds ); } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index ee51e0ce3e05..3e825b5b9e20 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1279,7 +1279,7 @@ namespace toolkit } // Terminated by BASEPROPERTY_NOTFOUND (or 0) -void VCLXWindow::PushPropertyIds( std::list< sal_uInt16 > &rIds, +void VCLXWindow::PushPropertyIds( std::vector< sal_uInt16 > &rIds, int nFirstId, ...) { va_list pVarArgs; @@ -1292,7 +1292,7 @@ void VCLXWindow::PushPropertyIds( std::list< sal_uInt16 > &rIds, va_end( pVarArgs ); } -void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDefaults ) +void VCLXWindow::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds, bool bWithDefaults ) { // These are common across ~all VCLXWindow derived classes if( bWithDefaults ) @@ -1314,7 +1314,7 @@ void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDe // lovely hack from: // void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId ) - std::list< sal_uInt16 >::const_iterator iter; + std::vector< sal_uInt16 >::const_iterator iter; for( iter = rIds.begin(); iter != rIds.end(); ++iter) { if( *iter == BASEPROPERTY_FONTDESCRIPTOR ) { @@ -1331,7 +1331,7 @@ void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDe } } -void VCLXWindow::GetPropertyIds( std::list< sal_uInt16 >& _out_rIds ) +void VCLXWindow::GetPropertyIds( std::vector< sal_uInt16 >& _out_rIds ) { return ImplGetPropertyIds( _out_rIds, mpImpl->mbWithDefaultProps ); } @@ -2551,7 +2551,7 @@ VCLXWindow::GetPropHelper() SolarMutexGuard aGuard; if ( mpImpl->mpPropHelper == nullptr ) { - std::list< sal_uInt16 > aIDs; + std::vector< sal_uInt16 > aIDs; GetPropertyIds( aIDs ); mpImpl->mpPropHelper = new UnoPropertyArrayHelper( aIDs ); } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index b246d20c9723..83c2c562225b 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -204,7 +204,7 @@ namespace toolkit // class VCLXGraphicControl -void VCLXGraphicControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXGraphicControl::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXWindow::ImplGetPropertyIds( rIds ); } @@ -335,7 +335,7 @@ css::uno::Any VCLXGraphicControl::getProperty( const OUString& PropertyName ) th // class VCLXButton -void VCLXButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXButton::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -618,7 +618,7 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // class VCLXImageControl -void VCLXImageControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXImageControl::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -749,7 +749,7 @@ css::uno::Any VCLXImageControl::getProperty( const OUString& PropertyName ) thro // class VCLXCheckBox -void VCLXCheckBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXCheckBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_DEFAULTCONTROL, @@ -1049,7 +1049,7 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // class VCLXRadioButton -void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXRadioButton::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_DEFAULTCONTROL, @@ -1332,7 +1332,7 @@ void VCLXRadioButton::ImplClickedOrToggled( bool bToggled ) // class VCLXSpinField -void VCLXSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXSpinField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR, @@ -1465,7 +1465,7 @@ void VCLXSpinField::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // class VCLXListBox -void VCLXListBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXListBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -2154,7 +2154,7 @@ void SAL_CALL VCLXListBox::disposing( const EventObject& i_rEvent ) throw (Runti // class VCLXMessageBox -void VCLXMessageBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXMessageBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXTopWindow::ImplGetPropertyIds( rIds ); } @@ -2235,7 +2235,7 @@ css::awt::Size SAL_CALL VCLXMessageBox::getMinimumSize() throw(css::uno::Runtime // class VCLXDialog -void VCLXDialog::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXDialog::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXTopWindow::ImplGetPropertyIds( rIds ); } @@ -2420,7 +2420,7 @@ VCLXMultiPage::VCLXMultiPage() : maTabListeners( *this ), mTabId( 1 ) OSL_TRACE("VCLXMultiPage::VCLXMultiPage()" ); } -void VCLXMultiPage::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXMultiPage::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -2702,7 +2702,7 @@ VCLXTabPage::VCLXTabPage() { } -void VCLXTabPage::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXTabPage::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -3091,7 +3091,7 @@ css::uno::Any VCLXFixedHyperlink::getProperty( const OUString& PropertyName ) th return aProp; } -void VCLXFixedHyperlink::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXFixedHyperlink::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -3120,7 +3120,7 @@ void VCLXFixedHyperlink::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) // class VCLXFixedText -void VCLXFixedText::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXFixedText::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -3263,7 +3263,7 @@ css::awt::Size VCLXFixedText::calcAdjustedSize( const css::awt::Size& rMaxSize ) // class VCLXScrollBar -void VCLXScrollBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXScrollBar::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -3740,7 +3740,7 @@ css::awt::Size SAL_CALL VCLXScrollBar::getMinimumSize() throw(css::uno::RuntimeE // class VCLXEdit -void VCLXEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXEdit::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -4117,7 +4117,7 @@ void VCLXEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // class VCLXComboBox -void VCLXComboBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXComboBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_AUTOCOMPLETE, @@ -4612,7 +4612,7 @@ void SAL_CALL VCLXComboBox::disposing( const EventObject& i_rEvent ) throw (Runt // class VCLXFormattedSpinField -void VCLXFormattedSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXFormattedSpinField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { // Interestingly in the UnoControl API this is // - not derived from XEdit ultimately, (correct ?) - so cut this here ... @@ -4718,7 +4718,7 @@ css::uno::Any VCLXFormattedSpinField::getProperty( const OUString& PropertyName // class VCLXDateField -void VCLXDateField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXDateField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -5067,7 +5067,7 @@ sal_Bool VCLXDateField::isStrictFormat() throw(css::uno::RuntimeException, std:: // class VCLXTimeField -void VCLXTimeField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXTimeField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -5376,7 +5376,7 @@ css::uno::Any VCLXTimeField::getProperty( const OUString& PropertyName ) throw(c // class VCLXNumericField -void VCLXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXNumericField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -5720,7 +5720,7 @@ css::uno::Any VCLXNumericField::getProperty( const OUString& PropertyName ) thro // class VCLXMetricField // ---------------------------------------------------- -void VCLXMetricField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXMetricField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -5969,7 +5969,7 @@ css::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName ) throw // class VCLXCurrencyField -void VCLXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXCurrencyField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -6326,7 +6326,7 @@ css::uno::Any VCLXCurrencyField::getProperty( const OUString& PropertyName ) thr // class VCLXPatternField -void VCLXPatternField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXPatternField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -6516,7 +6516,7 @@ VCLXFrame::VCLXFrame() { } -void VCLXFrame::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXFrame::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 546b651fd3b3..31dca8b755da 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -400,9 +400,9 @@ void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId ) } } -void UnoControlModel::ImplRegisterProperties( const std::list< sal_uInt16 > &rIds ) +void UnoControlModel::ImplRegisterProperties( const std::vector< sal_uInt16 > &rIds ) { - std::list< sal_uInt16 >::const_iterator iter; + std::vector< sal_uInt16 >::const_iterator iter; for( iter = rIds.begin(); iter != rIds.end(); ++iter) { if( !ImplHasProperty( *iter ) ) diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index c67673d38347..3d0c184578f7 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -34,9 +34,9 @@ UnoPropertyArrayHelper::UnoPropertyArrayHelper( const css::uno::Sequence<sal_Int maIDs.insert( pIDs[n] ); } -UnoPropertyArrayHelper::UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs ) +UnoPropertyArrayHelper::UnoPropertyArrayHelper( const std::vector< sal_uInt16 > &rIDs ) { - std::list< sal_uInt16 >::const_iterator iter; + std::vector< sal_uInt16 >::const_iterator iter; for( iter = rIDs.begin(); iter != rIDs.end(); ++iter) maIDs.insert( *iter ); } |