diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 548982720cd5..e60b1f728f3a 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -359,8 +359,7 @@ void ShapeController::executeDispatch_TransformDialog() SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog(pChartWindow, pDrawViewWrapper)); - const WhichRangesContainer aRange = pDlg->GetInputRanges( *aAttr.GetPool() ); - SfxItemSet aCombAttr( *aAttr.GetPool(), aRange ); + SfxItemSet aCombAttr(*aAttr.GetPool(), pDlg->GetInputRanges(*aAttr.GetPool())); aCombAttr.Put( aAttr ); aCombAttr.Put( aGeoAttr ); pDlg->SetInputSet( &aCombAttr ); diff --git a/oox/inc/drawingml/scene3dhelper.hxx b/oox/inc/drawingml/scene3dhelper.hxx index 0f79825b13ca..d0c9598157ba 100644 --- a/oox/inc/drawingml/scene3dhelper.hxx +++ b/oox/inc/drawingml/scene3dhelper.hxx @@ -47,7 +47,7 @@ public: @param [in] rRotZ the shape rotation inclusive camera z-rotation as calculated by setExtrusionProperties() @param [in, out] rPropertyMap the map, that was already filled by setExtrusionProperties()*/ - void setLightingProperties(const oox::drawingml::Shape3DPropertiesPtr p3DProperties, + void setLightingProperties(const oox::drawingml::Shape3DPropertiesPtr& p3DProperties, const double& rRotZ, oox::PropertyMap& rPropertyMap); /** Puts the material properties of the 3D-shape into the property map diff --git a/oox/source/drawingml/scene3dhelper.cxx b/oox/source/drawingml/scene3dhelper.cxx index 7ad926b4bbf2..6e0fb0b107a2 100644 --- a/oox/source/drawingml/scene3dhelper.cxx +++ b/oox/source/drawingml/scene3dhelper.cxx @@ -875,7 +875,7 @@ void lcl_tweakLightRig(std::vector& rLightDirVec, PrstLightR } // end anonymous namespace -void Scene3DHelper::setLightingProperties(const oox::drawingml::Shape3DPropertiesPtr p3DProperties, +void Scene3DHelper::setLightingProperties(const oox::drawingml::Shape3DPropertiesPtr& p3DProperties, const double& rfRotZ, oox::PropertyMap& rPropertyMap) { if (!p3DProperties || !(*p3DProperties).mnLightRigType.has_value()) diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 46d633044115..9cc98952049f 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -160,7 +160,7 @@ void WorksheetSettings::importProtectedRange( const AttributeList& rAttribs ) aProt.maRangeList = xRangeList.release(); } } - maSheetProt.maEnhancedProtections.push_back( aProt); + maSheetProt.maEnhancedProtections.push_back(std::move(aProt)); } void WorksheetSettings::importChartProtection( const AttributeList& rAttribs ) diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index b20dc5e8357f..cb4656a6b5f8 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -359,7 +359,7 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor CustomAnimationPresetPtr pEffect = getEffectDescriptor( rEffectName ); if( pEffect ) { - aEffectsList.push_back( pEffect ); + aEffectsList.push_back(std::move(pEffect)); } #if OSL_DEBUG_LEVEL >= 2 else diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 4a84f49287c7..3eac5443176e 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -82,8 +82,7 @@ ClientBoxEntry* ClientBox::GetActiveEntry() void ClientBox::addEntry( const std::shared_ptr& pClientInfo ) { - TClientBoxEntry xEntry = std::make_shared(this, pClientInfo); - m_vEntries.push_back(xEntry); + m_vEntries.push_back(std::make_shared(this, pClientInfo)); } void ClientBox::setActive(ClientBoxEntry* pClientEntry) diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index f32a7ef36847..473bdfe17788 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -512,7 +512,7 @@ ErrCode SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, std::shared_ptr SfxLokHelper::extractCertificates(const std::string& rC break; } - aRet.push_back(aNext); + aRet.push_back(std::move(aNext)); } return aRet; } diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index ed94b74c13c8..6548692b326a 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -463,7 +463,7 @@ namespace cmis { if ( nullptr == m_pObjectType.get( ) && m_bTransient ) { - const std::string typeId = m_bIsFolder ? "cmis:folder" : "cmis:document"; + const std::string_view typeId = m_bIsFolder ? "cmis:folder" : "cmis:document"; // The type to create needs to be fetched from the possible children types // defined in the parent folder. Then, we'll pick up the first one we find matching // cmis:folder or cmis:document (depending what we need to create). @@ -505,7 +505,7 @@ namespace cmis } if ( !bTypeRestricted ) - m_pObjectType = getSession( xEnv )->getType( typeId ); + m_pObjectType = getSession( xEnv )->getType(std::string(typeId)); } return m_pObjectType; } diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index ce9691fb984c..7fc6967056b2 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -1429,7 +1429,7 @@ librdf_Repository::queryConstruct(const OUString & i_rQuery) std::scoped_lock g(m_aMutex); const OString query( OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); - const std::shared_ptr pQuery( + std::shared_ptr pQuery( librdf_new_query(m_pWorld.get(), s_sparql, nullptr, reinterpret_cast (query.getStr()), nullptr), safe_librdf_free_query); @@ -1456,7 +1456,8 @@ librdf_Repository::queryConstruct(const OUString & i_rQuery) } return new librdf_GraphResult(this, m_aMutex, std::move(pStream), - std::shared_ptr(), pQuery); + std::shared_ptr(), + std::move(pQuery)); } sal_Bool SAL_CALL