mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cid#1616498 COPY_INSTEAD_OF_MOVE

Browse Source 
and

cid#1616499 COPY_INSTEAD_OF_MOVE

Change-Id: I21b089cab036902a7ba5b725a6eae0f1212f2b31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171923
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2024-08-15 19:59:16 +01:00
parent 523465dbcc
commit 06aaed0fd7
6 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
comphelper/source/misc/lok.cxx
View File

@@ -318,7 +318,7 @@ void statusIndicatorFinish()
pStatusIndicatorCallback(pStatusIndicatorCallbackData, statusIndicatorCallbackType::Finish, 0, nullptr);
}
void setAnyInputCallback(std::function<bool(void*)> pAnyInputCallback, void* pData)
void setAnyInputCallback(const std::function<bool(void*)>& pAnyInputCallback, void* pData)
{
g_pAnyInputCallback = pAnyInputCallback;
g_pAnyInputCallbackData = pData;

7
drawinglayer/source/primitive2d/textlayoutdevice.cxx
View File

@@ -381,9 +381,8 @@ TextLayouterDevice::getSalLayout(const OUString& rText, sal_uInt32 nIndex, sal_u
void TextLayouterDevice::createEmphasisMarks(
SalLayout& rSalLayout, TextEmphasisMark aTextEmphasisMark, bool bAbove,
std::function<void(const basegfx::B2DPoint&, const basegfx::B2DPolyPolygon&, bool,
const tools::Rectangle&, const tools::Rectangle&)>
aCallback) const
const std::function<void(const basegfx::B2DPoint&, const basegfx::B2DPolyPolygon&, bool,
const tools::Rectangle&, const tools::Rectangle&)>& rCallback) const
{
FontEmphasisMark nEmphasisMark(FontEmphasisMark::NONE);
double fEmphasisHeight(getTextHeight() * (250.0 / 1000.0));
@@ -412,7 +411,7 @@ void TextLayouterDevice::createEmphasisMarks(
nEmphasisMark |= FontEmphasisMark::PosBelow;
mrDevice.createEmphasisMarks(nEmphasisMark, static_cast<tools::Long>(fEmphasisHeight),
rSalLayout, aCallback);
rSalLayout, rCallback);
}
// helper methods for vcl font handling

2
include/comphelper/lok.hxx
View File

@@ -134,7 +134,7 @@ COMPHELPER_DLLPUBLIC void statusIndicatorFinish();
COMPHELPER_DLLPUBLIC void setBlockedCommandList(const char* blockedCommandList);
COMPHELPER_DLLPUBLIC void setAnyInputCallback(std::function<bool(void*)> pAnyInputCallback,
COMPHELPER_DLLPUBLIC void setAnyInputCallback(const std::function<bool(void*)>& pAnyInputCallback,
void* pData);
COMPHELPER_DLLPUBLIC bool anyInput();
}

10
include/drawinglayer/primitive2d/textlayoutdevice.hxx
View File

@@ -125,11 +125,11 @@ public:
const basegfx::B2DPoint& rStartPoint,
const KernArray& rDXArray,
std::span<const sal_Bool> pKashidaAry) const;
void
createEmphasisMarks(SalLayout& rSalLayout, TextEmphasisMark aTextEmphasisMark, bool bAbove,
std::function<void(const basegfx::B2DPoint&, const basegfx::B2DPolyPolygon&,
bool, const tools::Rectangle&, const tools::Rectangle&)>
aCallback) const;
void createEmphasisMarks(
SalLayout& rSalLayout, TextEmphasisMark aTextEmphasisMark, bool bAbove,
const std::function<void(const basegfx::B2DPoint&, const basegfx::B2DPolyPolygon&, bool,
const tools::Rectangle&, const tools::Rectangle&)>& rCallback)
const;
};
// helper methods for vcl font handling

4
include/vcl/outdev.hxx
View File

@@ -1237,8 +1237,8 @@ public:
FontEmphasisMark nFontEmphasisMark,
tools::Long nEmphasisHeight,
SalLayout& rSalLayout,
std::function<void(const basegfx::B2DPoint&, const basegfx::B2DPolyPolygon&,
bool, const tools::Rectangle&, const tools::Rectangle&)> aCallback) const;
const std::function<void(const basegfx::B2DPoint&, const basegfx::B2DPolyPolygon&,
bool, const tools::Rectangle&, const tools::Rectangle&)>& rCallback) const;
// tells whether this output device is RTL in an LTR UI or LTR in a RTL UI
SAL_DLLPRIVATE bool ImplIsAntiparallel() const ;

7
vcl/source/outdev/EmphasisMarks.cxx
View File

@@ -25,9 +25,8 @@
void OutputDevice::createEmphasisMarks(
FontEmphasisMark nEmphasisMark, tools::Long nEmphasisHeight, SalLayout& rSalLayout,
std::function<void(const basegfx::B2DPoint&, const basegfx::B2DPolyPolygon&, bool,
const tools::Rectangle&, const tools::Rectangle&)>
aCallback) const
const std::function<void(const basegfx::B2DPoint&, const basegfx::B2DPolyPolygon&, bool,
const tools::Rectangle&, const tools::Rectangle&)>& rCallback) const
{
// tooling method to create geometry data for EmphasisMarks. It does the same
// as OutputDevice::ImplDrawEmphasisMarks, but feeds the data into the
@@ -91,7 +90,7 @@ void OutputDevice::createEmphasisMarks(
aOutPoint.adjustY(aAdjPoint.Y() - nEmphasisHeight2);
// use callback to propagate the data to where it was requested from
aCallback(aOutPoint, aShape, aEmphasisMark.IsShapePolyLine(), aEmphasisMark.GetRect1(),
rCallback(aOutPoint, aShape, aEmphasisMark.IsShapePolyLine(), aEmphasisMark.GetRect1(),
aEmphasisMark.GetRect2());
}
}