summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-08 11:32:48 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-03-09 13:03:06 +0100
commit3912e47044f753f82c63ac11e803be5fb756c14f (patch)
tree87d9bb88027876ef0528218d712de5305e651f55 /toolkit
parent52c5eb20fd96d63e17cb9cd18912030131bcc787 (diff)
Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxx
Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/controls/unocontrol.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 0b9e0ed02c23..cbf541d9fe9f 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -43,6 +43,7 @@
#include <algorithm>
#include <set>
+#include <vector>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -472,8 +473,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
if( getPeer().is() )
{
- DECLARE_STL_VECTOR( PropertyValue, PropertyValueVector);
- PropertyValueVector aPeerPropertiesToSet;
+ std::vector< PropertyValue > aPeerPropertiesToSet;
sal_Int32 nIndependentPos = 0;
bool bResourceResolverSet( false );
// position where to insert the independent properties into aPeerPropertiesToSet,
@@ -652,8 +652,8 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
// setting peer properties may result in an attemp to acquire the solar mutex, 'cause the peers
// usually don't have an own mutex but use the SolarMutex instead.
// To prevent deadlocks resulting from this, we do this without our own mutex locked
- PropertyValueVectorIterator aEnd = aPeerPropertiesToSet.end();
- for ( PropertyValueVectorIterator aLoop = aPeerPropertiesToSet.begin();
+ std::vector< PropertyValue >::iterator aEnd = aPeerPropertiesToSet.end();
+ for ( std::vector< PropertyValue >::iterator aLoop = aPeerPropertiesToSet.begin();
aLoop != aEnd;
++aLoop
)