convert std::map::insert to std::map::emplace II

Change-Id: Ief8bd59c903625ba65b75114b7b52c3b7ecbd331
Reviewed-on: https://gerrit.libreoffice.org/41019Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

chart2/source/controller/dialogs/DialogModel.cxx

@@ -216,18 +216,15 @@ struct lcl_RolesWithRangeAppend : public
                     Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW );
                     if( xProp->getPropertyValue( "Role" ) >>= aRole )
                     {
-                        m_rDestCnt->insert(
-                            tContainerType::value_type(
-                                aRole, xSeq->getSourceRangeRepresentation()));
+                        m_rDestCnt->emplace(aRole, xSeq->getSourceRangeRepresentation());
                         // label
                         if( aRole == m_aRoleForLabelSeq )
                         {
                             Reference< data::XDataSequence > xLabelSeq( xVal->getLabel());
                             if( xLabelSeq.is())
                             {
-                                m_rDestCnt->insert(
-                                    tContainerType::value_type(
-                                        lcl_aLabelRole, xLabelSeq->getSourceRangeRepresentation()));
+                                m_rDestCnt->emplace(
+                                        lcl_aLabelRole, xLabelSeq->getSourceRangeRepresentation());
                             }
                         }
                     }
@@ -471,7 +468,7 @@ void addMissingRoles(DialogModel::tRolesWithRanges& rResult, const uno::Sequence
     for(sal_Int32 i = 0, n = rRoles.getLength(); i < n; ++i)
     {
         if(rResult.find(rRoles[i]) == rResult.end())
-            rResult.insert(DialogModel::tRolesWithRanges::value_type(rRoles[i], OUString()));
+            rResult.emplace(rRoles[i], OUString());
     }
 }
 

chart2/source/tools/InternalDataProvider.cxx

@@ -415,10 +415,9 @@ void InternalDataProvider::addDataSequenceToMap(
     const OUString & rRangeRepresentation,
     const Reference< chart2::data::XDataSequence > & xSequence )
 {
-    m_aSequenceMap.insert(
-        tSequenceMap::value_type(
+    m_aSequenceMap.emplace(
             rRangeRepresentation,
-            uno::WeakReference< chart2::data::XDataSequence >( xSequence )));
+            uno::WeakReference< chart2::data::XDataSequence >( xSequence ));
 }
 
 void InternalDataProvider::deleteMapReferences( const OUString & rRangeRepresentation )

chart2/source/view/charttypes/VSeriesPlotter.cxx

@@ -1785,8 +1785,7 @@ private:
                 TotalStoreType::iterator itr = aStore.find(fX);
                 if (itr == aStore.end())
                     // New min-max pair for give X value.
-                    aStore.insert(
-                        TotalStoreType::value_type(fX, std::pair<double,double>(fYMin,fYMax)));
+                    aStore.emplace(fX, std::pair<double,double>(fYMin,fYMax));
                 else
                 {
                     MinMaxType& r = itr->second;

codemaker/source/cppumaker/cpputype.cxx

@@ -2025,9 +2025,8 @@ void PlainStructType::dumpComprehensiveGetCppuType(FileStream & out)
     std::map< OUString, sal_uInt32 > types;
     std::vector< unoidl::PlainStructTypeEntity::Member >::size_type n = 0;
     for (const unoidl::PlainStructTypeEntity::Member& member : entity_->getDirectMembers()) {
-        if (types.insert(
-                std::map< OUString, sal_uInt32 >::value_type(
-                    member.type, static_cast< sal_uInt32 >(types.size()))).
+        if (types.emplace(
+                    member.type, static_cast< sal_uInt32 >(types.size())).
             second) {
             dumpCppuGetType(out, member.type, &name_);
             // For typedefs, use the resolved type name, as there will be no
@@ -2530,9 +2529,8 @@ void PolyStructType::dumpComprehensiveGetCppuType(FileStream & out)
     size_type n = 0;
     for (const unoidl::PolymorphicStructTypeTemplateEntity::Member& member : entity_->getMembers()) {
         if (member.parameterized) {
-            if (parameters.insert(
-                    std::map< OUString, sal_uInt32 >::value_type(
-                        member.type, static_cast< sal_uInt32 >(parameters.size()))).
+            if (parameters.emplace(
+                        member.type, static_cast< sal_uInt32 >(parameters.size())).
                 second) {
                 sal_uInt32 k = static_cast< sal_uInt32 >(parameters.size() - 1);
                 out << indent()
@@ -2546,9 +2544,7 @@ void PolyStructType::dumpComprehensiveGetCppuType(FileStream & out)
                     << "::rtl::OUString the_pname" << k << "(the_ptype" << k
                     << ".getTypeName());\n";
             }
-        } else if (types.insert(
-                       std::map< OUString, sal_uInt32 >::value_type(
-                           member.type, static_cast< sal_uInt32 >(types.size()))).
+        } else if (types.emplace(member.type, static_cast< sal_uInt32 >(types.size())).
                    second) {
             dumpCppuGetType(out, member.type, &name_);
             // For typedefs, use the resolved type name, as there will be no

codemaker/source/cppumaker/dependencies.cxx

@@ -282,8 +282,7 @@ void Dependencies::insert(OUString const & name, Kind kind) {
     case UnoType::Sort::Typedef:
         {
             std::pair< Map::iterator, bool > i(
-                m_map.insert(
-                    Map::value_type(n, kind)));
+                m_map.emplace(n, kind));
             if (!i.second && kind == KIND_BASE) {
                 assert(i.first->second != KIND_EXCEPTION);
                 i.first->second = KIND_BASE;

codemaker/source/cppumaker/includes.cxx

@@ -111,8 +111,7 @@ void Includes::add(OString const & entityName) {
     case codemaker::UnoType::Sort::Exception:
     case codemaker::UnoType::Sort::Interface:
     case codemaker::UnoType::Sort::Typedef:
-        m_map.insert(
-            Dependencies::Map::value_type(n, Dependencies::KIND_NORMAL));
+        m_map.emplace(n, Dependencies::KIND_NORMAL);
         break;
     default:
         throw CannotDumpException(

codemaker/source/javamaker/classfile.cxx

@@ -491,8 +491,7 @@ sal_uInt16 ClassFile::addIntegerInfo(sal_Int32 value) {
     sal_uInt16 index = nextConstantPoolIndex(1);
     appendU1(m_constantPool, 3);
     appendU4(m_constantPool, static_cast< sal_uInt32 >(value));
-    if (!m_integerInfos.insert(
-            std::map< sal_Int32, sal_uInt16 >::value_type(value, index)).second)
+    if (!m_integerInfos.emplace(value, index).second)
     {
         OSL_ASSERT(false);
     }
@@ -509,8 +508,7 @@ sal_uInt16 ClassFile::addFloatInfo(float value) {
     union { float floatBytes; sal_uInt32 uint32Bytes; } bytes;
     bytes.floatBytes = value;
     appendU4(m_constantPool, bytes.uint32Bytes);
-    if (!m_floatInfos.insert(
-            std::map< float, sal_uInt16 >::value_type(value, index)).second)
+    if (!m_floatInfos.emplace(value, index).second)
     {
         OSL_ASSERT(false);
     }
@@ -525,8 +523,7 @@ sal_uInt16 ClassFile::addLongInfo(sal_Int64 value) {
     sal_uInt16 index = nextConstantPoolIndex(2);
     appendU1(m_constantPool, 5);
     appendU8(m_constantPool, static_cast< sal_uInt64 >(value));
-    if (!m_longInfos.insert(
-            std::map< sal_Int64, sal_uInt16 >::value_type(value, index)).second)
+    if (!m_longInfos.emplace(value, index).second)
     {
         OSL_ASSERT(false);
     }
@@ -543,8 +540,7 @@ sal_uInt16 ClassFile::addDoubleInfo(double value) {
     union { double doubleBytes; sal_uInt64 uint64Bytes; } bytes;
     bytes.doubleBytes = value;
     appendU8(m_constantPool, bytes.uint64Bytes);
-    if (!m_doubleInfos.insert(
-            std::map< double, sal_uInt16 >::value_type(value, index)).second)
+    if (!m_doubleInfos.emplace(value, index).second)
     {
         OSL_ASSERT(false);
     }
@@ -685,9 +681,7 @@ sal_uInt16 ClassFile::addUtf8Info(OString const & value) {
     for (sal_Int32 j = 0; j < value.getLength(); ++j) {
         appendU1(m_constantPool, static_cast< sal_uInt8 >(value[j]));
     }
-    if (!m_utf8Infos.insert(
-            std::map< OString, sal_uInt16 >::value_type(value, index)).
-        second)
+    if (!m_utf8Infos.emplace(value, index).second)
     {
         OSL_ASSERT(false);
     }
@@ -704,9 +698,7 @@ sal_uInt16 ClassFile::addClassInfo(OString const & type) {
     sal_uInt16 index = nextConstantPoolIndex(1);
     appendU1(m_constantPool, 7);
     appendU2(m_constantPool, nameIndex);
-    if (!m_classInfos.insert(
-            std::map< sal_uInt16, sal_uInt16 >::value_type(nameIndex, index)).
-        second)
+    if (!m_classInfos.emplace(nameIndex, index).second)
     {
         OSL_ASSERT(false);
     }
@@ -723,9 +715,7 @@ sal_uInt16 ClassFile::addStringInfo(OString const & value) {
     sal_uInt16 index = nextConstantPoolIndex(1);
     appendU1(m_constantPool, 8);
     appendU2(m_constantPool, stringIndex);
-    if (!m_stringInfos.insert(
-            std::map< sal_uInt16, sal_uInt16 >::value_type(stringIndex, index)).
-        second)
+    if (!m_stringInfos.emplace(stringIndex, index).second)
     {
         OSL_ASSERT(false);
     }
@@ -748,8 +738,7 @@ sal_uInt16 ClassFile::addFieldrefInfo(
     appendU1(m_constantPool, 9);
     appendU2(m_constantPool, classIndex);
     appendU2(m_constantPool, nameAndTypeIndex);
-    if (!m_fieldrefInfos.insert(
-            std::map< sal_uInt32, sal_uInt16 >::value_type(key, index)).second)
+    if (!m_fieldrefInfos.emplace(key, index).second)
     {
         OSL_ASSERT(false);
     }
@@ -772,8 +761,7 @@ sal_uInt16 ClassFile::addMethodrefInfo(
     appendU1(m_constantPool, 10);
     appendU2(m_constantPool, classIndex);
     appendU2(m_constantPool, nameAndTypeIndex);
-    if (!m_methodrefInfos.insert(
-            std::map< sal_uInt32, sal_uInt16 >::value_type(key, index)).second)
+    if (!m_methodrefInfos.emplace(key, index).second)
     {
         OSL_ASSERT(false);
     }
@@ -797,8 +785,7 @@ sal_uInt16 ClassFile::addInterfaceMethodrefInfo(
     appendU1(m_constantPool, 11);
     appendU2(m_constantPool, classIndex);
     appendU2(m_constantPool, nameAndTypeIndex);
-    if (!m_interfaceMethodrefInfos.insert(
-            std::map< sal_uInt32, sal_uInt16 >::value_type(key, index)).second)
+    if (!m_interfaceMethodrefInfos.emplace(key, index).second)
     {
         OSL_ASSERT(false);
     }
@@ -821,8 +808,7 @@ sal_uInt16 ClassFile::addNameAndTypeInfo(
     appendU1(m_constantPool, 12);
     appendU2(m_constantPool, nameIndex);
     appendU2(m_constantPool, descriptorIndex);
-    if (!m_nameAndTypeInfos.insert(
-            std::map< sal_uInt32, sal_uInt16 >::value_type(key, index)).second)
+    if (!m_nameAndTypeInfos.emplace(key, index).second)
     {
         OSL_ASSERT(false);
     }

codemaker/source/javamaker/javatype.cxx

@@ -742,9 +742,7 @@ void handleEnumType(
     {
         min = std::min(min, member.value);
         max = std::max(max, member.value);
-        map.insert(
-            std::map< sal_Int32, OString >::value_type(
-                member.value, codemaker::convertString(member.name)));
+        map.emplace(member.value, codemaker::convertString(member.name));
     }
     sal_uInt64 size = static_cast< sal_uInt64 >(map.size());
     if ((static_cast< sal_uInt64 >(max) - static_cast< sal_uInt64 >(min)
@@ -1458,8 +1456,7 @@ void handlePolyStructType(
     for (const OUString& param : entity->getTypeParameters())
     {
         sig.append(codemaker::convertString(param) + ":Ljava/lang/Object;");
-        if (!typeParameters.insert(
-                std::map< OUString, sal_Int32 >::value_type(param, index++)).second)
+        if (!typeParameters.emplace(param, index++).second)
         {
             throw CannotDumpException("Bad type information"); //TODO
         }

comphelper/source/misc/accessiblewrapper.cxx

@@ -112,8 +112,7 @@ namespace comphelper
             // see if we do cache children
             if ( !m_bTransientChildren )
             {
-                if (!m_aChildrenMap.insert(
-                        AccessibleMap::value_type( _rxKey, xValue ) ).second)
+                if (!m_aChildrenMap.emplace( _rxKey, xValue ).second)
                 {
                     OSL_FAIL(
                         "OWrappedAccessibleChildrenManager::"

configmgr/source/access.cxx

@@ -154,10 +154,9 @@ void Access::markChildAsModified(rtl::Reference< ChildAccess > const & child) {
             break;
         }
         assert(dynamic_cast< ChildAccess * >(p.get()) != nullptr);
-        parent->modifiedChildren_.insert(
-            ModifiedChildren::value_type(
+        parent->modifiedChildren_.emplace(
                 p->getNameInternal(),
-                ModifiedChild(static_cast< ChildAccess * >(p.get()), false)));
+                ModifiedChild(static_cast< ChildAccess * >(p.get()), false));
         p = parent;
     }
 }

configmgr/source/components.cxx

@@ -440,8 +440,7 @@ css::beans::Optional< css::uno::Any > Components::getExternalValue(
         if (service.is()) {
             propset.set( service, css::uno::UNO_QUERY_THROW);
         }
-        j = externalServices_.insert(
-            ExternalServices::value_type(name, propset)).first;
+        j = externalServices_.emplace(name, propset).first;
     }
     css::beans::Optional< css::uno::Any > value;
     if (j->second.is()) {

configmgr/source/data.cxx

@@ -302,9 +302,8 @@ Additions * Data::addExtensionXcuAdditions(
 {
     rtl::Reference< ExtensionXcu > item(new ExtensionXcu);
     ExtensionXcuAdditions::iterator i(
-        extensionXcuAdditions_.insert(
-            ExtensionXcuAdditions::value_type(
-                url, rtl::Reference< ExtensionXcu >())).first);
+        extensionXcuAdditions_.emplace(
+                url, rtl::Reference< ExtensionXcu >()).first);
     if (i->second.is()) {
         throw css::uno::RuntimeException(
             "already added extension xcu " + url);

configmgr/source/modifications.cxx

@@ -40,8 +40,7 @@ void Modifications::add(std::vector<OUString> const & path) {
             if (wasPresent && p->children.empty()) {
                 return;
             }
-            j = p->children.insert(Node::Children::value_type(*i, Node())).
-                first;
+            j = p->children.emplace(*i, Node()).first;
             wasPresent = false;
         } else {
             wasPresent = true;

connectivity/source/commontools/TTableHelper.cxx

@@ -89,7 +89,7 @@ public:
     {
     }
     void clear() { m_pComponent = nullptr; }
-    void add(const OUString& _sRefName) { m_aRefNames.insert(std::map< OUString,bool>::value_type(_sRefName,true)); }
+    void add(const OUString& _sRefName) { m_aRefNames.emplace(_sRefName,true); }
 };
 }
 namespace connectivity

connectivity/source/commontools/parameters.cxx

@@ -304,8 +304,8 @@ namespace dbtools
 
                     // remember meta information about this new parameter
                     std::pair< ParameterInformation::iterator, bool > aInsertionPos =
-                        m_aParameterInformation.insert(
-                            ParameterInformation::value_type( sNewParamName, ParameterMetaData( nullptr ) )
+                        m_aParameterInformation.emplace(
+                            sNewParamName, ParameterMetaData( nullptr )
                         );
                     OSL_ENSURE( aInsertionPos.second, "ParameterManager::classifyLinks: there already was a parameter with this name!" );
                     aInsertionPos.first->second.eType = ParameterClassification::LinkedByColumnName;

connectivity/source/drivers/hsqldb/HStorageMap.cxx

@@ -307,7 +307,7 @@ namespace connectivity
                                 }
                                 pHelper.reset( new StreamHelper(storage->openStreamElement( sStrippedName, _nMode ) ) );
                             }
-                            aFind->second.streams.insert(TStreamMap::value_type(sName,pHelper));
+                            aFind->second.streams.emplace(sName,pHelper);
                         }
                         catch(const Exception& e)
                         {

connectivity/source/drivers/jdbc/DatabaseMetaData.cxx

@@ -450,7 +450,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
                     {
                         if ( sPrivs[j] == sColumnName )
                         {
-                            aColumnMatching.insert( std::map<sal_Int32,sal_Int32>::value_type(i,j+1) );
+                            aColumnMatching.emplace(i,j+1);
                             break;
                         }
                     }

connectivity/source/drivers/odbc/OConnection.cxx

@@ -515,7 +515,7 @@ SQLHANDLE OConnection::createStatementHandle()
     N3SQLAllocHandle(SQL_HANDLE_STMT,pConnectionTemp->getConnection(),&aStatementHandle);
     ++m_nStatementCount;
     if(bNew)
-        m_aConnections.insert(std::map< SQLHANDLE,OConnection*>::value_type(aStatementHandle,pConnectionTemp));
+        m_aConnections.emplace(aStatementHandle,pConnectionTemp);
 
     return aStatementHandle;
 

connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx

@@ -1287,7 +1287,10 @@ SWORD ODatabaseMetaDataResultSet::impl_getColumnType_nothrow(sal_Int32 columnInd
 {
     std::map<sal_Int32,SWORD>::iterator aFind = m_aODBCColumnTypes.find(columnIndex);
     if ( aFind == m_aODBCColumnTypes.end() )
-        aFind = m_aODBCColumnTypes.insert(std::map<sal_Int32,SWORD>::value_type(columnIndex,OResultSetMetaData::getColumnODBCType(m_pConnection.get(),m_aStatementHandle,*this,columnIndex))).first;
+        aFind = m_aODBCColumnTypes.emplace(
+                        columnIndex,
+                        OResultSetMetaData::getColumnODBCType(m_pConnection.get(),m_aStatementHandle,*this,columnIndex)
+                    ).first;
     return aFind->second;
 }
 

connectivity/source/drivers/odbc/OResultSet.cxx

@@ -1814,7 +1814,10 @@ SWORD OResultSet::impl_getColumnType_nothrow(sal_Int32 columnIndex)
 {
     std::map<sal_Int32,SWORD>::const_iterator aFind = m_aODBCColumnTypes.find(columnIndex);
     if ( aFind == m_aODBCColumnTypes.end() )
-        aFind = m_aODBCColumnTypes.insert(std::map<sal_Int32,SWORD>::value_type(columnIndex,OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,columnIndex))).first;
+        aFind = m_aODBCColumnTypes.emplace(
+                           columnIndex,
+                           OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,columnIndex)
+                        ).first;
     return aFind->second;
 }
 

connectivity/source/drivers/odbc/OResultSetMetaData.cxx

@@ -150,7 +150,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column )
         }
         else
             nType = OTools::MapOdbcType2Jdbc(getNumColAttrib(column,SQL_DESC_CONCISE_TYPE ));
-        aFind = m_aColumnTypes.insert(std::map<sal_Int32,sal_Int32>::value_type(column,nType)).first;
+        aFind = m_aColumnTypes.emplace(column,nType).first;
     }
 
 

cppu/source/uno/lbenv.cxx

@@ -951,8 +951,7 @@ inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
     {
         (*pEnv->acquireWeak)( pEnv );
         std::pair< OUString2EnvironmentMap::iterator, bool > insertion (
-            aName2EnvMap.insert(
-                OUString2EnvironmentMap::value_type( aKey, pEnv ) ) );
+            aName2EnvMap.emplace( aKey, pEnv ) );
         SAL_WARN_IF( !insertion.second, "cppu", "key " << aKey << " already in env map" );
     }
     else

cppuhelper/source/component_context.cxx

@@ -185,8 +185,8 @@ void ComponentContext::insertByName(
             name.startsWith( "/singletons/" ) &&
             !element.hasValue() ) );
     MutexGuard guard( m_mutex );
-    std::pair<t_map::iterator, bool> insertion( m_map.insert(
-        t_map::value_type( name, entry ) ) );
+    std::pair<t_map::iterator, bool> insertion( m_map.emplace(
+        name, entry ) );
     if (! insertion.second)
         throw container::ElementExistException(
             "element already exists: " + name,

cppuhelper/source/propertysetmixin.cxx

@@ -242,8 +242,7 @@ void Data::initProperties(
                         "interface type has too many attributes");
                 }
                 rtl::OUString name(members[i]->getMemberName());
-                if (!properties.insert(
-                        PropertyMap::value_type(
+                if (!properties.emplace(
                             name,
                             PropertyData(
                                 css::beans::Property(
@@ -252,7 +251,7 @@ void Data::initProperties(
                                         t->getTypeClass(), t->getName()),
                                     attrAttribs),
                                 (std::find(absentBegin, absentEnd, name)
-                                 == absentEnd)))).
+                                 == absentEnd))).
                     second)
                 {
                     throw css::uno::RuntimeException(

cppuhelper/source/servicemanager.cxx

@@ -384,9 +384,7 @@ void Parser::handleImplementation() {
         new cppuhelper::ServiceManager::Data::Implementation(
             attrName, attrLoader_, attrUri_, attrEnvironment_, attrConstructor,
             attrPrefix_, alienContext_, reader_.getUrl()));
-    if (!data_->namedImplementations.insert(
-            cppuhelper::ServiceManager::Data::NamedImplementations::value_type(
-                attrName, implementation_)).
+    if (!data_->namedImplementations.emplace(attrName, implementation_).
         second)
     {
         throw css::registry::InvalidRegistryException(
@@ -1445,9 +1443,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
                 name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"),
                 readLegacyRdbString(uri, implKey, "UNO/LOCATION"), "", "", "",
                 css::uno::Reference< css::uno::XComponentContext >(), uri));
-        if (!data_.namedImplementations.insert(
-                Data::NamedImplementations::value_type(name, impl)).
-            second)
+        if (!data_.namedImplementations.emplace(name, impl).second)
         {
             throw css::registry::InvalidRegistryException(
                 uri + ": duplicate <implementation name=\"" + name + "\">");
@@ -1580,11 +1576,9 @@ void cppuhelper::ServiceManager::insertLegacyFactory(
         new Data::Implementation(name, f1, f2, comp));
     Data extra;
     if (!name.isEmpty()) {
-        extra.namedImplementations.insert(
-            Data::NamedImplementations::value_type(name, impl));
+        extra.namedImplementations.emplace(name, impl);
     }
-    extra.dynamicImplementations.insert(
-        Data::DynamicImplementations::value_type(factoryInfo, impl));
+    extra.dynamicImplementations.emplace(factoryInfo, impl);
     css::uno::Sequence< rtl::OUString > services(
         factoryInfo->getSupportedServiceNames());
     for (sal_Int32 i = 0; i != services.getLength(); ++i) {

cppuhelper/source/unourl.cxx

@@ -118,13 +118,12 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
         case STATE_VALUE:
             if (bEnd || c == 0x2C) // ','
             {
-                if (!m_aParameters.insert(
-                        Parameters::value_type(
+                if (!m_aParameters.emplace(
                             aKey,
                             rtl::Uri::decode(rDescriptor.copy(nStart,
                                                               i - nStart),
                                              rtl_UriDecodeWithCharset,
-                                             RTL_TEXTENCODING_UTF8))).second)
+                                             RTL_TEXTENCODING_UTF8)).second)
                     throw rtl::MalformedUriException(
                         "UNO URL contains duplicated parameter");
                 eState = STATE_KEY0;

dbaccess/source/core/dataaccess/connection.cxx

@@ -646,11 +646,10 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _s
                 Sequence<Any> aArgs(1);
                 Reference<XConnection> xMy(this);
                 aArgs[0] <<= NamedValue("ActiveConnection",makeAny(xMy));
-                aFind = m_aSupportServices.insert(
-                           TSupportServices::value_type(
+                aFind = m_aSupportServices.emplace(
                                _sServiceSpecifier,
                                m_aContext->getServiceManager()->createInstanceWithArgumentsAndContext(_sServiceSpecifier, aArgs, m_aContext)
-                           )).first;
+                           ).first;
             }
             return aFind->second;
         }

dbaccess/source/core/dataaccess/definitioncontainer.cxx

@@ -104,8 +104,7 @@ ODefinitionContainer::ODefinitionContainer(   const Reference< XComponentContext
             ++aDefinition
         )
         m_aDocuments.push_back(
-            m_aDocumentMap.insert(
-                Documents::value_type( aDefinition->first, Documents::mapped_type() ) ).first );
+            m_aDocumentMap.emplace(aDefinition->first, Documents::mapped_type() ).first );
 
 }
 

dbaccess/source/core/misc/DatabaseDataProvider.cxx

@@ -740,7 +740,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(bool _bHasCategor
 
         const sal_Int32 columnIndex = col - aColumns.begin();
         const OUString sRangeName = OUString::number( columnIndex );
-        m_aNumberFormats.insert( std::map< OUString, uno::Any >::value_type( sRangeName, aNumberFormat ) );
+        m_aNumberFormats.emplace( sRangeName, aNumberFormat );
     }
 
     std::vector< OUString > aRowLabels;

dbaccess/source/ui/misc/WCopyTable.cxx

@@ -1008,7 +1008,7 @@ void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField)
         }
 
         m_aDestVec.insert(m_aDestVec.begin() + _nPos,
-            m_vDestColumns.insert(ODatabaseExport::TColumns::value_type(_pField->GetName(),_pField)).first);
+            m_vDestColumns.emplace(_pField->GetName(),_pField).first);
         m_mNameMapping[_pField->GetName()] = _pField->GetName();
     }
 }
@@ -1021,8 +1021,7 @@ void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,
         m_vDestColumns.erase(_sOldName);
         OSL_ENSURE( m_vDestColumns.find(_pField->GetName()) == m_vDestColumns.end(),"Column with that name already exist!");
 
-        m_aDestVec[_nPos] =
-            m_vDestColumns.insert(ODatabaseExport::TColumns::value_type(_pField->GetName(),_pField)).first;
+        m_aDestVec[_nPos] = m_vDestColumns.emplace(_pField->GetName(),_pField).first;
     }
 }
 
@@ -1066,7 +1065,7 @@ void OCopyTableWizard::loadData(  const ICopyTableSourceObject& _rSourceObject,
             pTypeInfo = m_pTypeInfo;
 
         pActFieldDescr->FillFromTypeInfo(pTypeInfo,true,false);
-        _rColVector.push_back(_rColumns.insert(ODatabaseExport::TColumns::value_type(pActFieldDescr->GetName(),pActFieldDescr)).first);
+        _rColVector.push_back(_rColumns.emplace(pActFieldDescr->GetName(),pActFieldDescr).first);
     }
 
     // determine which columns belong to the primary key

dbaccess/source/ui/querydesign/QueryDesignView.cxx

@@ -1022,7 +1022,7 @@ namespace
             std::map<OTableWindow*,sal_Int32>::const_iterator aCountEnd = aConnectionCount.end();
             for(;aCountIter != aCountEnd;++aCountIter)
             {
-                aMulti.insert(std::multimap<sal_Int32 , OTableWindow*>::value_type(aCountIter->second,aCountIter->first));
+                aMulti.emplace(aCountIter->second,aCountIter->first);
             }
 
             const bool bUseEscape = ::dbtools::getBooleanDataSourceSetting( _xConnection, PROPERTY_OUTERJOINESCAPE );
@@ -1161,7 +1161,7 @@ namespace
                     }
                     if ( aGroupByNames.find(sGroupByPart) == aGroupByNames.end() )
                     {
-                        aGroupByNames.insert(std::map< OUString,bool>::value_type(sGroupByPart,true));
+                        aGroupByNames.emplace(sGroupByPart,true);
                         aGroupByStr += sGroupByPart + ",";
                     }
                 }

desktop/source/deployment/misc/dp_update.cxx

@@ -359,9 +359,8 @@ UpdateInfoMap getOnlineUpdateInfos(
             Reference<deployment::XPackage> extension = getExtensionWithHighestVersion(seqExt);
             OSL_ASSERT(extension.is());
 
-            std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert(
-                UpdateInfoMap::value_type(
-                    dp_misc::getIdentifier(extension), UpdateInfo(extension)));
+            std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.emplace(
+                    dp_misc::getIdentifier(extension), UpdateInfo(extension));
             OSL_ASSERT(insertRet.second);
         }
     }
@@ -371,9 +370,8 @@ UpdateInfoMap getOnlineUpdateInfos(
         for (CIT i = extensionList->begin(); i != extensionList->end(); ++i)
         {
             OSL_ASSERT(i->is());
-            std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert(
-                UpdateInfoMap::value_type(
-                    dp_misc::getIdentifier(*i), UpdateInfo(*i)));
+            std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.emplace(
+                    dp_misc::getIdentifier(*i), UpdateInfo(*i));
             OSL_ASSERT(insertRet.second);
         }
     }

desktop/source/deployment/registry/dp_registry.cxx

@@ -202,9 +202,7 @@ void PackageRegistryImpl::insertBackend(
             // add parameterless media-type, too:
             sal_Int32 semi = mediaType.indexOf( ';' );
             if (semi >= 0) {
-                m_mediaType2backend.insert(
-                    t_string2registry::value_type(
-                        mediaType.copy( 0, semi ), xBackend ) );
+                m_mediaType2backend.emplace( mediaType.copy( 0, semi ), xBackend );
             }
             const OUString fileFilter( xPackageType->getFileFilter() );
             //The package backend shall also be called to determine the mediatype
@@ -228,9 +226,8 @@ void PackageRegistryImpl::insertBackend(
                                   token.indexOf('?') >= 0);
                     if (! ambig) {
                         std::pair<t_string2string::iterator, bool> ins(
-                            m_filter2mediaType.insert(
-                                t_string2string::value_type(
-                                    token, mediaType ) ) );
+                            m_filter2mediaType.emplace(
+                                    token, mediaType ) );
                         ambig = !ins.second;
                         if (ambig) {
                             // filter has already been in: add previously

extensions/source/config/ldap/ldapaccess.cxx

@@ -203,8 +203,7 @@ void LdapConnection::initConnection()
         if (values) {
             const OUString aAttr( reinterpret_cast<sal_Unicode*>( attr ) );
             const OUString aValues( reinterpret_cast<sal_Unicode*>( *values ) );
-            data->insert(
-                LdapData::value_type( aAttr, aValues ));
+            data->emplace( aAttr, aValues );
             ldap_value_freeW(values);
         }
         attr = ldap_next_attributeW(mConnection, result.msg, ptr);
@@ -213,10 +212,9 @@ void LdapConnection::initConnection()
     while (attr) {
         char ** values = ldap_get_values(mConnection, result.msg, attr);
         if (values) {
-            data->insert(
-                LdapData::value_type(
+            data->emplace(
                     OStringToOUString(attr, RTL_TEXTENCODING_ASCII_US),
-                    OStringToOUString(*values, RTL_TEXTENCODING_UTF8)));
+                    OStringToOUString(*values, RTL_TEXTENCODING_UTF8));
             ldap_value_free(values);