diff options
Diffstat (limited to 'connectivity/source/commontools/parameters.cxx')
-rw-r--r-- | connectivity/source/commontools/parameters.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index ad3bf0338f15..2db8bb4e12a0 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -107,7 +107,7 @@ namespace dbtools m_sIdentifierQuoteString.clear(); m_sSpecialCharacters.clear(); m_xConnectionMetadata.clear(); - ::std::vector< bool > aEmptyArray; + std::vector< bool > aEmptyArray; m_aParametersVisited.swap( aEmptyArray ); m_bUpToDate = false; } @@ -240,7 +240,7 @@ namespace dbtools void ParameterManager::classifyLinks( const Reference< XNameAccess >& _rxParentColumns, - const Reference< XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents ) + const Reference< XNameAccess >& _rxColumns, std::vector< OUString >& _out_rAdditionalFilterComponents ) { OSL_PRECOND( m_aMasterFields.size() == m_aDetailFields.size(), "ParameterManager::classifyLinks: master and detail fields should have the same length!" ); @@ -251,8 +251,8 @@ namespace dbtools // we may need to strip any links which are invalid, so here go the containers // for temporarirly holding the new pairs - ::std::vector< OUString > aStrippedMasterFields; - ::std::vector< OUString > aStrippedDetailFields; + std::vector< OUString > aStrippedMasterFields; + std::vector< OUString > aStrippedDetailFields; bool bNeedExchangeLinks = false; @@ -297,7 +297,7 @@ namespace dbtools OSL_PRECOND( !sNewParamName.isEmpty(), "ParameterManager::classifyLinks: createFilterConditionFromColumnLink returned nonsense!" ); // remember meta information about this new parameter - ::std::pair< ParameterInformation::iterator, bool > aInsertionPos = + std::pair< ParameterInformation::iterator, bool > aInsertionPos = m_aParameterInformation.insert( ParameterInformation::value_type( sNewParamName, ParameterMetaData( nullptr ) ) ); @@ -376,7 +376,7 @@ namespace dbtools return; // classify the links - depending on what the detail fields in each link pair denotes - ::std::vector< OUString > aAdditionalFilterComponents; + std::vector< OUString > aAdditionalFilterComponents; classifyLinks( xParentColumns, xColumns, aAdditionalFilterComponents ); // did we find links where the detail field refers to a detail column (instead of a parameter name)? @@ -384,7 +384,7 @@ namespace dbtools { // build a conjunction of all the filter components OUStringBuffer sAdditionalFilter; - for ( ::std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin(); + for ( std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin(); aComponent != aAdditionalFilterComponents.end(); ++aComponent ) @@ -447,7 +447,7 @@ namespace dbtools // check which of the parameters have already been visited (e.g. filled via XParameters) size_t nAlreadyVisited = 0; - for ( ::std::vector< sal_Int32 >::iterator aIndex = aParam->second.aInnerIndexes.begin(); + for ( std::vector< sal_Int32 >::iterator aIndex = aParam->second.aInnerIndexes.begin(); aIndex != aParam->second.aInnerIndexes.end(); ++aIndex ) @@ -580,7 +580,7 @@ namespace dbtools Reference< XPropertySet > xMasterField(_rxParentColumns->getByName( *pMasterFields ),UNO_QUERY); // the positions where we have to fill in values for the current parameter name - for ( ::std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin(); + for ( std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin(); aPosition != aParamInfo->second.aInnerIndexes.end(); ++aPosition ) @@ -908,7 +908,7 @@ namespace dbtools if ( !xMasterField.is() ) continue; - for ( ::std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin(); + for ( std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin(); aPosition != aParamInfo->second.aInnerIndexes.end(); ++aPosition ) |