cid#1555812 COPY_INSTEAD_OF_MOVE

and

cid#1556056 COPY_INSTEAD_OF_MOVE
cid#1556907 COPY_INSTEAD_OF_MOVE
cid#1556957 COPY_INSTEAD_OF_MOVE
cid#1556970 COPY_INSTEAD_OF_MOVE
cid#1607095 COPY_INSTEAD_OF_MOVE

Change-Id: I51112b3a63b8e9333e3eaaeb55b764e6c449a5ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172117
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2024-08-21 09:31:36 +02:00
parent b5701f5b3d
commit 0ba4558949
8 changed files with 26 additions and 25 deletions
+1 -1
View File
@@ -1154,7 +1154,7 @@ namespace wmfemfhelper
nTextStart,
nTextLength,
std::vector(rDXArray),
std::vector(rKashidaArray),
std::move(rKashidaArray),
std::move(aFontAttribute),
std::move(aLocale),
aFontColor);
+1 -1
View File
@@ -32,7 +32,7 @@ public:
/// this will execute a dialog and then call function f with the output of the filtering operation
static void ExecuteGrfFilterSlot( SfxRequest const & rReq, const GraphicObject& rInputObject,
const std::function<void(const GraphicObject&)>& f);
const std::function<void(const Graphic&)>& f);
static void DisableGraphicFilterSlots( SfxItemSet& rSet );
};
+14 -12
View File
@@ -663,7 +663,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
bool bMatrixExpand )
{
ScDocument& rDoc = GetViewData().GetDocument();
ScMarkData rMark(GetViewData().GetMarkData());
ScMarkData aMark(GetViewData().GetMarkData());
bool bRecord = rDoc.IsUndoEnabled();
SCTAB i;
@@ -671,7 +671,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
ScDocFunc &rFunc = GetViewData().GetDocFunc();
std::shared_ptr<ScDocShellModificator> xModificator = std::make_shared<ScDocShellModificator>(*pDocSh);
ScEditableTester aTester( rDoc, nCol,nRow, nCol,nRow, rMark );
ScEditableTester aTester( rDoc, nCol,nRow, nCol,nRow, aMark );
if (!aTester.IsEditable())
{
ErrorMessage(aTester.GetMessageId());
@@ -722,23 +722,25 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
bool bNumFmtChanged = false;
if ( bFormula )
{ // formula, compile with autoCorrection
i = rMark.GetFirstSelected();
auto aPosPtr = std::make_shared<ScAddress>(nCol, nRow, i);
auto aCompPtr = std::make_shared<ScCompiler>(rDoc, *aPosPtr, rDoc.GetGrammar(), true, false);
i = aMark.GetFirstSelected();
auto xPosPtr = std::make_shared<ScAddress>(nCol, nRow, i);
auto xCompPtr = std::make_shared<ScCompiler>(rDoc, *xPosPtr, rDoc.GetGrammar(), true, false);
//2do: enable/disable autoCorrection via calcoptions
aCompPtr->SetAutoCorrection( true );
xCompPtr->SetAutoCorrection( true );
if ( rString[0] == '+' || rString[0] == '-' )
{
aCompPtr->SetExtendedErrorDetection( ScCompiler::EXTENDED_ERROR_DETECTION_NAME_BREAK );
xCompPtr->SetExtendedErrorDetection( ScCompiler::EXTENDED_ERROR_DETECTION_NAME_BREAK );
}
OUString aFormula( rString );
FormulaProcessingContext context_instance{
aPosPtr, aCompPtr, xModificator, nullptr, nullptr, pData,
rMark, *this, OUString(), aFormula, rString, nCol,
nRow, nTab, bMatrixExpand, bNumFmtChanged, bRecord
std::move(xPosPtr), std::move(xCompPtr), std::move(xModificator), nullptr,
nullptr, pData, std::move(aMark), *this,
OUString(), aFormula, rString, nCol,
nRow, nTab, bMatrixExpand, bNumFmtChanged,
bRecord
};
parseAndCorrectFormula(std::make_shared<FormulaProcessingContext>(context_instance));
@@ -746,7 +748,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
else
{
ScFieldEditEngine& rEngine = rDoc.GetEditEngine();
for (const auto& rTab : rMark)
for (const auto& rTab : aMark)
{
bool bNumFmtSet = false;
const ScAddress aScAddress(nCol, nRow, rTab);
@@ -770,7 +772,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
bNumFmtChanged = true;
}
}
performAutoFormatAndUpdate(rString, rMark, nCol, nRow, nTab, bNumFmtChanged, bRecord, xModificator, *this);
performAutoFormatAndUpdate(rString, aMark, nCol, nRow, nTab, bNumFmtChanged, bRecord, xModificator, *this);
}
}
@@ -538,7 +538,6 @@ void BaseNode::scheduleDeactivationEvent( EventSharedPtr const& pEvent )
// if anim base node has no activity, this is called to schedule deactivation,
// but what if it does not schedule anything?
auto self(mpSelf);
if (mxAnimationNode->getEnd().hasValue())
{
// TODO: We may need to calculate the duration if the end value is numeric.
@@ -547,7 +546,7 @@ void BaseNode::scheduleDeactivationEvent( EventSharedPtr const& pEvent )
// until we find a test case.
mpCurrentEvent = generateEvent(
mxAnimationNode->getEnd(),
[self] () { self->deactivate(); },
[self=mpSelf] () { self->deactivate(); },
maContext, 0.0 );
}
@@ -555,7 +554,7 @@ void BaseNode::scheduleDeactivationEvent( EventSharedPtr const& pEvent )
{
mpCurrentEvent = generateEvent(
mxAnimationNode->getDuration(),
[self] () { self->deactivate(); },
[self=mpSelf] () { self->deactivate(); },
maContext, 0.0 );
}
}
+2 -2
View File
@@ -126,13 +126,13 @@ bool DiagramData::removeNode(const OUString& rNodeId)
// remove connections
std::erase_if(maConnections,
[aIdsToRemove](const Connection& rCxn) {
[&aIdsToRemove](const Connection& rCxn) {
return aIdsToRemove.count(rCxn.msSourceId) || aIdsToRemove.count(rCxn.msDestId);
});
// remove data and presentation nodes
std::erase_if(maPoints,
[aIdsToRemove](const Point& rPoint) {
[&aIdsToRemove](const Point& rPoint) {
return aIdsToRemove.count(rPoint.msModelId);
});
+3 -3
View File
@@ -35,11 +35,11 @@
static void handleGraphicFilterDialog(const VclPtr<AbstractGraphicFilterDialog>& pDlg,
const Graphic& aInputGraphic,
const std::function<void(const GraphicObject&)>& f);
const std::function<void(const Graphic&)>& f);
void SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const & rReq,
const GraphicObject& rInputObject,
const std::function<void(const GraphicObject&)>& f)
const std::function<void(const Graphic&)>& f)
{
Graphic aInputGraphic = rInputObject.GetGraphic();
@@ -260,7 +260,7 @@ void SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const & rReq,
static void handleGraphicFilterDialog(const VclPtr<AbstractGraphicFilterDialog>& pDlg,
const Graphic& aInputGraphic,
const std::function<void(const GraphicObject&)>& f)
const std::function<void(const Graphic&)>& f)
{
pDlg->StartExecuteAsync(
[pDlg, aInputGraphic, f] (sal_Int32 nResult)->void
+1 -1
View File
@@ -2360,7 +2360,7 @@ singleInterfaceBasedServiceDefn:
}
ctors.push_back(
unoidl::SingleInterfaceBasedServiceEntity::Constructor(
i.name, std::vector(parms), std::vector(i.exceptions), std::vector(i.annotations)));
i.name, std::move(parms), std::vector(i.exceptions), std::vector(i.annotations)));
}
} else {
assert(pad->constructors.empty());
+2 -2
View File
@@ -661,9 +661,9 @@ void ImplStyleData::SetStandardStyles()
maFieldFont = aStdFont;
maIconFont = aStdFont;
maTabFont = aStdFont;
aStdFont.SetWeight( WEIGHT_BOLD );
maFloatTitleFont = aStdFont;
maTitleFont = aStdFont;
maFloatTitleFont = maTitleFont = std::move(aStdFont);
maFaceColor = COL_LIGHTGRAY;
maCheckedColor = Color( 0xCC, 0xCC, 0xCC );