diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/appinit.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/dp_persmap.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_managerfac.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/component/dp_component.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/dp_backend.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/dp_registry.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/migration/migration.cxx | 2 |
8 files changed, 8 insertions, 10 deletions
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 5571b9460646..7512b31d0dbb 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -151,7 +151,7 @@ void Desktop::createAcceptor(const OUString& aAcceptString) try { rAcceptor->initialize( aSeq ); - rMap.insert(AcceptorMap::value_type(aAcceptString, rAcceptor)); + rMap.emplace(aAcceptString, rAcceptor); } catch (const css::uno::Exception& e) { diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index d193193b93b3..b482ce79aaf9 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.cxx @@ -277,7 +277,7 @@ bool PersistentMap::get( OString * value, OString const & key ) const void PersistentMap::add( OString const & key, OString const & value ) { typedef std::pair<t_string2string_map::iterator,bool> InsertRC; - InsertRC r = m_entries.insert( t_string2string_map::value_type(key,value)); + InsertRC r = m_entries.emplace(key,value); m_bIsDirty = r.second; } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index e85b7bbe3d95..80a46523557b 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -699,7 +699,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() { const OUString title( xPackageType->getShortDescription() ); const std::pair< t_string2string::iterator, bool > insertion( - title2filter.insert( t_string2string::value_type( title, filter ) ) ); + title2filter.emplace( title, filter ) ); if ( ! insertion.second ) { // already existing, append extensions: OUStringBuffer buf; diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index b2e9fc418d8e..1a58b9122f80 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -129,7 +129,7 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context ) xRet.set( PackageManagerImpl::create( m_xComponentContext, context ) ); guard.reset(); std::pair< t_string2weakref::iterator, bool > insertion( - m_managers.insert( t_string2weakref::value_type( context, xRet ) ) ); + m_managers.emplace( context, xRet ) ); if (insertion.second) { OSL_ASSERT( insertion.first->second.get() == xRet ); diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 24949b8e9586..847fbf30fba9 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -1042,8 +1042,7 @@ Reference<XInterface> BackendImpl::insertObject( { const ::osl::MutexGuard guard( getMutex() ); const std::pair<t_string2object::iterator, bool> insertion( - m_backendObjects.insert( t_string2object::value_type( - id, xObject ) ) ); + m_backendObjects.emplace( id, xObject ) ); return insertion.first->second; } diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index bbd752f3d07c..f55910f13699 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -188,7 +188,7 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage( guard.reset(); std::pair< t_string2ref::iterator, bool > insertion( - m_bound.insert( t_string2ref::value_type( url, xNewPackage ) ) ); + m_bound.emplace( url, xNewPackage ) ); if (insertion.second) { // first insertion SAL_WARN_IF( diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 745dc66a8717..c0a629f585cc 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -196,8 +196,7 @@ void PackageRegistryImpl::insertBackend( const OUString mediaType( normalizeMediaType( xPackageType->getMediaType() ) ); std::pair<t_string2registry::iterator, bool> a_insertion( - m_mediaType2backend.insert( t_string2registry::value_type( - mediaType, xBackend ) ) ); + m_mediaType2backend.emplace( mediaType, xBackend ) ); if (a_insertion.second) { // add parameterless media-type, too: diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 338302bc22cf..bd0143608adb 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -1022,7 +1022,7 @@ void MigrationImpl::compareOldAndNewConfig(const OUString& sParent, MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); if (m_aOldVersionItemsHashMap.find(sResourceURL)==m_aOldVersionItemsHashMap.end()) { std::vector< MigrationItem > vMigrationItems; - m_aOldVersionItemsHashMap.insert(MigrationHashMap::value_type(sResourceURL, vMigrationItems)); + m_aOldVersionItemsHashMap.emplace(sResourceURL, vMigrationItems); m_aOldVersionItemsHashMap[sResourceURL].push_back(aMigrationItem); } else { if (std::find(m_aOldVersionItemsHashMap[sResourceURL].begin(), m_aOldVersionItemsHashMap[sResourceURL].end(), aMigrationItem)==m_aOldVersionItemsHashMap[sResourceURL].end()) |