slideshow/source/engine/opengl/TransitionImpl.cxx | 140 +++++-----
slideshow/source/engine/opengl/TransitionImpl.hxx | 16 -
slideshow/source/engine/shapes/drawshape.cxx | 2
slideshow/source/engine/shapes/intrinsicanimationactivity.cxx | 10
slideshow/source/engine/shapes/intrinsicanimationactivity.hxx | 2
slideshow/source/engine/slide/slideimpl.cxx | 12
slideshow/source/engine/slide/userpaintoverlay.cxx | 12
slideshow/source/engine/slide/userpaintoverlay.hxx | 4
slideshow/source/inc/slide.hxx | 2
sw/inc/flddropdown.hxx | 2
sw/inc/tox.hxx | 2
sw/source/core/crsr/overlayrangesoutline.cxx | 8
sw/source/core/crsr/overlayrangesoutline.hxx | 4
sw/source/core/crsr/viscrs.cxx | 4
sw/source/core/doc/docfmt.cxx | 2
sw/source/core/docnode/finalthreadmanager.cxx | 6
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/fields/flddropdown.cxx | 4
sw/source/core/inc/AccessibilityIssue.hxx | 4
sw/source/core/inc/UndoAttribute.hxx | 2
sw/source/core/inc/UndoTable.hxx | 2
sw/source/core/inc/unoport.hxx | 2
sw/source/core/tox/tox.cxx | 14 -
sw/source/core/undo/unattr.cxx | 4
sw/source/core/undo/untbl.cxx | 4
sw/source/core/unocore/unoportenum.cxx | 4
sw/source/core/unocore/unorefmk.cxx | 2
sw/source/filter/basflt/fltshell.cxx | 4
sw/source/filter/inc/fltshell.hxx | 2
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 12
sw/source/ui/vba/vbadocumentproperties.cxx | 6
sw/source/ui/vba/vbarevisions.cxx | 4
sw/source/ui/vba/vbasections.cxx | 4
sw/source/uibase/docvw/AnnotationWin2.cxx | 4
sw/source/uibase/docvw/OverlayRanges.cxx | 12
sw/source/uibase/docvw/OverlayRanges.hxx | 6
38 files changed, 167 insertions(+), 163 deletions(-)
New commits:
commit 3739253b35212f45dd1654286db5e97b70589a57
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Oct 11 14:06:21 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Oct 11 18:43:34 2021 +0200
loplugin:moveparam in sw
Change-Id: I4fa524e4abb101ed0ff1b8f97b84582b84aa1d07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123387
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index 5057cbb9c319..5c336207219f 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -158,7 +158,7 @@ public:
@param rItems the new items
*/
- void SetItems(const std::vector<OUString>& rItems);
+ void SetItems(std::vector<OUString>&& rItems);
/**
Sets the items of the dropdown box.
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 77f7e6cd5e5b..1c2f12a899f6 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -331,7 +331,7 @@ public:
inline OUString const & GetTemplate(sal_uInt16 nLevel) const;
// #i21237#
- void SetPattern(sal_uInt16 nLevel, const SwFormTokens& rName);
+ void SetPattern(sal_uInt16 nLevel, SwFormTokens&& rName);
void SetPattern(sal_uInt16 nLevel, const OUString& rStr);
const SwFormTokens& GetPattern(sal_uInt16 nLevel) const;
diff --git a/sw/source/core/crsr/overlayrangesoutline.cxx
b/sw/source/core/crsr/overlayrangesoutline.cxx
index 1ec83370e544..aff0f9d8b143 100644
--- a/sw/source/core/crsr/overlayrangesoutline.cxx
+++ b/sw/source/core/crsr/overlayrangesoutline.cxx
@@ -75,9 +75,9 @@ namespace sw::overlay
OverlayRangesOutline::OverlayRangesOutline(
const Color& rColor,
- const std::vector< basegfx::B2DRange >& rRanges )
+ std::vector< basegfx::B2DRange >&& rRanges )
: sdr::overlay::OverlayObject(rColor)
- , maRanges(rRanges)
+ , maRanges(std::move(rRanges))
{
// no AA for highlight overlays
allowAntiAliase(false);
@@ -91,11 +91,11 @@ namespace sw::overlay
}
}
- void OverlayRangesOutline::setRanges(const std::vector<
basegfx::B2DRange >& rNew)
+ void OverlayRangesOutline::setRanges(std::vector< basegfx::B2DRange
>&& rNew)
{
if(rNew != maRanges)
{
- maRanges = rNew;
+ maRanges = std::move(rNew);
objectChange();
}
}
diff --git a/sw/source/core/crsr/overlayrangesoutline.hxx
b/sw/source/core/crsr/overlayrangesoutline.hxx
index ff1fd71b447b..2eb053c72132 100644
--- a/sw/source/core/crsr/overlayrangesoutline.hxx
+++ b/sw/source/core/crsr/overlayrangesoutline.hxx
@@ -37,7 +37,7 @@ namespace sw::overlay
public:
OverlayRangesOutline(
const Color& rColor,
- const std::vector< basegfx::B2DRange >& rRanges );
+ std::vector< basegfx::B2DRange >&& rRanges );
virtual ~OverlayRangesOutline() override;
@@ -48,7 +48,7 @@ namespace sw::overlay
}
// data write access
- void setRanges(const std::vector< basegfx::B2DRange >& rNew);
+ void setRanges(std::vector< basegfx::B2DRange >&& rNew);
};
} // end of namespace sw::overlay
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 5d076c8264d4..c756d3da3586 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -525,7 +525,7 @@ void SwSelPaintRects::HighlightInputField()
{
if (m_pTextInputFieldOverlay != nullptr)
{
- m_pTextInputFieldOverlay->setRanges( aInputFieldRanges );
+ m_pTextInputFieldOverlay->setRanges( std::move(aInputFieldRanges)
);
}
else
{
@@ -540,7 +540,7 @@ void SwSelPaintRects::HighlightInputField()
aHighlight.DecreaseLuminance( 128 );
m_pTextInputFieldOverlay.reset( new
sw::overlay::OverlayRangesOutline(
- aHighlight, aInputFieldRanges ) );
+ aHighlight, std::move(aInputFieldRanges) ) );
xTargetOverlay->add( *m_pTextInputFieldOverlay );
}
}
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 194c863ee746..bbc450438034 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -308,7 +308,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
bTextAttr ? sal_uInt16(RES_CONDTXTFMTCOLL) :
sal_uInt16(RES_TXTFMTCOLL) ));
if( !rAttrs.empty() )
{
- pUndo->SetAttrs( rAttrs );
+ pUndo->SetAttrs( o3tl::sorted_vector(rAttrs) );
}
pHst = &pUndo->GetHistory();
GetIDocumentUndoRedo().AppendUndo(std::move(pUndo));
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx
b/sw/source/core/docnode/finalthreadmanager.cxx
index 45bdc13be2d1..bfae4a6b443e 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -37,8 +37,8 @@
class CancelJobsThread : public osl::Thread
{
public:
- explicit CancelJobsThread( const std::list< css::uno::Reference<
css::util::XCancellable > >& rJobs )
- : maJobs( rJobs ),
+ explicit CancelJobsThread( std::list< css::uno::Reference<
css::util::XCancellable > >&& rJobs )
+ : maJobs( std::move(rJobs) ),
mbAllJobsCancelled( false ),
mbStopped( false )
{
@@ -320,7 +320,7 @@ void SAL_CALL FinalThreadManager::cancelAllJobs()
if ( mpCancelJobsThread == nullptr )
{
- mpCancelJobsThread.reset(new CancelJobsThread( aThreads ));
+ mpCancelJobsThread.reset(new CancelJobsThread( std::list(aThreads) ));
if ( !mpCancelJobsThread->create() )
{
mpCancelJobsThread.reset();
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 87cbdfd5db70..adad7a89f30e 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4623,7 +4623,7 @@ std::unique_ptr<SwTableAutoFormat>
SwDoc::DelTableStyle(const OUString& rName, b
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
-
std::make_unique<SwUndoTableStyleDelete>(std::move(pReleasedFormat),
vAffectedTables, *this));
+
std::make_unique<SwUndoTableStyleDelete>(std::move(pReleasedFormat),
std::move(vAffectedTables), *this));
}
}
diff --git a/sw/source/core/fields/flddropdown.cxx
b/sw/source/core/fields/flddropdown.cxx
index 2f98d2df53ab..57106978e10f 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -100,9 +100,9 @@ void SwDropDownField::SetPar2(const OUString & rName)
SetName(rName);
}
-void SwDropDownField::SetItems(const vector<OUString> & rItems)
+void SwDropDownField::SetItems(vector<OUString> && rItems)
{
- m_aValues = rItems;
+ m_aValues = std::move(rItems);
m_aSelectedItem.clear();
}
diff --git a/sw/source/core/inc/AccessibilityIssue.hxx
b/sw/source/core/inc/AccessibilityIssue.hxx
index c929ead6f167..8823303057a1 100644
--- a/sw/source/core/inc/AccessibilityIssue.hxx
+++ b/sw/source/core/inc/AccessibilityIssue.hxx
@@ -51,9 +51,9 @@ public:
std::vector<OUString> const& getAdditionalInfo() const { return
m_aIssueAdditionalInfo; }
- void setAdditionalInfo(std::vector<OUString> const& rIssueAdditionalInfo)
+ void setAdditionalInfo(std::vector<OUString>&& rIssueAdditionalInfo)
{
- m_aIssueAdditionalInfo = rIssueAdditionalInfo;
+ m_aIssueAdditionalInfo = std::move(rIssueAdditionalInfo);
}
bool canGotoIssue() const override;
diff --git a/sw/source/core/inc/UndoAttribute.hxx
b/sw/source/core/inc/UndoAttribute.hxx
index 6c866342434a..69f14b1c4642 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -77,7 +77,7 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
virtual void RepeatImpl( ::sw::RepeatContext & ) override;
- void SetAttrs( const o3tl::sorted_vector<sal_uInt16> &rAttrs );
+ void SetAttrs( o3tl::sorted_vector<sal_uInt16> && rAttrs );
SwHistory& GetHistory() { return *m_pHistory; }
};
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index a3fab2eed2d4..a1bcb4aaa082 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -391,7 +391,7 @@ class SwUndoTableStyleDelete final : public SwUndo
std::unique_ptr<SwTableAutoFormat> m_pAutoFormat;
std::vector<SwTable*> m_rAffectedTables;
public:
- SwUndoTableStyleDelete(std::unique_ptr<SwTableAutoFormat> pAutoFormat,
const std::vector<SwTable*>& rAffectedTables, const SwDoc& rDoc);
+ SwUndoTableStyleDelete(std::unique_ptr<SwTableAutoFormat> pAutoFormat,
std::vector<SwTable*>&& rAffectedTables, const SwDoc& rDoc);
virtual ~SwUndoTableStyleDelete() override;
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index eee83c4a7771..ee862925eb29 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -248,7 +248,7 @@ public:
const sal_Int32 nStart, const sal_Int32 nEnd );
SwXTextPortionEnumeration(SwPaM& rParaCursor,
- TextRangeList_t const & rPortions );
+ TextRangeList_t && rPortions );
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index a196db61e46e..f4983fb7277b 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -384,12 +384,12 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
SwFormToken aTmpToken(TOKEN_ENTRY);
aTmpTokens.push_back(aTmpToken);
- SetPattern( i, aTmpTokens );
+ SetPattern( i, std::move(aTmpTokens) );
SetTemplate(i, SwResId(STR_POOLCOLL_TOX_IDXBREAK));
}
else
{
- SetPattern( i, aTokens );
+ SetPattern( i, std::vector(aTokens) );
SetTemplate(i, SwResId(STR_POOLCOLL_TOX_ARY[i - 1]));
}
}
@@ -402,10 +402,10 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
{
SwFormTokens aAuthTokens;
lcl_FillAuthPattern(aAuthTokens, i);
- SetPattern(i, aAuthTokens);
+ SetPattern(i, std::move(aAuthTokens));
}
else
- SetPattern( i, aTokens );
+ SetPattern( i, std::vector(aTokens) );
if( TOX_CONTENT == m_eType && 6 == i )
pPoolId = STR_POOLCOLL_TOX_CNTNT_EXTRA_ARY;
@@ -507,7 +507,7 @@ void SwForm::AdjustTabStops( SwDoc const & rDoc ) //
#i21237#
}
if ( bChanged )
- SetPattern( nLevel, aCurrentPattern );
+ SetPattern( nLevel, std::move(aCurrentPattern) );
}
}
}
@@ -926,10 +926,10 @@ SwFormTokensHelper::SwFormTokensHelper(const OUString &
rPattern)
// <- #i21237#
-void SwForm::SetPattern(sal_uInt16 nLevel, const SwFormTokens& rTokens)
+void SwForm::SetPattern(sal_uInt16 nLevel, SwFormTokens&& rTokens)
{
OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX");
- m_aPattern[nLevel] = rTokens;
+ m_aPattern[nLevel] = std::move(rTokens);
}
void SwForm::SetPattern(sal_uInt16 nLevel, const OUString & rStr)
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 1407437c4e0a..f49987130380 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -648,9 +648,9 @@ void SwUndoResetAttr::RepeatImpl(::sw::RepeatContext &
rContext)
}
}
-void SwUndoResetAttr::SetAttrs( const o3tl::sorted_vector<sal_uInt16> &rAttrs )
+void SwUndoResetAttr::SetAttrs( o3tl::sorted_vector<sal_uInt16> && rAttrs )
{
- m_Ids = rAttrs;
+ m_Ids = std::move(rAttrs);
}
SwUndoAttr::SwUndoAttr( const SwPaM& rRange, const SfxPoolItem& rAttr,
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 3e0ad953c45c..ae1c54569984 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -3129,10 +3129,10 @@ SwRewriter SwUndoTableStyleMake::GetRewriter() const
return aResult;
}
-SwUndoTableStyleDelete::SwUndoTableStyleDelete(std::unique_ptr<SwTableAutoFormat>
pAutoFormat, const std::vector<SwTable*>& rAffectedTables, const SwDoc& rDoc)
+SwUndoTableStyleDelete::SwUndoTableStyleDelete(std::unique_ptr<SwTableAutoFormat>
pAutoFormat, std::vector<SwTable*>&& rAffectedTables, const SwDoc& rDoc)
: SwUndo(SwUndoId::TBLSTYLE_DELETE, &rDoc),
m_pAutoFormat(std::move(pAutoFormat)),
- m_rAffectedTables(rAffectedTables)
+ m_rAffectedTables(std::move(rAffectedTables))
{ }
SwUndoTableStyleDelete::~SwUndoTableStyleDelete()
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index b63cce639daf..f02b880f00b8 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -326,8 +326,8 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration(
SwXTextPortionEnumeration::SwXTextPortionEnumeration(
SwPaM& rParaCursor,
- TextRangeList_t const & rPortions )
- : m_Portions( rPortions )
+ TextRangeList_t && rPortions )
+ : m_Portions( std::move(rPortions) )
{
m_pUnoCursor =
rParaCursor.GetDoc().CreateUnoCursor(*rParaCursor.GetPoint());
}
diff --git a/sw/source/core/unocore/unorefmk.cxx
b/sw/source/core/unocore/unorefmk.cxx
index 536aee4f4d16..1bc65943175f 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -1207,7 +1207,7 @@ SwXMeta::createEnumeration()
}
else // cached!
{
- return new SwXTextPortionEnumeration(aPam, *m_pImpl->m_pTextPortions);
+ return new SwXTextPortionEnumeration(aPam,
std::deque(*m_pImpl->m_pTextPortions));
}
}
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index c79946ea44db..fee1828cd453 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -987,9 +987,9 @@ tools::Long SwFltRDFMark::GetHandle() const
return m_nHandle;
}
-void SwFltRDFMark::SetAttributes(const std::vector< std::pair<OUString,
OUString> >& rAttributes)
+void SwFltRDFMark::SetAttributes( std::vector< std::pair<OUString, OUString>
>&& rAttributes)
{
- m_aAttributes = rAttributes;
+ m_aAttributes = std::move(rAttributes);
}
const std::vector< std::pair<OUString, OUString> >&
SwFltRDFMark::GetAttributes() const
diff --git a/sw/source/filter/inc/fltshell.hxx
b/sw/source/filter/inc/fltshell.hxx
index 8156dfd8b210..d0d2b1be8507 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -252,7 +252,7 @@ public:
void SetHandle(tools::Long nHandle);
tools::Long GetHandle() const;
- void SetAttributes(const std::vector< std::pair<OUString, OUString> >&
rAttributes);
+ void SetAttributes(std::vector< std::pair<OUString, OUString> >&&
rAttributes);
const std::vector< std::pair<OUString, OUString> >& GetAttributes() const;
};
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 3f5384447958..cdb664bf611d 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6163,7 +6163,7 @@ void SwWW8ImplReader::GetSmartTagInfo(SwFltRDFMark& rMark)
if (!aKey.isEmpty() && !aValue.isEmpty())
aAttributes.emplace_back(aKey, aValue);
}
- rMark.SetAttributes(aAttributes);
+ rMark.SetAttributes(std::move(aAttributes));
}
ErrCode SwWW8ImplReader::LoadDoc(WW8Glossary *pGloss)
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 52d25bdeae06..73d720e9ed79 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -261,7 +261,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc*
pF, OUString& rStr)
if (!aFormula.maListEntries.empty())
{
- aField.SetItems(aFormula.maListEntries);
+ aField.SetItems(std::vector(aFormula.maListEntries));
int nIndex = aFormula.mfDropdownIndex <
aFormula.maListEntries.size() ? aFormula.mfDropdownIndex : 0;
aField.SetSelectedItem(aFormula.maListEntries[nIndex]);
}
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index acdcc6732b04..eba02826418e 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -3066,7 +3066,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF,
OUString& rStr )
aToken.sText = sDelimiter;
*aIt = aToken;
}
- aForm.SetPattern(nLevel, aPattern);
+ aForm.SetPattern(nLevel,
std::move(aPattern));
}
eType = TOKEN_END;
@@ -3188,7 +3188,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF,
OUString& rStr )
*aIt = aToken;
aForm.SetPattern(nLevel,
- aPattern);
+
std::move(aPattern));
}
eType = TOKEN_END;
}
@@ -3240,7 +3240,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF,
OUString& rStr )
)
{
aPattern.erase(aIt);
- aForm.SetPattern(nLevel, aPattern);
+ aForm.SetPattern(nLevel,
std::move(aPattern));
}
eType = TOKEN_END;
}
@@ -3287,7 +3287,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF,
OUString& rStr )
aPattern.insert(aItr, aLinkStart);
}
aPattern.push_back(aLinkEnd);
- aForm.SetPattern(nLevel, aPattern);
+ aForm.SetPattern(nLevel, std::move(aPattern));
}
pBase->SetTOXForm(aForm);
@@ -3333,7 +3333,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF,
OUString& rStr )
SwFormToken aNumberEntrySeparator(
TOKEN_TEXT );
aNumberEntrySeparator.sText = " ";
aPattern.insert( ++aIt,
aNumberEntrySeparator );
- pForm->SetPattern( nStyleLevel,
aPattern );
+ pForm->SetPattern( nStyleLevel,
std::move(aPattern) );
}
}
}
@@ -3375,7 +3375,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF,
OUString& rStr )
SwFormTokens::iterator new_end =
remove_if(aPattern.begin(), aPattern.end(),
SwFormTokenEqualToFormTokenType(TOKEN_ENTRY_NO));
aPattern.erase(new_end, aPattern.end() ); // table
index imported with wrong page number format
- aForm.SetPattern( nLevel, aPattern );
+ aForm.SetPattern( nLevel, std::move(aPattern) );
aForm.SetTemplate( nLevel,
aOldForm.GetTemplate(nLevel) );
}
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx
b/sw/source/ui/vba/vbadocumentproperties.cxx
index af04be582cda..78f553ed0365 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -650,7 +650,7 @@ class DocPropEnumeration : public ::cppu::WeakImplHelper<
css::container::XEnume
DocProps::iterator mIt;
public:
- explicit DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps
), mIt( mDocProps.begin() ) {}
+ explicit DocPropEnumeration( DocProps&& rProps ) : mDocProps(
std::move(rProps) ), mIt( mDocProps.begin() ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
return mIt != mDocProps.end();
@@ -739,7 +739,7 @@ protected:
}
virtual uno::Reference< container::XEnumeration > SAL_CALL
createEnumeration( ) override
{
- return new DocPropEnumeration( mDocProps );
+ return new DocPropEnumeration( std::unordered_map(mDocProps) );
}
};
@@ -872,7 +872,7 @@ public:
for ( ; key < nElem; ++key )
simpleDocPropSnapShot[ key ].set( getByIndex( key ),
uno::UNO_QUERY_THROW );
SAL_INFO("sw.vba", "After creating the enumeration");
- return new DocPropEnumeration( simpleDocPropSnapShot );
+ return new DocPropEnumeration( std::move(simpleDocPropSnapShot) );
}
void addProp( const OUString& Name, const uno::Any& Value )
diff --git a/sw/source/ui/vba/vbarevisions.cxx
b/sw/source/ui/vba/vbarevisions.cxx
index 37e078176f3e..03ab7c886b1d 100644
--- a/sw/source/ui/vba/vbarevisions.cxx
+++ b/sw/source/ui/vba/vbarevisions.cxx
@@ -36,7 +36,7 @@ class RedlinesEnumeration : public ::cppu::WeakImplHelper<
container::XEnumerati
RevisionMap mRevisionMap;
RevisionMap::iterator mIt;
public:
- explicit RedlinesEnumeration( const RevisionMap& sMap ) : mRevisionMap(
sMap ), mIt( mRevisionMap.begin() ) {}
+ explicit RedlinesEnumeration( RevisionMap&& sMap ) : mRevisionMap(
std::move(sMap) ), mIt( mRevisionMap.begin() ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
return ( mIt != mRevisionMap.end() );
@@ -74,7 +74,7 @@ RevisionCollectionHelper( const uno::Reference< frame::XModel
>& xModel, const u
// XEnumerationAccess
virtual uno::Reference< container::XEnumeration > SAL_CALL
createEnumeration( ) override
{
- return new RedlinesEnumeration( mRevisionMap );
+ return new RedlinesEnumeration( std::vector(mRevisionMap) );
}
};
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index 04a6cd560ab1..0665ebfce809 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -37,7 +37,7 @@ class SectionEnumeration : public ::cppu::WeakImplHelper<
container::XEnumeratio
XSectionVec::iterator mIt;
public:
- explicit SectionEnumeration( const XSectionVec& rVec ) : mxSections( rVec
), mIt( mxSections.begin() ) {}
+ explicit SectionEnumeration( XSectionVec&& rVec ) : mxSections(
std::move(rVec) ), mIt( mxSections.begin() ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
return ( mIt != mxSections.end() );
@@ -115,7 +115,7 @@ public:
// XEnumerationAccess
virtual uno::Reference< container::XEnumeration > SAL_CALL
createEnumeration( ) override
{
- return new SectionEnumeration( mxSections );
+ return new SectionEnumeration( std::vector(mxSections) );
}
};
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 64ea2a7de872..3bf0da22420a 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -707,7 +707,7 @@ void SwAnnotationWin::SetPosAndSize()
{
if ( mpTextRangeOverlay != nullptr )
{
- mpTextRangeOverlay->setRanges( maAnnotationTextRanges );
+ mpTextRangeOverlay->setRanges( std::vector(maAnnotationTextRanges)
);
if ( mpAnchor != nullptr && mpAnchor->getLineSolid() )
{
mpTextRangeOverlay->ShowSolidBorder();
@@ -724,7 +724,7 @@ void SwAnnotationWin::SetPosAndSize()
sw::overlay::OverlayRanges::CreateOverlayRange(
mrView,
mColorAnchor,
- maAnnotationTextRanges,
+ std::vector(maAnnotationTextRanges),
mpAnchor && mpAnchor->getLineSolid() );
}
}
diff --git a/sw/source/uibase/docvw/OverlayRanges.cxx
b/sw/source/uibase/docvw/OverlayRanges.cxx
index 2db0a2194a55..ccbcc0041196 100644
--- a/sw/source/uibase/docvw/OverlayRanges.cxx
+++ b/sw/source/uibase/docvw/OverlayRanges.cxx
@@ -103,7 +103,7 @@ namespace sw::overlay
/*static*/ std::unique_ptr<OverlayRanges>
OverlayRanges::CreateOverlayRange(
SwView const & rDocView,
const Color& rColor,
- const std::vector< basegfx::B2DRange >& rRanges,
+ std::vector< basegfx::B2DRange >&& rRanges,
const bool bShowSolidBorder )
{
std::unique_ptr<OverlayRanges> pOverlayRanges;
@@ -116,7 +116,7 @@ namespace sw::overlay
if ( xTargetOverlay.is() )
{
- pOverlayRanges.reset(new sw::overlay::OverlayRanges(
rColor, rRanges, bShowSolidBorder ));
+ pOverlayRanges.reset(new sw::overlay::OverlayRanges(
rColor, std::move(rRanges), bShowSolidBorder ));
xTargetOverlay->add( *pOverlayRanges );
}
}
@@ -126,10 +126,10 @@ namespace sw::overlay
OverlayRanges::OverlayRanges(
const Color& rColor,
- const std::vector< basegfx::B2DRange >& rRanges,
+ std::vector< basegfx::B2DRange >&& rRanges,
const bool bShowSolidBorder )
: sdr::overlay::OverlayObject( rColor )
- , maRanges( rRanges )
+ , maRanges( std::move(rRanges) )
, mbShowSolidBorder( bShowSolidBorder )
{
// no AA for highlight overlays
@@ -144,11 +144,11 @@ namespace sw::overlay
}
}
- void OverlayRanges::setRanges(const std::vector< basegfx::B2DRange >&
rNew)
+ void OverlayRanges::setRanges(std::vector< basegfx::B2DRange >&& rNew)
{
if(rNew != maRanges)
{
- maRanges = rNew;
+ maRanges = std::move(rNew);
objectChange();
}
}
diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx
b/sw/source/uibase/docvw/OverlayRanges.hxx
index 829f0c4001dc..d698e2cde3a6 100644
--- a/sw/source/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/uibase/docvw/OverlayRanges.hxx
@@ -35,7 +35,7 @@ namespace sw::overlay
static std::unique_ptr<OverlayRanges> CreateOverlayRange(
SwView const & rDocView,
const Color& rColor,
- const std::vector< basegfx::B2DRange >& rRanges,
+ std::vector< basegfx::B2DRange >&& rRanges,
const bool bShowSolidBorder );
virtual ~OverlayRanges() override;
@@ -47,7 +47,7 @@ namespace sw::overlay
}
// data write access
- void setRanges(const std::vector< basegfx::B2DRange >& rNew);
+ void setRanges(std::vector< basegfx::B2DRange >&& rNew);
void ShowSolidBorder();
void HideSolidBorder();
@@ -55,7 +55,7 @@ namespace sw::overlay
private:
OverlayRanges(
const Color& rColor,
- const std::vector< basegfx::B2DRange >& rRanges,
+ std::vector< basegfx::B2DRange >&& rRanges,
const bool bShowSolidBorder );
// geometry creation for OverlayObject
commit 043ba6ddf8d90b04acfae8ec836c4b772fb36754
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Oct 11 16:08:12 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Oct 11 18:43:21 2021 +0200
loplugin:moveparam in slideshow
Change-Id: I67ec3e8b7f5a9b6f6463dace95ab7e4a64469d8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123415
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx
b/slideshow/source/engine/opengl/TransitionImpl.cxx
index d45b17c2e953..ee0089cbae9e 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -573,13 +573,13 @@ void ReflectionTransition::displaySlides_( double nTime,
sal_Int32 glLeavingSlid
std::shared_ptr<OGLTransitionImpl>
makeReflectionTransition(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
- const Operations_t& rOverallOperations,
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
+ Operations_t&& rOverallOperations,
const TransitionSettings& rSettings)
{
return std::make_shared<ReflectionTransition>(
- TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives,
rOverallOperations, SceneObjects_t()),
+ TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives), std::move(rOverallOperations),
SceneObjects_t()),
rSettings);
}
@@ -621,44 +621,48 @@ void SimpleTransition::displaySlides_( double nTime,
sal_Int32 glLeavingSlideTex
std::shared_ptr<OGLTransitionImpl>
makeSimpleTransition(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
- const Operations_t& rOverallOperations,
- const SceneObjects_t& rSceneObjects,
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
+ Operations_t&& rOverallOperations,
+ SceneObjects_t&& rSceneObjects,
const TransitionSettings& rSettings)
{
return std::make_shared<SimpleTransition>(
- TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives,
rOverallOperations, rSceneObjects),
+ TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives),
+ std::move(rOverallOperations),
std::move(rSceneObjects)),
rSettings);
}
std::shared_ptr<OGLTransitionImpl>
makeSimpleTransition(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
- const Operations_t& rOverallOperations,
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
+ Operations_t&& rOverallOperations,
const TransitionSettings& rSettings = TransitionSettings())
{
- return makeSimpleTransition(rLeavingSlidePrimitives,
rEnteringSlidePrimitives, rOverallOperations, SceneObjects_t(), rSettings);
+ return makeSimpleTransition(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives),
+ std::move(rOverallOperations),
SceneObjects_t(), rSettings);
}
std::shared_ptr<OGLTransitionImpl>
makeSimpleTransition(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
- const SceneObjects_t& rSceneObjects,
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
+ SceneObjects_t&& rSceneObjects,
const TransitionSettings& rSettings)
{
- return makeSimpleTransition(rLeavingSlidePrimitives,
rEnteringSlidePrimitives, Operations_t(), rSceneObjects, rSettings);
+ return makeSimpleTransition(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives),
+ Operations_t(), std::move(rSceneObjects),
rSettings);
}
std::shared_ptr<OGLTransitionImpl>
makeSimpleTransition(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
const TransitionSettings& rSettings = TransitionSettings())
{
- return makeSimpleTransition(rLeavingSlidePrimitives,
rEnteringSlidePrimitives, Operations_t(), SceneObjects_t(), rSettings);
+ return makeSimpleTransition(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives),
+ Operations_t(), SceneObjects_t(), rSettings);
}
}
@@ -681,7 +685,7 @@ std::shared_ptr<OGLTransitionImpl>
makeOutsideCubeFaceToLeft()
Operations_t aOperations;
aOperations.push_back(makeRotateAndScaleDepthByWidth(glm::vec3(0,1,0),glm::vec3(0,0,-1),-90,false,true,0.0,1.0));
- return makeSimpleTransition(aLeavingPrimitives, aEnteringPrimitives,
aOperations);
+ return makeSimpleTransition(std::move(aLeavingPrimitives),
std::move(aEnteringPrimitives), std::move(aOperations));
}
std::shared_ptr<OGLTransitionImpl> makeInsideCubeFaceToLeft()
@@ -702,7 +706,7 @@ std::shared_ptr<OGLTransitionImpl>
makeInsideCubeFaceToLeft()
Operations_t aOperations;
aOperations.push_back(makeRotateAndScaleDepthByWidth(glm::vec3(0,1,0),glm::vec3(0,0,1),90,false,true,0.0,1.0));
- return makeSimpleTransition(aLeavingPrimitives, aEnteringPrimitives,
aOperations);
+ return makeSimpleTransition(std::move(aLeavingPrimitives),
std::move(aEnteringPrimitives), std::move(aOperations));
}
std::shared_ptr<OGLTransitionImpl> makeFallLeaving()
@@ -722,7 +726,7 @@ std::shared_ptr<OGLTransitionImpl> makeFallLeaving()
TransitionSettings aSettings;
aSettings.mbUseMipMapEntering = false;
- return makeSimpleTransition(aLeavingPrimitives, aEnteringPrimitives,
aSettings);
+ return makeSimpleTransition(std::move(aLeavingPrimitives),
std::move(aEnteringPrimitives), aSettings);
}
std::shared_ptr<OGLTransitionImpl> makeTurnAround()
@@ -751,7 +755,7 @@ std::shared_ptr<OGLTransitionImpl> makeTurnAround()
aOperations.push_back(makeSTranslate(glm::vec3(0, 0, 1.5), true, 0.5, 1));
aOperations.push_back(makeRotateAndScaleDepthByWidth(glm::vec3(0, 1,
0),glm::vec3(0, 0, 0), -180, true, true, 0.0, 1.0));
- return makeReflectionTransition(aLeavingPrimitives, aEnteringPrimitives,
aOperations, aSettings);
+ return makeReflectionTransition(std::move(aLeavingPrimitives),
std::move(aEnteringPrimitives), std::move(aOperations), aSettings);
}
std::shared_ptr<OGLTransitionImpl> makeTurnDown()
@@ -772,7 +776,7 @@ std::shared_ptr<OGLTransitionImpl> makeTurnDown()
TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = false;
- return makeSimpleTransition(aLeavingPrimitives, aEnteringPrimitives,
aSettings);
+ return makeSimpleTransition(std::move(aLeavingPrimitives),
std::move(aEnteringPrimitives), aSettings);
}
std::shared_ptr<OGLTransitionImpl> makeIris()
@@ -843,7 +847,7 @@ std::shared_ptr<OGLTransitionImpl> makeIris()
TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
- return makeSimpleTransition(aLeavingPrimitives, aEnteringPrimitives,
aSceneObjects, aSettings);
+ return makeSimpleTransition(std::move(aLeavingPrimitives),
std::move(aEnteringPrimitives), std::move(aSceneObjects), aSettings);
}
namespace
@@ -875,12 +879,12 @@ void RochadeTransition::displaySlides_( double nTime,
sal_Int32 glLeavingSlideTe
std::shared_ptr<OGLTransitionImpl>
makeRochadeTransition(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
return std::make_shared<RochadeTransition>(
- TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
+ TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives)),
rSettings)
;
@@ -919,7 +923,7 @@ std::shared_ptr<OGLTransitionImpl> makeRochade()
Slide.Operations.push_back(makeSScale(glm::vec3(1, -1, 1), glm::vec3(0,
-1.02, 0), false, -1, 0));
aEnteringSlide.push_back(Slide);
- return makeRochadeTransition(aLeavingSlide, aEnteringSlide, aSettings);
+ return makeRochadeTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide), aSettings);
}
static double randFromNeg1to1()
@@ -1049,7 +1053,7 @@ std::shared_ptr<OGLTransitionImpl> makeRevolvingCircles(
sal_uInt16 nCircles , s
aLeavingSlide.push_back(LeavingSlide);
}
- return makeSimpleTransition(aLeavingSlide, aEnteringSlide);
+ return makeSimpleTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide));
}
std::shared_ptr<OGLTransitionImpl> makeHelix( sal_uInt16 nRows )
@@ -1081,7 +1085,7 @@ std::shared_ptr<OGLTransitionImpl> makeHelix( sal_uInt16
nRows )
iPDn += invN;
}
- return makeSimpleTransition(aLeavingSlide, aEnteringSlide);
+ return makeSimpleTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide));
}
static float fdiv(int a, int b)
@@ -1124,7 +1128,7 @@ std::shared_ptr<OGLTransitionImpl> makeNByMTileFlip(
sal_uInt16 n, sal_uInt16 m
}
}
- return makeSimpleTransition(aLeavingSlide, aEnteringSlide);
+ return makeSimpleTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide));
}
Primitive& Primitive::operator=(const Primitive& rvalue)
@@ -1249,7 +1253,7 @@ makeDiamondTransition(const TransitionSettings& rSettings)
aEnteringSlidePrimitives.push_back (Slide1);
Primitives_t aLeavingSlidePrimitives;
aLeavingSlidePrimitives.push_back (Slide1);
- return
std::make_shared<DiamondTransition>(TransitionScene(aLeavingSlidePrimitives,
aEnteringSlidePrimitives), rSettings);
+ return
std::make_shared<DiamondTransition>(TransitionScene(std::move(aLeavingSlidePrimitives),
std::move(aEnteringSlidePrimitives)), rSettings);
}
}
@@ -1295,7 +1299,7 @@ std::shared_ptr<OGLTransitionImpl> makeVenetianBlinds(
bool vertical, int parts
ln = n;
}
- return makeSimpleTransition(aLeavingSlide, aEnteringSlide);
+ return makeSimpleTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide));
}
namespace
@@ -1319,12 +1323,12 @@ GLuint FadeSmoothlyTransition::makeShader() const
std::shared_ptr<OGLTransitionImpl>
makeFadeSmoothlyTransition(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
return std::make_shared<FadeSmoothlyTransition>(
- TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
+ TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives)),
rSettings)
;
}
@@ -1345,7 +1349,7 @@ std::shared_ptr<OGLTransitionImpl> makeFadeSmoothly()
TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
- return makeFadeSmoothlyTransition(aLeavingSlide, aEnteringSlide,
aSettings);
+ return makeFadeSmoothlyTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide), aSettings);
}
namespace
@@ -1371,13 +1375,13 @@ GLuint FadeThroughColorTransition::makeShader() const
std::shared_ptr<OGLTransitionImpl>
makeFadeThroughColorTransition(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
const TransitionSettings& rSettings,
bool white)
{
return std::make_shared<FadeThroughColorTransition>(
- TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
+ TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives)),
rSettings, white)
;
}
@@ -1398,7 +1402,7 @@ std::shared_ptr<OGLTransitionImpl> makeFadeThroughColor(
bool white )
TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
- return makeFadeThroughColorTransition(aLeavingSlide, aEnteringSlide,
aSettings, white);
+ return makeFadeThroughColorTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide), aSettings, white);
}
namespace
@@ -1527,12 +1531,12 @@ GLuint StaticNoiseTransition::makeShader() const
std::shared_ptr<OGLTransitionImpl>
makeStaticNoiseTransition(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
return std::make_shared<StaticNoiseTransition>(
- TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
+ TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives)),
rSettings)
;
}
@@ -1553,7 +1557,7 @@ std::shared_ptr<OGLTransitionImpl> makeStatic()
TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
- return makeStaticNoiseTransition(aLeavingSlide, aEnteringSlide, aSettings);
+ return makeStaticNoiseTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide), aSettings);
}
namespace
@@ -1577,12 +1581,12 @@ GLuint DissolveTransition::makeShader() const
std::shared_ptr<OGLTransitionImpl>
makeDissolveTransition(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
return std::make_shared<DissolveTransition>(
- TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
+ TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives)),
rSettings)
;
}
@@ -1603,7 +1607,7 @@ std::shared_ptr<OGLTransitionImpl> makeDissolve()
TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
- return makeDissolveTransition(aLeavingSlide, aEnteringSlide, aSettings);
+ return makeDissolveTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide), aSettings);
}
namespace
@@ -1822,13 +1826,13 @@ void VortexTransition::displaySlides_( double nTime,
sal_Int32 glLeavingSlideTex
}
std::shared_ptr<OGLTransitionImpl>
-makeVortexTransition(const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
+makeVortexTransition(Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
const TransitionSettings& rSettings,
int NX,
int NY)
{
- return
std::make_shared<VortexTransition>(TransitionScene(rLeavingSlidePrimitives,
rEnteringSlidePrimitives),
+ return
std::make_shared<VortexTransition>(TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives)),
rSettings,
NX, NY);
}
@@ -1857,7 +1861,7 @@ std::shared_ptr<OGLTransitionImpl> makeVortex()
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
aSettings.mnRequiredGLVersion = 3.2f;
- return makeVortexTransition(aLeavingSlide, aEnteringSlide, aSettings, NX,
NY);
+ return makeVortexTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide), aSettings, NX, NY);
}
namespace
@@ -1905,12 +1909,12 @@ void RippleTransition::prepare( double SlideWidth,
double SlideHeight )
}
std::shared_ptr<OGLTransitionImpl>
-makeRippleTransition(const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
+makeRippleTransition(Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
// The center point should be adjustable by the user, but we have no way
to do that in the UI
- return
std::make_shared<RippleTransition>(TransitionScene(rLeavingSlidePrimitives,
rEnteringSlidePrimitives),
+ return
std::make_shared<RippleTransition>(TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives)),
rSettings,
glm::vec2(0.5, 0.5));
}
@@ -1933,7 +1937,7 @@ std::shared_ptr<OGLTransitionImpl> makeRipple()
TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
- return makeRippleTransition(aLeavingSlide, aEnteringSlide, aSettings);
+ return makeRippleTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide), aSettings);
}
static void createHexagon(Primitive& aHexagon, const int x, const int y, const
int NX, const int NY)
@@ -2030,11 +2034,11 @@ void GlitterTransition::cleanup()
}
std::shared_ptr<OGLTransitionImpl>
-makeGlitterTransition(const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
+makeGlitterTransition(Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
- return
std::make_shared<GlitterTransition>(TransitionScene(rLeavingSlidePrimitives,
rEnteringSlidePrimitives),
+ return
std::make_shared<GlitterTransition>(TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives)),
rSettings);
}
@@ -2055,7 +2059,7 @@ std::shared_ptr<OGLTransitionImpl> makeGlitter()
aSlide.push_back(aHexagon);
- return makeGlitterTransition(aSlide, aEmptySlide, TransitionSettings());
+ return makeGlitterTransition(std::move(aSlide), std::move(aEmptySlide),
TransitionSettings());
}
namespace
@@ -2229,12 +2233,12 @@ void HoneycombTransition::displaySlides_( double nTime,
sal_Int32 glLeavingSlide
}
std::shared_ptr<OGLTransitionImpl>
-makeHoneycombTransition(const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
+makeHoneycombTransition(Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
const TransitionSettings& rSettings)
{
// The center point should be adjustable by the user, but we have no way
to do that in the UI
- return
std::make_shared<HoneycombTransition>(TransitionScene(rLeavingSlidePrimitives,
rEnteringSlidePrimitives),
+ return
std::make_shared<HoneycombTransition>(TransitionScene(std::move(rLeavingSlidePrimitives),
std::move(rEnteringSlidePrimitives)),
rSettings);
}
@@ -2255,7 +2259,7 @@ std::shared_ptr<OGLTransitionImpl> makeHoneycomb()
aHexagon.pushTriangle(glm::vec2((y % 4) ? fdiv(x, NX) : fdiv(x +
1, NX), fdiv(y, NY)), glm::vec2(1, 0), glm::vec2(0, 0));
aSlide.push_back(aHexagon);
- return makeHoneycombTransition(aSlide, aSlide, aSettings);
+ return makeHoneycombTransition(std::vector(aSlide), std::vector(aSlide),
aSettings);
}
std::shared_ptr<OGLTransitionImpl> makeNewsflash()
@@ -2282,7 +2286,7 @@ std::shared_ptr<OGLTransitionImpl> makeNewsflash()
Operations_t aOverallOperations;
aOverallOperations.push_back(makeSRotate(glm::vec3(0,0,1),glm::vec3(0.2,0.2,0),1080,true,0,1));
- return makeSimpleTransition(aLeavingSlide, aEnteringSlide,
aOverallOperations);
+ return makeSimpleTransition(std::move(aLeavingSlide),
std::move(aEnteringSlide), std::move(aOverallOperations));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx
b/slideshow/source/engine/opengl/TransitionImpl.hxx
index ca1d36366a6c..9a869203cb56 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.hxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.hxx
@@ -72,15 +72,15 @@ class TransitionScene
{
public:
TransitionScene(
- const Primitives_t& rLeavingSlidePrimitives,
- const Primitives_t& rEnteringSlidePrimitives,
- const Operations_t& rOverallOperations = Operations_t(),
- const SceneObjects_t& rSceneObjects = SceneObjects_t()
+ Primitives_t&& rLeavingSlidePrimitives,
+ Primitives_t&& rEnteringSlidePrimitives,
+ Operations_t&& rOverallOperations = Operations_t(),
+ SceneObjects_t&& rSceneObjects = SceneObjects_t()
)
- : maLeavingSlidePrimitives(rLeavingSlidePrimitives)
- , maEnteringSlidePrimitives(rEnteringSlidePrimitives)
- , maOverallOperations(rOverallOperations)
- , maSceneObjects(rSceneObjects)
+ : maLeavingSlidePrimitives(std::move(rLeavingSlidePrimitives))
+ , maEnteringSlidePrimitives(std::move(rEnteringSlidePrimitives))
+ , maOverallOperations(std::move(rOverallOperations))
+ , maSceneObjects(std::move(rSceneObjects))
{
}
diff --git a/slideshow/source/engine/shapes/drawshape.cxx
b/slideshow/source/engine/shapes/drawshape.cxx
index e8fcd0299ab3..f8e03ebff36f 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -554,7 +554,7 @@ namespace slideshow::internal
rContext,
pShape,
pWakeupEvent,
- aTimeout,
+ std::move(aTimeout),
pShape->mnAnimationLoopCount);
pWakeupEvent->setActivity( pActivity );
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
index ed288f4861bf..8e5acaef9c65 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
@@ -62,7 +62,7 @@ namespace slideshow::internal
IntrinsicAnimationActivity( const SlideShowContext&
rContext,
const DrawShapeSharedPtr&
rDrawShape,
const WakeupEventSharedPtr&
rWakeupEvent,
- const ::std::vector<double>&
rTimeouts,
+ ::std::vector<double>&&
rTimeouts,
::std::size_t
nNumLoops );
IntrinsicAnimationActivity(const IntrinsicAnimationActivity&) =
delete;
IntrinsicAnimationActivity& operator=(const
IntrinsicAnimationActivity&) = delete;
@@ -111,13 +111,13 @@ namespace slideshow::internal
IntrinsicAnimationActivity::IntrinsicAnimationActivity( const
SlideShowContext& rContext,
const
DrawShapeSharedPtr& rDrawShape,
const
WakeupEventSharedPtr& rWakeupEvent,
- const
::std::vector<double>& rTimeouts,
+
::std::vector<double>&& rTimeouts,
::std::size_t
nNumLoops ) :
maContext( rContext ),
mpDrawShape( rDrawShape ),
mpWakeupEvent( rWakeupEvent ),
mpListener( std::make_shared<IntrinsicAnimationListener>(*this) ),
- maTimeouts( rTimeouts ),
+ maTimeouts( std::move(rTimeouts) ),
mnCurrIndex(0),
mnNumLoops(nNumLoops),
mnLoopCount(0),
@@ -235,13 +235,13 @@ namespace slideshow::internal
const SlideShowContext& rContext,
const DrawShapeSharedPtr& rDrawShape,
const WakeupEventSharedPtr& rWakeupEvent,
- const ::std::vector<double>& rTimeouts,
+ ::std::vector<double>&& rTimeouts,
sal_uInt32 nNumLoops)
{
return std::make_shared<IntrinsicAnimationActivity>(rContext,
rDrawShape,
rWakeupEvent,
- rTimeouts,
+ std::move(rTimeouts),
nNumLoops);
}
}
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
index e5306b671788..6933c7cffa03 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
@@ -56,7 +56,7 @@ namespace slideshow::internal
const SlideShowContext& rContext,
const DrawShapeSharedPtr& rDrawShape,
const WakeupEventSharedPtr& rWakeupEvent,
- const ::std::vector<double>& rTimeouts,
+ ::std::vector<double>&& rTimeouts,
sal_uInt32 nNumLoops);
}
diff --git a/slideshow/source/engine/slide/slideimpl.cxx
b/slideshow/source/engine/slide/slideimpl.cxx
index f5f5d2a56861..4809cc4dc83f 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -80,7 +80,7 @@ public:
const uno::Reference<uno::XComponentContext>& xContext,
const ShapeEventListenerMap&
rShapeListenerMap,
const ShapeCursorMap&
rShapeCursorMap,
- const PolyPolygonVector&
rPolyPolygonVector,
+ PolyPolygonVector&&
rPolyPolygonVector,
RGBColor const&
rUserPaintColor,
double
dUserPaintStrokeWidth,
bool
bUserPaintEnabled,
@@ -301,7 +301,7 @@ SlideImpl::SlideImpl( const uno::Reference<
drawing::XDrawPage >& xDra
const uno::Reference< uno::XComponentContext >&
xComponentContext,
const ShapeEventListenerMap&
rShapeListenerMap,
const ShapeCursorMap&
rShapeCursorMap,
- const PolyPolygonVector&
rPolyPolygonVector,
+ PolyPolygonVector&&
rPolyPolygonVector,
RGBColor const&
aUserPaintColor,
double
dUserPaintStrokeWidth,
bool
bUserPaintEnabled,
@@ -337,7 +337,7 @@ SlideImpl::SlideImpl( const uno::Reference<
drawing::XDrawPage >& xDra
mrCursorManager( rCursorManager ),
maAnimations( maContext,
basegfx::B2DSize( getSlideSizeImpl() ) ),
- maPolygons(rPolyPolygonVector),
+ maPolygons(std::move(rPolyPolygonVector)),
maUserPaintColor(aUserPaintColor),
mdUserPaintStrokeWidth(dUserPaintStrokeWidth),
mpPaintOverlay(),
@@ -806,7 +806,7 @@ void SlideImpl::activatePaintOverlay()
mpPaintOverlay = UserPaintOverlay::create( maUserPaintColor,
mdUserPaintStrokeWidth,
maContext,
- maPolygons,
+ std::vector(maPolygons),
mbUserPaintOverlayEnabled );
mbPaintOverlayActive = true;
}
@@ -1105,7 +1105,7 @@ SlideSharedPtr createSlide( const uno::Reference<
drawing::XDrawPage >&
const uno::Reference< uno::XComponentContext >&
xComponentContext,
const ShapeEventListenerMap&
rShapeListenerMap,
const ShapeCursorMap&
rShapeCursorMap,
- const PolyPolygonVector&
rPolyPolygonVector,
+ PolyPolygonVector&&
rPolyPolygonVector,
RGBColor const&
rUserPaintColor,
double
dUserPaintStrokeWidth,
bool
bUserPaintEnabled,
@@ -1117,7 +1117,7 @@ SlideSharedPtr createSlide( const uno::Reference<
drawing::XDrawPage >&
rActivitiesQueue, rUserEventQueue,
rCursorManager,
rMediaFileManager, rViewContainer,
xComponentContext,
rShapeListenerMap,
- rShapeCursorMap,
rPolyPolygonVector, rUserPaintColor,
+ rShapeCursorMap,
std::move(rPolyPolygonVector), rUserPaintColor,
dUserPaintStrokeWidth,
bUserPaintEnabled,
bIntrinsicAnimationsAllowed,
bDisableAnimationZOrder );
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx
b/slideshow/source/engine/slide/userpaintoverlay.cxx
index ea66490633e2..d635fc60a234 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -51,11 +51,11 @@ namespace slideshow::internal
ScreenUpdater& rScreenUpdater,
const UnoViewContainer& rViews,
Slide& rSlide,
- const PolyPolygonVector& rPolygons,
+ PolyPolygonVector&& rPolygons,
bool bActive ) :
mrScreenUpdater( rScreenUpdater ),
maViews(),
- maPolygons( rPolygons ),
+ maPolygons( std::move(rPolygons) ),
maStrokeColor( rStrokeColor ),
mnStrokeWidth( nStrokeWidth ),
maLastPoint(),
@@ -424,13 +424,13 @@ namespace slideshow::internal
UserPaintOverlaySharedPtr UserPaintOverlay::create( const RGBColor&
rStrokeColor,
double
nStrokeWidth,
const
SlideShowContext& rContext,
- const
PolyPolygonVector& rPolygons,
+
PolyPolygonVector&& rPolygons,
bool
bActive )
{
UserPaintOverlaySharedPtr pRet( new UserPaintOverlay( rStrokeColor,
nStrokeWidth,
rContext,
- rPolygons,
+
std::move(rPolygons),
bActive));
return pRet;
@@ -439,7 +439,7 @@ namespace slideshow::internal
UserPaintOverlay::UserPaintOverlay( const RGBColor&
rStrokeColor,
double
nStrokeWidth,
const SlideShowContext& rContext,
- const PolyPolygonVector& rPolygons,
+ PolyPolygonVector&& rPolygons,
bool bActive )
:
mpHandler( std::make_shared<PaintOverlayHandler>( rStrokeColor,
nStrokeWidth,
@@ -447,7 +447,7 @@ namespace slideshow::internal
rContext.mrViewContainer,
//adding a link to Slide
dynamic_cast<Slide&>(rContext.mrCursorManager),
- rPolygons, bActive )),
+ std::move(rPolygons), bActive
)),
mrMultiplexer( rContext.mrEventMultiplexer )
{
mrMultiplexer.addClickHandler( mpHandler, 3.0 );
diff --git a/slideshow/source/engine/slide/userpaintoverlay.hxx
b/slideshow/source/engine/slide/userpaintoverlay.hxx
index 8e9f57d30388..ae443a0fa758 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.hxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.hxx
@@ -57,7 +57,7 @@ namespace slideshow::internal
static UserPaintOverlaySharedPtr create( const RGBColor&
rStrokeColor,
double
nStrokeWidth,
const SlideShowContext&
rContext,
- const PolyPolygonVector&
rPolygons,
+ PolyPolygonVector&&
rPolygons,
bool
bActive);
~UserPaintOverlay();
UserPaintOverlay(const UserPaintOverlay&) = delete;
@@ -69,7 +69,7 @@ namespace slideshow::internal
UserPaintOverlay( const RGBColor& rStrokeColor,
double nStrokeWidth,
const SlideShowContext& rContext,
- const PolyPolygonVector& rPolygons,
+ PolyPolygonVector&& rPolygons,
bool bActive );
::std::shared_ptr<PaintOverlayHandler> mpHandler;
diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx
index bc3ffeb2aa63..ea460582d120 100644
--- a/slideshow/source/inc/slide.hxx
+++ b/slideshow/source/inc/slide.hxx
@@ -197,7 +197,7 @@ namespace slideshow::internal
const css::uno::Reference<
css::uno::XComponentContext >& xContext,
const ShapeEventListenerMap&
rShapeListenerMap,
const ShapeCursorMap&
rShapeCursorMap,
- const PolyPolygonVector&
rPolyPolygonVector,
+ PolyPolygonVector&&
rPolyPolygonVector,
RGBColor const&
aUserPaintColor,
double
dUserPaintStrokeWidth,
bool
bUserPaintEnabled,
