diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-08 11:32:48 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-11-05 11:50:26 +0100 |
| commit | d7cb3d0b56fc3e28354bc4ce255a80f1c8527aa0 (patch) | |
| tree | cebd2ea7bf8a3018851615daa61efd2809a8b4d9 /toolkit | |
| parent | 22b00fdaaf775cbc37cb14a2116ccb5c2ec17279 (diff) | |
Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxx
Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab
(cherry picked from commit 3912e47044f753f82c63ac11e803be5fb756c14f)
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/controls/unocontrol.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 6cefb82b6d85..bcd8641cba54 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -47,6 +47,7 @@ #include <algorithm> #include <set> +#include <vector> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -495,8 +496,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, @@ -675,8 +675,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 ) |