diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/edit/edfcol.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unocrsrhelper.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/app/docst.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/shells/tabsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/shells/textsh1.cxx | 3 | ||||
-rw-r--r-- | sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 2 |
8 files changed, 11 insertions, 8 deletions
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 2fb0d9ac8611..18fb6455d76b 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -2009,7 +2009,7 @@ void SwEditShell::RestoreMetadataFieldsAndValidateParagraphSignatures() } // Update classification based on results. - lcl_ApplyParagraphClassification(GetDoc(), xModel, xParagraph, xSubject, aResults); + lcl_ApplyParagraphClassification(GetDoc(), xModel, xParagraph, xSubject, std::move(aResults)); // Get Signatures std::map<OUString, SignatureDescr> aSignatures; diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index fa6b6ef60fb2..6564d9b5aaff 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1112,7 +1112,7 @@ void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL, pMed->SetFilter( pFilter ); } else - pMed.reset(new SfxMedium(sFileName, StreamMode::READ, pFilter, nullptr)); + pMed.reset(new SfxMedium(sFileName, StreamMode::READ, std::move(pFilter), nullptr)); } if(!sFilterOptions.isEmpty()) pMed->GetItemSet().Put( SfxStringItem( SID_FILE_FILTEROPTIONS, sFilterOptions ) ); diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index bfd7b613cd6f..9afe8ddca42e 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -227,7 +227,7 @@ std::shared_ptr<const SfxFilter> SwIoSystem::GetFileFilter(const OUString& rFile // there's only a template filter that could be found if ( pTemplateFilter ) - pFilter = pTemplateFilter; + pFilter = std::move(pTemplateFilter); } } diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index a20379b4a92e..73125adf4188 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -3261,7 +3261,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr ) SwFormToken aToken(TOKEN_TEXT); aToken.sText = sDelimiter; - *aIt = aToken; + *aIt = std::move(aToken); aForm.SetPattern(nLevel, std::move(aPattern)); } diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 433d91df57ce..05348aa6e805 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -1012,7 +1012,9 @@ void SwDocShell::Edit( && pStyle->IsUsed() && !pStyle->IsUserDefined(); - pDlg->StartExecuteAsync([bIsDefaultPage, bNew, nFamily, nSlot, nNewStyleUndoId, pApplyStyleHelper, pRequest, xTmp, this](sal_Int32 nResult){ + pDlg->StartExecuteAsync([bIsDefaultPage, bNew, nFamily, nSlot, nNewStyleUndoId, + pApplyStyleHelper=std::move(pApplyStyleHelper), + pRequest, xTmp, this](sal_Int32 nResult){ if (RET_OK == nResult) pApplyStyleHelper->apply(); diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 2fa9db78f6cb..97589cd2c7b6 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -717,7 +717,7 @@ void SwTableShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); VclPtr<SfxAbstractDialog> pDlg(pFact->CreateNumFormatDialog(GetView().GetFrameWeld(), *pCoreSet)); - pDlg->StartExecuteAsync([pDlg, pCoreSet, pSh](sal_uInt32 nResult){ + pDlg->StartExecuteAsync([pDlg, pCoreSet=std::move(pCoreSet), pSh](sal_uInt32 nResult){ if (RET_OK == nResult) { const SvxNumberInfoItem* pNumberFormatItem diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 4b1212b288d9..9b11e6f1b4ef 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -214,7 +214,8 @@ static void sw_CharDialog(SwWrtShell& rWrtSh, bool bUseDialog, bool bApplyToPara pReq->Ignore(); // the 'old' request is not relevant any more } pDlg->StartExecuteAsync([pDlg, &rWrtSh, pCoreSet=std::move(pCoreSet), bSel, - bSelectionPut, bApplyToParagraph, pRequest](sal_Int32 nResult){ + bSelectionPut, bApplyToParagraph, + pRequest=std::move(pRequest)](sal_Int32 nResult){ if (nResult == RET_OK) { sw_CharDialogResult(pDlg->GetOutputItemSet(), rWrtSh, pCoreSet, bSel, bSelectionPut, diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx index 9dde50e56336..b195c5280b09 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx @@ -9673,7 +9673,7 @@ void DomainMapper_Impl::AddNewRedline( sal_uInt32 sprmId ) m_pParaMarkerRedline = pNew; } // Newly read data will go into this redline. - m_currentRedline = pNew; + m_currentRedline = std::move(pNew); } void DomainMapper_Impl::SetCurrentRedlineIsRead() |