drawinglayer/qa/unit/border.cxx | 35 +++++-----
drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx | 3
helpcompiler/source/HelpLinker.cxx | 10 +-
3 files changed, 25 insertions(+), 23 deletions(-)
New commits:
commit 881329a30612fb822d6c770efabc249bbefeb126
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Oct 16 10:14:56 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Oct 16 18:11:52 2021 +0200
Simplify vector initialization in drawinglayer
Change-Id: Iee9c13149d3614ecd9f812cfbb85e4534c33c1be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123684
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/drawinglayer/qa/unit/border.cxx b/drawinglayer/qa/unit/border.cxx
index fdb3cc71a3a8..53bd420ee726 100644
--- a/drawinglayer/qa/unit/border.cxx
+++ b/drawinglayer/qa/unit/border.cxx
@@ -49,17 +49,18 @@ CPPUNIT_TEST_FIXTURE(DrawinglayerBorderTest,
testDoubleDecompositionSolid)
basegfx::BColor aColorLeft;
std::vector<double>
aDashing(svtools::GetLineDashing(SvxBorderLineStyle::DOUBLE, 10.0));
const drawinglayer::attribute::StrokeAttribute
aStrokeAttribute(std::move(aDashing));
- std::vector<drawinglayer::primitive2d::BorderLine> aBorderlines;
+ std::vector<drawinglayer::primitive2d::BorderLine> aBorderlines{
- aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(
- drawinglayer::attribute::LineAttribute(aColorLeft, fLeftWidth),
fExtendLeftStart,
- fExtendLeftStart, fExtendLeftEnd, fExtendLeftEnd));
+ drawinglayer::primitive2d::BorderLine(
+ drawinglayer::attribute::LineAttribute(aColorLeft, fLeftWidth),
fExtendLeftStart,
+ fExtendLeftStart, fExtendLeftEnd, fExtendLeftEnd),
- aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(fDistance));
+ drawinglayer::primitive2d::BorderLine(fDistance),
- aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(
- drawinglayer::attribute::LineAttribute(aColorRight, fRightWidth),
fExtendRightStart,
- fExtendRightStart, fExtendRightEnd, fExtendRightEnd));
+ drawinglayer::primitive2d::BorderLine(
+ drawinglayer::attribute::LineAttribute(aColorRight, fRightWidth),
fExtendRightStart,
+ fExtendRightStart, fExtendRightEnd, fExtendRightEnd)
+ };
rtl::Reference<drawinglayer::primitive2d::BorderLinePrimitive2D> aBorder(
new drawinglayer::primitive2d::BorderLinePrimitive2D(aStart, aEnd,
std::move(aBorderlines),
@@ -113,17 +114,17 @@ CPPUNIT_TEST_FIXTURE(DrawinglayerBorderTest,
testDoublePixelProcessing)
basegfx::BColor aColorLeft;
std::vector<double>
aDashing(svtools::GetLineDashing(SvxBorderLineStyle::DOUBLE, 10.0));
const drawinglayer::attribute::StrokeAttribute
aStrokeAttribute(std::move(aDashing));
- std::vector<drawinglayer::primitive2d::BorderLine> aBorderlines;
+ std::vector<drawinglayer::primitive2d::BorderLine> aBorderlines{
+ drawinglayer::primitive2d::BorderLine(
+ drawinglayer::attribute::LineAttribute(aColorLeft, fLeftWidth),
fExtendLeftStart,
+ fExtendLeftStart, fExtendLeftEnd, fExtendLeftEnd),
- aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(
- drawinglayer::attribute::LineAttribute(aColorLeft, fLeftWidth),
fExtendLeftStart,
- fExtendLeftStart, fExtendLeftEnd, fExtendLeftEnd));
+ drawinglayer::primitive2d::BorderLine(fDistance),
- aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(fDistance));
-
- aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(
- drawinglayer::attribute::LineAttribute(aColorRight, fRightWidth),
fExtendRightStart,
- fExtendRightStart, fExtendRightEnd, fExtendRightEnd));
+ drawinglayer::primitive2d::BorderLine(
+ drawinglayer::attribute::LineAttribute(aColorRight, fRightWidth),
fExtendRightStart,
+ fExtendRightStart, fExtendRightEnd, fExtendRightEnd)
+ };
rtl::Reference<drawinglayer::primitive2d::BorderLinePrimitive2D> aBorder(
new drawinglayer::primitive2d::BorderLinePrimitive2D(aStart, aEnd,
std::move(aBorderlines),
diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
index 4887802e17a4..010083b42291 100644
--- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
@@ -37,8 +37,7 @@ namespace drawinglayer::primitive3d
if(getPolyPolygon3D().count())
{
- std::vector< basegfx::B3DPolyPolygon > aFill;
- aFill.push_back(getPolyPolygon3D());
+ std::vector< basegfx::B3DPolyPolygon > aFill {
getPolyPolygon3D() };
// get full range
const basegfx::B3DRange aRange(getRangeFrom3DGeometry(aFill));
commit cd5ee8c7d3f06fe78e6b3993845a3c2abc7cb72a
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Oct 16 10:15:56 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Oct 16 18:11:39 2021 +0200
Simplify vector initialization in helpcompiler
Change-Id: I800fa0a6ac3b0dce1e0408858646dc7db5510623
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123688
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/helpcompiler/source/HelpLinker.cxx
b/helpcompiler/source/HelpLinker.cxx
index f7acc30ecc7d..0aedf9b42692 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -856,11 +856,13 @@ bool compileExtensionHelp
{
bool bSuccess = true;
- std::vector<std::string> args;
- args.reserve(nXhpFileCount + 2);
- args.push_back(std::string("-mod"));
OString aOExtensionName = OUStringToOString( aExtensionName,
osl_getThreadTextEncoding() );
- args.push_back(std::string(aOExtensionName.getStr()));
+ std::vector<std::string> args
+ {
+ std::string("-mod"),
+ std::string(aOExtensionName.getStr())
+ };
+ args.reserve(nXhpFileCount + 2);
for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp )
{
