[Libreoffice-commits] core.git: drawinglayer/source include/drawinglayer
Noel Grandin
noel.grandin at collabora.co.uk
Thu Jul 20 11:22:12 UTC 2017
drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 4 -
drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx | 4 -
drawinglayer/source/tools/emfppath.cxx | 2
drawinglayer/source/tools/emfppath.hxx | 2
drawinglayer/source/tools/wmfemfhelper.cxx | 28 +++++-----
include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx | 2
7 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 08366676c82d585019b575eb9ddb2d9fc537dd76
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jul 20 11:54:21 2017 +0200
loplugin:constparams in drawinglayer
Change-Id: I3111210ae77f67301bb319d5364f77c52e2c4d6d
Reviewed-on: https://gerrit.libreoffice.org/40220
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 4d2abbfe5d3c..897166caa5fc 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -36,7 +36,7 @@ namespace drawinglayer
{
void TextDecoratedPortionPrimitive2D::impCreateGeometryContent(
std::vector< Primitive2DReference >& rTarget,
- basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose& rDecTrans,
+ basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose const & rDecTrans,
const OUString& rText,
sal_Int32 nTextPosition,
sal_Int32 nTextLength,
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 93c6bd0033bb..efe3342b7cf9 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -342,7 +342,7 @@ namespace drawinglayer
}
}
- void VclMetafileProcessor2D::impStartSvtGraphicFill(SvtGraphicFill* pSvtGraphicFill)
+ void VclMetafileProcessor2D::impStartSvtGraphicFill(SvtGraphicFill const * pSvtGraphicFill)
{
if(pSvtGraphicFill && !mnSvtGraphicFillCount)
{
@@ -530,7 +530,7 @@ namespace drawinglayer
return pRetval;
}
- void VclMetafileProcessor2D::impStartSvtGraphicStroke(SvtGraphicStroke* pSvtGraphicStroke)
+ void VclMetafileProcessor2D::impStartSvtGraphicStroke(SvtGraphicStroke const * pSvtGraphicStroke)
{
if(pSvtGraphicStroke && !mnSvtGraphicStrokeCount)
{
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
index bbd032dfd94e..50ab3ec33566 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
@@ -79,7 +79,7 @@ namespace drawinglayer
Gradient& o_rVCLGradient,
const attribute::FillGradientAttribute& rFiGrAtt,
bool bIsTransparenceGradient);
- void impStartSvtGraphicFill(SvtGraphicFill* pSvtGraphicFill);
+ void impStartSvtGraphicFill(SvtGraphicFill const * pSvtGraphicFill);
void impEndSvtGraphicFill(SvtGraphicFill* pSvtGraphicFill);
SvtGraphicStroke* impTryToCreateSvtGraphicStroke(
const basegfx::B2DPolygon& rB2DPolygon,
@@ -88,7 +88,7 @@ namespace drawinglayer
const attribute::StrokeAttribute* pStrokeAttribute,
const attribute::LineStartEndAttribute* pStart,
const attribute::LineStartEndAttribute* pEnd);
- void impStartSvtGraphicStroke(SvtGraphicStroke* pSvtGraphicStroke);
+ void impStartSvtGraphicStroke(SvtGraphicStroke const * pSvtGraphicStroke);
void impEndSvtGraphicStroke(SvtGraphicStroke* pSvtGraphicStroke);
/// Convert the fWidth to the same space as its coordinates.
diff --git a/drawinglayer/source/tools/emfppath.cxx b/drawinglayer/source/tools/emfppath.cxx
index d68fd425994c..1cd1276f9120 100644
--- a/drawinglayer/source/tools/emfppath.cxx
+++ b/drawinglayer/source/tools/emfppath.cxx
@@ -61,7 +61,7 @@ namespace emfplushelper
}
// TODO: remove rR argument when debug code is no longer needed
- void EMFPPath::Read (SvStream& s, sal_uInt32 pathFlags, EmfPlusHelperData& rR)
+ void EMFPPath::Read (SvStream& s, sal_uInt32 pathFlags, EmfPlusHelperData const & rR)
{
for (int i = 0; i < nPoints; i ++)
{
diff --git a/drawinglayer/source/tools/emfppath.hxx b/drawinglayer/source/tools/emfppath.hxx
index 1e8c69771f59..6f2ccd10fe5c 100644
--- a/drawinglayer/source/tools/emfppath.hxx
+++ b/drawinglayer/source/tools/emfppath.hxx
@@ -37,7 +37,7 @@ namespace emfplushelper
virtual ~EMFPPath() override;
// TODO: remove rR argument when debug code is no longer needed
- void Read(SvStream& s, sal_uInt32 pathFlags, EmfPlusHelperData& rR);
+ void Read(SvStream& s, sal_uInt32 pathFlags, EmfPlusHelperData const & rR);
::basegfx::B2DPolyPolygon& GetPolygon(EmfPlusHelperData& rR, bool bMapIt = true, bool bAddLineToCloseShape = false);
};
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 93162e4d3fad..0bc3a518c838 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -445,7 +445,7 @@ namespace wmfemfhelper
void createPointArrayPrimitive(
const std::vector< basegfx::B2DPoint >& rPositions,
TargetHolder& rTarget,
- PropertyHolder& rProperties,
+ PropertyHolder const & rProperties,
const basegfx::BColor& rBColor)
{
if(!rPositions.empty())
@@ -478,7 +478,7 @@ namespace wmfemfhelper
void createHairlinePrimitive(
const basegfx::B2DPolygon& rLinePolygon,
TargetHolder& rTarget,
- PropertyHolder& rProperties)
+ PropertyHolder const & rProperties)
{
if(rLinePolygon.count())
{
@@ -495,7 +495,7 @@ namespace wmfemfhelper
void createFillPrimitive(
const basegfx::B2DPolyPolygon& rFillPolyPolygon,
TargetHolder& rTarget,
- PropertyHolder& rProperties)
+ PropertyHolder const & rProperties)
{
if(rFillPolyPolygon.count())
{
@@ -513,7 +513,7 @@ namespace wmfemfhelper
const basegfx::B2DPolygon& rLinePolygon,
const LineInfo& rLineInfo,
TargetHolder& rTarget,
- PropertyHolder& rProperties)
+ PropertyHolder const & rProperties)
{
if(rLinePolygon.count())
{
@@ -579,7 +579,7 @@ namespace wmfemfhelper
void createHairlineAndFillPrimitive(
const basegfx::B2DPolygon& rPolygon,
TargetHolder& rTarget,
- PropertyHolder& rProperties)
+ PropertyHolder const & rProperties)
{
if(rProperties.getFillColorActive())
{
@@ -596,7 +596,7 @@ namespace wmfemfhelper
void createHairlineAndFillPrimitive(
const basegfx::B2DPolyPolygon& rPolyPolygon,
TargetHolder& rTarget,
- PropertyHolder& rProperties)
+ PropertyHolder const & rProperties)
{
if(rProperties.getFillColorActive())
{
@@ -622,7 +622,7 @@ namespace wmfemfhelper
const BitmapEx& rBitmapEx,
const Point& rPoint,
TargetHolder& rTarget,
- PropertyHolder& rProperties)
+ PropertyHolder const & rProperties)
{
if(!rBitmapEx.IsEmpty())
{
@@ -642,7 +642,7 @@ namespace wmfemfhelper
const Point& rPoint,
const Size& rSize,
TargetHolder& rTarget,
- PropertyHolder& rProperties)
+ PropertyHolder const & rProperties)
{
if(!rBitmapEx.IsEmpty())
{
@@ -933,7 +933,7 @@ namespace wmfemfhelper
drawinglayer::primitive2d::BasePrimitive2D* CreateColorWallpaper(
const basegfx::B2DRange& rRange,
const basegfx::BColor& rColor,
- PropertyHolder& rPropertyHolder)
+ PropertyHolder const & rPropertyHolder)
{
basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(rRange));
aOutline.transform(rPropertyHolder.getTransformation());
@@ -949,7 +949,7 @@ namespace wmfemfhelper
drawinglayer::primitive2d::BasePrimitive2D* CreateGradientWallpaper(
const basegfx::B2DRange& rRange,
const Gradient& rGradient,
- PropertyHolder& rPropertyHolder)
+ PropertyHolder const & rPropertyHolder)
{
const drawinglayer::attribute::FillGradientAttribute aAttribute(createFillGradientAttribute(rGradient));
@@ -990,7 +990,7 @@ namespace wmfemfhelper
basegfx::B2DRange aWallpaperRange,
const Wallpaper& rWallpaper,
TargetHolder& rTarget,
- PropertyHolder& rProperty)
+ PropertyHolder const & rProperty)
{
const BitmapEx aBitmapEx(rWallpaper.GetBitmap());
const WallpaperStyle eWallpaperStyle(rWallpaper.GetStyle());
@@ -1070,7 +1070,7 @@ namespace wmfemfhelper
drawinglayer::attribute::FontAttribute& rFontAttribute,
basegfx::B2DHomMatrix& rTextTransform,
basegfx::B2DVector& rAlignmentOffset,
- PropertyHolder& rProperty)
+ PropertyHolder const & rProperty)
{
const vcl::Font& rFont = rProperty.getFont();
basegfx::B2DVector aFontScaling;
@@ -1120,7 +1120,7 @@ namespace wmfemfhelper
sal_uInt16 nTextLength,
const std::vector< double >& rDXArray,
TargetHolder& rTarget,
- PropertyHolder& rProperty)
+ PropertyHolder const & rProperty)
{
drawinglayer::primitive2d::BasePrimitive2D* pResult = nullptr;
const vcl::Font& rFont = rProperty.getFont();
@@ -1316,7 +1316,7 @@ namespace wmfemfhelper
void proccessMetaTextLineAction(
const MetaTextLineAction& rAction,
TargetHolder& rTarget,
- PropertyHolder& rProperty)
+ PropertyHolder const & rProperty)
{
const double fLineWidth(fabs((double)rAction.GetWidth()));
diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index 14fd82ebf000..25734d6c361d 100644
--- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -65,7 +65,7 @@ namespace drawinglayer
/// helper methods
void impCreateGeometryContent(
std::vector< Primitive2DReference >& rTarget,
- basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose& rDecTrans,
+ basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose const & rDecTrans,
const OUString& rText,
sal_Int32 nTextPosition,
sal_Int32 nTextLength,
More information about the Libreoffice-commits
mailing list