From d347c2403605c5aa3ddd98fb605366914acab79f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 10 Aug 2017 16:43:55 +0200 Subject: convert std::map::insert to std::map::emplace which is considerably less verbose Change-Id: Ifa373e8eb09e39bd6c8d3578641610a6055a187b Reviewed-on: https://gerrit.libreoffice.org/40978 Tested-by: Jenkins Reviewed-by: Noel Grandin --- reportdesign/source/core/api/ReportDefinition.cxx | 2 +- reportdesign/source/core/sdr/RptObject.cxx | 50 +++++++++++----------- reportdesign/source/core/sdr/UndoEnv.cxx | 8 ++-- reportdesign/source/filter/xml/xmlExport.cxx | 12 +++--- reportdesign/source/filter/xml/xmlfilter.cxx | 2 +- .../source/ui/inspection/DataProviderHandler.cxx | 4 +- .../source/ui/inspection/GeometryHandler.cxx | 4 +- reportdesign/source/ui/misc/FunctionHelper.cxx | 6 +-- reportdesign/source/ui/misc/toolboxcontroller.cxx | 6 +-- reportdesign/source/ui/report/ReportController.cxx | 8 ++-- reportdesign/source/ui/report/ViewsWindow.cxx | 2 +- 11 files changed, 51 insertions(+), 53 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 6602a665724d..d0c194ab95db 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2364,7 +2364,7 @@ void SAL_CALL OStylesHelper::insertByName( const OUString& aName, const uno::Any if ( !aElement.isExtractableTo(m_aType) ) throw lang::IllegalArgumentException(); - m_aElementsPos.push_back(m_aElements.insert(TStyleElements::value_type(aName,aElement)).first); + m_aElementsPos.push_back(m_aElements.emplace(aName,aElement).first); } void SAL_CALL OStylesHelper::removeByName( const OUString& aName ) diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index e0a16b75b082..eb8a591e6638 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -241,9 +241,9 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) if ( s_aNameMap.empty() ) { std::shared_ptr aNoConverter(new AnyConverter); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter))); + s_aNameMap.emplace(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter)); } return s_aNameMap; } @@ -254,18 +254,18 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) if ( s_aNameMap.empty() ) { std::shared_ptr aNoConverter(new AnyConverter); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARCOLOR,TPropertyConverter(PROPERTY_TEXTCOLOR,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARUNDERLINECOLOR,TPropertyConverter(PROPERTY_TEXTLINECOLOR,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARRELIEF,TPropertyConverter(PROPERTY_FONTRELIEF,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARFONTHEIGHT,TPropertyConverter(PROPERTY_FONTHEIGHT,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARSTRIKEOUT,TPropertyConverter(PROPERTY_FONTSTRIKEOUT,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLTEXTEMPHASISMARK,TPropertyConverter(PROPERTY_FONTEMPHASISMARK,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter))); + s_aNameMap.emplace(PROPERTY_CHARCOLOR,TPropertyConverter(PROPERTY_TEXTCOLOR,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CHARUNDERLINECOLOR,TPropertyConverter(PROPERTY_TEXTLINECOLOR,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CHARRELIEF,TPropertyConverter(PROPERTY_FONTRELIEF,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CHARFONTHEIGHT,TPropertyConverter(PROPERTY_FONTHEIGHT,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CHARSTRIKEOUT,TPropertyConverter(PROPERTY_FONTSTRIKEOUT,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CONTROLTEXTEMPHASISMARK,TPropertyConverter(PROPERTY_FONTEMPHASISMARK,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter)); std::shared_ptr aParaAdjust(new ParaAdjust); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aParaAdjust))); + s_aNameMap.emplace(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aParaAdjust)); } return s_aNameMap; } @@ -275,17 +275,17 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) if ( s_aNameMap.empty() ) { std::shared_ptr aNoConverter(new AnyConverter); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARCOLOR,TPropertyConverter(PROPERTY_TEXTCOLOR,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARUNDERLINECOLOR,TPropertyConverter(PROPERTY_TEXTLINECOLOR,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARRELIEF,TPropertyConverter(PROPERTY_FONTRELIEF,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARFONTHEIGHT,TPropertyConverter(PROPERTY_FONTHEIGHT,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CHARSTRIKEOUT,TPropertyConverter(PROPERTY_FONTSTRIKEOUT,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLTEXTEMPHASISMARK,TPropertyConverter(PROPERTY_FONTEMPHASISMARK,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter))); + s_aNameMap.emplace(PROPERTY_CHARCOLOR,TPropertyConverter(PROPERTY_TEXTCOLOR,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CHARUNDERLINECOLOR,TPropertyConverter(PROPERTY_TEXTLINECOLOR,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CHARRELIEF,TPropertyConverter(PROPERTY_FONTRELIEF,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CHARFONTHEIGHT,TPropertyConverter(PROPERTY_FONTHEIGHT,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CHARSTRIKEOUT,TPropertyConverter(PROPERTY_FONTSTRIKEOUT,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CONTROLTEXTEMPHASISMARK,TPropertyConverter(PROPERTY_FONTEMPHASISMARK,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter)); + s_aNameMap.emplace(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter)); std::shared_ptr aParaAdjust(new ParaAdjust); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aParaAdjust))); + s_aNameMap.emplace(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aParaAdjust)); } return s_aNameMap; } @@ -296,8 +296,8 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) if ( s_aNameMap.empty() ) { std::shared_ptr aNoConverter(new AnyConverter); - s_aNameMap.insert(TPropertyNamePair::value_type(OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter))); - s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter))); + s_aNameMap.emplace(OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter)); + s_aNameMap.emplace(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter)); } return s_aNameMap; } diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 0f4a3c374973..a4dc600bffcf 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -232,9 +232,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv PropertySetInfoCache::iterator objectPos = m_pImpl->m_aPropertySetCache.find(xSet); if (objectPos == m_pImpl->m_aPropertySetCache.end()) { - objectPos = m_pImpl->m_aPropertySetCache.insert( PropertySetInfoCache::value_type( - xSet, ObjectInfo() - ) ).first; + objectPos = m_pImpl->m_aPropertySetCache.emplace( xSet, ObjectInfo() ).first; DBG_ASSERT(objectPos != m_pImpl->m_aPropertySetCache.end(), "OXUndoEnvironment::propertyChange : just inserted it ... why it's not there ?"); } if ( objectPos == m_pImpl->m_aPropertySetCache.end() ) @@ -287,10 +285,10 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv || ( ( nPropertyAttributes & PropertyAttribute::TRANSIENT ) != 0 ); // insert the new entry - aPropertyPos = rObjectInfo.aProperties.insert( PropertiesInfo::value_type( + aPropertyPos = rObjectInfo.aProperties.emplace( _rEvent.PropertyName, PropertyInfo( bTransReadOnly ) - ) ).first; + ).first; DBG_ASSERT(aPropertyPos != rObjectInfo.aProperties.end(), "OXUndoEnvironment::propertyChange : just inserted it ... why it's not there ?"); } diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 7a66a583f019..5b11d671cbac 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -574,9 +574,9 @@ void ORptExport::exportSectionAutoStyle(const Reference& _xProp) ).first; lcl_calculate(aColumnPos,aRowPos,aInsert->second); - TGridStyleMap::iterator aPos = m_aColumnStyleNames.insert(TGridStyleMap::value_type(_xProp.get(),TStringVec())).first; + TGridStyleMap::iterator aPos = m_aColumnStyleNames.emplace(_xProp.get(),TStringVec()).first; collectStyleNames(XML_STYLE_FAMILY_TABLE_COLUMN,aColumnPos,aPos->second); - aPos = m_aRowStyleNames.insert(TGridStyleMap::value_type(_xProp.get(),TStringVec())).first; + aPos = m_aRowStyleNames.emplace(_xProp.get(),TStringVec()).first; collectStyleNames(XML_STYLE_FAMILY_TABLE_ROW,aRowPos,aPos->second); sal_Int32 x1 = 0; @@ -1131,7 +1131,7 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference aPropertyStates( m_xParaPropMapper->Filter(_xProp) ); if ( !aPropertyStates.empty() ) - m_aAutoStyleNames.insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( XML_STYLE_FAMILY_TEXT_PARAGRAPH, aPropertyStates ))); + m_aAutoStyleNames.emplace( _xProp,GetAutoStylePool()->Add( XML_STYLE_FAMILY_TEXT_PARAGRAPH, aPropertyStates )); } ::std::vector< XMLPropertyState > aPropertyStates( m_xCellStylesExportPropertySetMapper->Filter(_xProp) ); Reference xFixedLine(_xProp,uno::UNO_QUERY); @@ -1231,14 +1231,14 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const ReferenceAdd( XML_STYLE_FAMILY_TABLE_CELL, aPropertyStates ))); + m_aAutoStyleNames.emplace( _xProp,GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_CELL, aPropertyStates )); } void ORptExport::exportAutoStyle(const Reference& _xProp) { ::std::vector< XMLPropertyState > aPropertyStates( m_xTableStylesExportPropertySetMapper->Filter(_xProp.get()) ); if ( !aPropertyStates.empty() ) - m_aAutoStyleNames.insert( TPropertyStyleMap::value_type(_xProp.get(),GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_TABLE, aPropertyStates ))); + m_aAutoStyleNames.emplace( _xProp.get(),GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_TABLE, aPropertyStates )); } void ORptExport::SetBodyAttributes() @@ -1546,7 +1546,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG sFunction += sPostfix; xFunction->setFormula(sFunction); exportFunction(xFunction); - m_aGroupFunctionMap.insert(TGroupFunctionMap::value_type(xGroup,xFunction)); + m_aGroupFunctionMap.emplace(xGroup,xFunction); } } } diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 4106cdfc72b2..0398bb51fe91 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -972,7 +972,7 @@ void ORptFilter::removeFunction(const OUString& _sFunctionName) void ORptFilter::insertFunction(const css::uno::Reference< css::report::XFunction > & _xFunction) { - m_aFunctions.insert(TGroupFunctionMap::value_type(_xFunction->getName(),_xFunction)); + m_aFunctions.emplace(_xFunction->getName(),_xFunction); } SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName) diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index c9713e4b2235..b539672eec7e 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -148,8 +148,8 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface { std::shared_ptr aNoConverter(new AnyConverter); TPropertyNamePair aPropertyMediation; - aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_MASTERFIELDS, TPropertyConverter(PROPERTY_MASTERFIELDS,aNoConverter) ) ); - aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_DETAILFIELDS, TPropertyConverter(PROPERTY_DETAILFIELDS,aNoConverter) ) ); + aPropertyMediation.emplace( PROPERTY_MASTERFIELDS, TPropertyConverter(PROPERTY_MASTERFIELDS,aNoConverter) ); + aPropertyMediation.emplace( PROPERTY_DETAILFIELDS, TPropertyConverter(PROPERTY_DETAILFIELDS,aNoConverter) ); m_xMasterDetails = new OPropertyMediator( m_xDataProvider.get(), m_xReportComponent.get(), aPropertyMediation,true ); } diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index bddbca41e963..9d6ddce537ae 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -137,7 +137,7 @@ void lcl_collectFunctionNames(const uno::Reference< report::XFunctions>& _xFunct for (sal_Int32 i = 0; i < nCount ; ++i) { uno::Reference< report::XFunction > xFunction(_xFunctions->getByIndex(i),uno::UNO_QUERY_THROW); - _rFunctionNames.insert(TFunctions::value_type(lcl_getQuotedFunctionName(xFunction),TFunctionPair(xFunction,xParent))); + _rFunctionNames.emplace( lcl_getQuotedFunctionName(xFunction),TFunctionPair(xFunction,xParent) ); } } @@ -2154,7 +2154,7 @@ void GeometryHandler::impl_createFunction(const OUString& _sFunctionName,const O const uno::Reference< report::XFunctionsSupplier> xFunctionsSupplier = fillScope_throw(sNamePostfix); const uno::Reference< container::XIndexContainer> xFunctions(xFunctionsSupplier->getFunctions(),uno::UNO_QUERY_THROW); xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(m_xFunction)); - m_aFunctionNames.insert(TFunctions::value_type(sQuotedFunctionName,TFunctionPair(m_xFunction,xFunctionsSupplier))); + m_aFunctionNames.emplace(sQuotedFunctionName,TFunctionPair(m_xFunction,xFunctionsSupplier)); m_bNewFunction = true; } diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index b001bf39440d..f7ee6201dc9b 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -64,7 +64,7 @@ const formula::IFunctionCategory* FunctionManager::getCategory(sal_uInt32 _nPos) { uno::Reference< report::meta::XFunctionCategory> xCategory = m_xMgr->getCategory(_nPos); std::shared_ptr< FunctionCategory > pCategory(new FunctionCategory(this,_nPos + 1,xCategory)); - m_aCategoryIndex.push_back( m_aCategories.insert(TCategoriesMap::value_type(xCategory->getName(),pCategory)).first ); + m_aCategoryIndex.push_back( m_aCategories.emplace(xCategory->getName(),pCategory).first ); } return m_aCategoryIndex[_nPos]->second.get(); } @@ -87,10 +87,10 @@ std::shared_ptr< FunctionDescription > FunctionManager::get(const uno::Reference TCategoriesMap::iterator aCategoryFind = m_aCategories.find(sCategoryName); if ( aCategoryFind == m_aCategories.end() ) { - aCategoryFind = m_aCategories.insert(TCategoriesMap::value_type(sCategoryName,std::make_shared< FunctionCategory > (this,xCategory->getNumber() + 1,xCategory))).first; + aCategoryFind = m_aCategories.emplace(sCategoryName,std::make_shared< FunctionCategory > (this,xCategory->getNumber() + 1,xCategory)).first; m_aCategoryIndex.push_back( aCategoryFind ); } - aFunctionFind = m_aFunctions.insert(TFunctionsMap::value_type(sFunctionName,std::make_shared(aCategoryFind->second.get(),_xFunctionDescription))).first; + aFunctionFind = m_aFunctions.emplace(sFunctionName,std::make_shared(aCategoryFind->second.get(),_xFunctionDescription)).first; } pDesc = aFunctionFind->second; } diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index cc25964c9cb0..1622f53b895b 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -134,13 +134,13 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments } if ( m_aCommandURL == ".uno:FontColor" || m_aCommandURL == ".uno:Color" ) { - m_aStates.insert(TCommandState::value_type(OUString(".uno:FontColor"),true)); - m_aStates.insert(TCommandState::value_type(OUString(".uno:Color"),true)); + m_aStates.emplace(OUString(".uno:FontColor"),true); + m_aStates.emplace(OUString(".uno:Color"),true); m_pToolbarController = new SvxColorToolBoxControl(SID_ATTR_CHAR_COLOR2,nToolBoxId,*pToolBox); } else { - m_aStates.insert(TCommandState::value_type(OUString(".uno:BackgroundColor"),true)); + m_aStates.emplace(OUString(".uno:BackgroundColor"),true); m_pToolbarController = new SvxColorToolBoxControl(SID_BACKGROUND_COLOR,nToolBoxId,*pToolBox); } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index a4e1f719a915..ccf428881469 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2968,10 +2968,10 @@ uno::Reference< sdbc::XRowSet > const & OReportController::getRowSet() std::shared_ptr aNoConverter(new AnyConverter); TPropertyNamePair aPropertyMediation; - aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_COMMAND, TPropertyConverter(PROPERTY_COMMAND,aNoConverter) ) ); - aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_COMMANDTYPE, TPropertyConverter(PROPERTY_COMMANDTYPE,aNoConverter) ) ); - aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_ESCAPEPROCESSING, TPropertyConverter(PROPERTY_ESCAPEPROCESSING,aNoConverter) ) ); - aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_FILTER, TPropertyConverter(PROPERTY_FILTER,aNoConverter) ) ); + aPropertyMediation.emplace( PROPERTY_COMMAND, TPropertyConverter(PROPERTY_COMMAND,aNoConverter) ); + aPropertyMediation.emplace( PROPERTY_COMMANDTYPE, TPropertyConverter(PROPERTY_COMMANDTYPE,aNoConverter) ); + aPropertyMediation.emplace( PROPERTY_ESCAPEPROCESSING, TPropertyConverter(PROPERTY_ESCAPEPROCESSING,aNoConverter) ); + aPropertyMediation.emplace( PROPERTY_FILTER, TPropertyConverter(PROPERTY_FILTER,aNoConverter) ); m_xRowSetMediator = new OPropertyMediator( m_xReportDefinition.get(), xRowSetProp, aPropertyMediation ); m_xRowSet = xRowSet; diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index a7102fef49e3..af7c34346a4a 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -666,7 +666,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles) const SdrMark* pM = rView.GetSdrMarkByIndex(i); SdrObject* pObj = pM->GetMarkedSdrObj(); tools::Rectangle aObjRect(pObj->GetSnapRect()); - _rSortRectangles.insert(TRectangleMap::value_type(aObjRect,TRectangleMap::mapped_type(pObj,&rView))); + _rSortRectangles.emplace(aObjRect,TRectangleMap::mapped_type(pObj,&rView)); } } } -- cgit