summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-01 08:40:17 +0200
committerNoel Grandin <noel@peralex.com>2016-09-01 11:05:21 +0200
commit3069878c60da990a603754ced4a64be4e7855538 (patch)
treefb63de0a75ee2216b97625bd658747b5d13ab6d0 /svtools
parent47a72493a9106a4783bfcb7c34a8cde579a2cba0 (diff)
std::list<sal_uInt16> -> vector
Change-Id: Ic08ac3fcb750ceff1f5b3201d4a3151ad567aa1f
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/inc/unoiface.hxx32
-rw-r--r--svtools/source/uno/unoiface.cxx17
2 files changed, 24 insertions, 25 deletions
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 7b9bc25f96b8..ec04cd216fd0 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -105,8 +105,8 @@ public:
// css::awt::XWindow
void SAL_CALL setFocus( ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -159,8 +159,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -209,8 +209,8 @@ protected:
virtual void SetWindow( const VclPtr< vcl::Window > &_pWindow) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -275,8 +275,8 @@ protected:
// VCLXGraphicControl overridables
virtual void ImplSetNewImage() override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -315,8 +315,8 @@ public:
void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -359,8 +359,8 @@ public:
void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -401,8 +401,8 @@ public:
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
@@ -417,8 +417,8 @@ public:
// css::awt::VclWindowPeer
void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
- static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+ static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+ virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
#endif // INCLUDED_SVTOOLS_SOURCE_INC_UNOIFACE_HXX
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 0e14c9a78375..f76fab042dee 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -522,7 +522,7 @@ void SAL_CALL VCLXMultiLineEdit::setFocus( ) throw(css::uno::RuntimeException,
GetWindow()->GrabFocus();
}
-void VCLXMultiLineEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void VCLXMultiLineEdit::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
// FIXME: elide duplication ?
@@ -532,7 +532,6 @@ void VCLXMultiLineEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
BASEPROPERTY_HIDEINACTIVESELECTION,
0);
VCLXWindow::ImplGetPropertyIds( rIds, true );
-
}
// class VCLXFileControl
@@ -796,7 +795,7 @@ void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
nCols = pControl->GetEdit().GetMaxVisChars();
}
-void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void VCLXFileControl::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
// FIXME: elide duplication ?
@@ -1364,7 +1363,7 @@ void SVTXFormattedField::NotifyTextListeners()
}
}
-void SVTXFormattedField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void SVTXFormattedField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
// FIXME: elide duplication ?
@@ -1630,7 +1629,7 @@ void SVTXRoadmap::ImplSetNewImage()
pButton->SetRoadmapBitmap( GetImage().GetBitmapEx() );
}
-void SVTXRoadmap::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void SVTXRoadmap::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
BASEPROPERTY_COMPLETE,
@@ -1804,7 +1803,7 @@ sal_Bool SVTXNumericField::isStrictFormat() throw(css::uno::RuntimeException, st
return pField && pField->IsStrictFormat();
}
-void SVTXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void SVTXNumericField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
SVTXFormattedField::ImplGetPropertyIds( rIds );
}
@@ -2032,7 +2031,7 @@ css::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName ) thr
return SVTXFormattedField::getProperty(PropertyName);
}
-void SVTXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void SVTXCurrencyField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
BASEPROPERTY_CURRENCYSYMBOL,
@@ -2277,7 +2276,7 @@ css::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName ) throw
return aProp;
}
-void VCLXProgressBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void VCLXProgressBar::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
BASEPROPERTY_PROGRESSVALUE,
@@ -2325,7 +2324,7 @@ void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const cs
}
}
-void SVTXDateField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+void SVTXDateField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
BASEPROPERTY_TEXTLINECOLOR,