diff options
Diffstat (limited to 'chart2/source/tools/PropertyHelper.cxx')
| -rw-r--r-- | chart2/source/tools/PropertyHelper.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 1887477fd418..8741037b6014 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -36,7 +36,7 @@ using ::com::sun::star::uno::Reference; namespace { -struct lcl_EqualsElement : public ::std::unary_function< OUString, bool > +struct lcl_EqualsElement : public std::unary_function< OUString, bool > { explicit lcl_EqualsElement( const Any & rValue, const Reference< container::XNameAccess > & xAccess ) : m_aValue( rValue ), m_xAccess( xAccess ) @@ -62,7 +62,7 @@ private: Reference< container::XNameAccess > m_xAccess; }; -struct lcl_StringMatches : public ::std::unary_function< OUString ,bool > +struct lcl_StringMatches : public std::unary_function< OUString ,bool > { explicit lcl_StringMatches( const OUString & rCmpStr ) : m_aCmpStr( rCmpStr ) @@ -77,7 +77,7 @@ private: OUString m_aCmpStr; }; -struct lcl_OUStringRestToInt32 : public ::std::unary_function< OUString, sal_Int32 > +struct lcl_OUStringRestToInt32 : public std::unary_function< OUString, sal_Int32 > { explicit lcl_OUStringRestToInt32( sal_Int32 nPrefixLength ) : m_nPrefixLength( nPrefixLength ) @@ -119,9 +119,9 @@ OUString lcl_addNamedPropertyUniqueNameToTable( try { Reference< container::XNameAccess > xNameAccess( xNameContainer, uno::UNO_QUERY_THROW ); - ::std::vector< OUString > aNames( ::chart::ContainerHelper::SequenceToVector( xNameAccess->getElementNames())); - ::std::vector< OUString >::const_iterator aIt( - ::std::find_if( aNames.begin(), aNames.end(), lcl_EqualsElement( rValue, xNameAccess ))); + std::vector< OUString > aNames( ::chart::ContainerHelper::SequenceToVector( xNameAccess->getElementNames())); + std::vector< OUString >::const_iterator aIt( + std::find_if( aNames.begin(), aNames.end(), lcl_EqualsElement( rValue, xNameAccess ))); // element not found in container if( aIt == aNames.end()) @@ -131,7 +131,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable( // check if preferred name is already used if( !rPreferredName.isEmpty()) { - aIt = ::std::find( aNames.begin(), aNames.end(), rPreferredName ); + aIt = std::find( aNames.begin(), aNames.end(), rPreferredName ); if( aIt == aNames.end()) aUniqueName = rPreferredName; } @@ -139,14 +139,14 @@ OUString lcl_addNamedPropertyUniqueNameToTable( if( aUniqueName.isEmpty()) { // create a unique id using the prefix plus a number - ::std::vector< sal_Int32 > aNumbers; - ::std::vector< OUString >::iterator aNonConstIt( - ::std::partition( aNames.begin(), aNames.end(), lcl_StringMatches( rPrefix ))); - ::std::transform( aNames.begin(), aNonConstIt, + std::vector< sal_Int32 > aNumbers; + std::vector< OUString >::iterator aNonConstIt( + std::partition( aNames.begin(), aNames.end(), lcl_StringMatches( rPrefix ))); + std::transform( aNames.begin(), aNonConstIt, back_inserter( aNumbers ), lcl_OUStringRestToInt32( rPrefix.getLength() )); - ::std::vector< sal_Int32 >::const_iterator aMaxIt( - ::std::max_element( aNumbers.begin(), aNumbers.end())); + std::vector< sal_Int32 >::const_iterator aMaxIt( + std::max_element( aNumbers.begin(), aNumbers.end())); sal_Int32 nIndex = 1; if( aMaxIt != aNumbers.end()) |