diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/DbAdminImpl.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/DbAdminImpl.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 357b7e23fc20..a192a99daf06 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -217,7 +217,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal if (!m_pItemSetHelper->getOutputSet()) return false; - ::std::vector< PropertyValue > aReturn; + std::vector< PropertyValue > aReturn; // collecting this in a vector because it has a push_back, in opposite to sequences // user: DSID_USER -> "user" @@ -348,9 +348,9 @@ void ODbDataSourceAdministrationHelper::clearPassword() m_pItemSetHelper->getWriteOutputSet()->ClearItem(DSID_PASSWORD); } -::std::pair< Reference<XConnection>,sal_Bool> ODbDataSourceAdministrationHelper::createConnection() +std::pair< Reference<XConnection>,sal_Bool> ODbDataSourceAdministrationHelper::createConnection() { - ::std::pair< Reference<XConnection>,sal_Bool> aRet; + std::pair< Reference<XConnection>,sal_Bool> aRet; aRet.second = false; Sequence< PropertyValue > aConnectionParams; if ( getCurrentSettings(aConnectionParams) ) @@ -709,14 +709,14 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS // first determine which of all the items are relevant for the data source (depends on the connection url) OUString eType = getDatasourceType(_rSource); - ::std::vector< sal_Int32> aDetailIds; + std::vector< sal_Int32> aDetailIds; ODriversSettings::getSupportedIndirectSettings(eType, getORB(), aDetailIds); // collect the translated property values for the relevant items PropertyValueSet aRelevantSettings; MapInt2String::const_iterator aTranslation; - ::std::vector< sal_Int32>::const_iterator aDetailsEnd = aDetailIds.end(); - for (::std::vector< sal_Int32>::const_iterator aIter = aDetailIds.begin();aIter != aDetailsEnd ; ++aIter) + std::vector< sal_Int32>::const_iterator aDetailsEnd = aDetailIds.end(); + for (std::vector< sal_Int32>::const_iterator aIter = aDetailIds.begin();aIter != aDetailsEnd ; ++aIter) { const SfxPoolItem* pCurrent = _rSource.GetItem((sal_uInt16)*aIter); aTranslation = m_aIndirectPropTranslator.find(*aIter); @@ -771,13 +771,13 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS // for this, we need a string-controlled quick access to m_aIndirectPropTranslator StringSet aIndirectProps; - ::std::transform(m_aIndirectPropTranslator.begin(), + std::transform(m_aIndirectPropTranslator.begin(), m_aIndirectPropTranslator.end(), - ::std::insert_iterator<StringSet>(aIndirectProps,aIndirectProps.begin()), + std::insert_iterator<StringSet>(aIndirectProps,aIndirectProps.begin()), ::o3tl::select2nd< MapInt2String::value_type >()); // now check the to-be-preserved props - ::std::vector< sal_Int32 > aRemoveIndexes; + std::vector< sal_Int32 > aRemoveIndexes; sal_Int32 nPositionCorrector = 0; MapInt2String::const_iterator aPreservedEnd = aPreservedSettings.end(); for ( MapInt2String::const_iterator aPreserved = aPreservedSettings.begin(); @@ -792,8 +792,8 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS } } // now finally remove all such props - ::std::vector< sal_Int32 >::const_iterator aRemoveEnd = aRemoveIndexes.end(); - for ( ::std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin(); + std::vector< sal_Int32 >::const_iterator aRemoveEnd = aRemoveIndexes.end(); + for ( std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin(); aRemoveIndex != aRemoveEnd; ++aRemoveIndex ) |