[Libreoffice-commits] core.git: cppcanvas/source drawinglayer/source tools/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Nov 6 09:09:45 UTC 2017
cppcanvas/source/mtfrenderer/emfpbrush.cxx | 2 +-
cppcanvas/source/mtfrenderer/emfpbrush.hxx | 2 +-
cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx | 4 ++--
cppcanvas/source/mtfrenderer/emfpcustomlinecap.hxx | 4 ++--
cppcanvas/source/mtfrenderer/emfppath.cxx | 2 +-
cppcanvas/source/mtfrenderer/emfppath.hxx | 2 +-
cppcanvas/source/mtfrenderer/emfppen.cxx | 4 ++--
cppcanvas/source/mtfrenderer/emfppen.hxx | 4 ++--
drawinglayer/source/tools/emfpbrush.cxx | 2 +-
drawinglayer/source/tools/emfpbrush.hxx | 2 +-
drawinglayer/source/tools/emfpcustomlinecap.cxx | 4 ++--
drawinglayer/source/tools/emfpcustomlinecap.hxx | 4 ++--
drawinglayer/source/tools/emfphelperdata.cxx | 2 +-
drawinglayer/source/tools/emfphelperdata.hxx | 2 +-
drawinglayer/source/tools/emfppath.cxx | 2 +-
drawinglayer/source/tools/emfppath.hxx | 2 +-
drawinglayer/source/tools/emfppen.cxx | 4 ++--
drawinglayer/source/tools/emfppen.hxx | 4 ++--
tools/source/stream/strmunx.cxx | 2 +-
19 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 84b1fab6548481313e9b65a9d56965bbbbe1c112
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Sat Nov 4 08:59:25 2017 +0200
loplugin:constparams in cppcanvas,drawinglayer
Change-Id: I15cac1411c985afe8d7cb9439214a8092702bdb8
Reviewed-on: https://gerrit.libreoffice.org/44343
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cppcanvas/source/mtfrenderer/emfpbrush.cxx b/cppcanvas/source/mtfrenderer/emfpbrush.cxx
index b9f2ed4246e2..fb8a41c5d846 100644
--- a/cppcanvas/source/mtfrenderer/emfpbrush.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpbrush.cxx
@@ -89,7 +89,7 @@ namespace cppcanvas
}
}
- void EMFPBrush::Read(SvStream& s, ImplRenderer& rR)
+ void EMFPBrush::Read(SvStream& s, ImplRenderer const & rR)
{
sal_uInt32 header;
diff --git a/cppcanvas/source/mtfrenderer/emfpbrush.hxx b/cppcanvas/source/mtfrenderer/emfpbrush.hxx
index 3d5561b55846..dc1e8d890dc6 100644
--- a/cppcanvas/source/mtfrenderer/emfpbrush.hxx
+++ b/cppcanvas/source/mtfrenderer/emfpbrush.hxx
@@ -121,7 +121,7 @@ namespace cppcanvas
sal_uInt32 GetType() const { return type; }
const ::Color& GetColor() const { return solidColor; }
- void Read(SvStream& s, ImplRenderer& rR);
+ void Read(SvStream& s, ImplRenderer const & rR);
};
}
}
diff --git a/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx b/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx
index d53d14fb155e..90e48264933a 100644
--- a/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpcustomlinecap.cxx
@@ -74,7 +74,7 @@ namespace cppcanvas
aAttributes.MiterLimit = miterLimit;
}
- void EMFPCustomLineCap::ReadPath(SvStream& s, ImplRenderer& rR, bool bFill)
+ void EMFPCustomLineCap::ReadPath(SvStream& s, ImplRenderer const & rR, bool bFill)
{
sal_Int32 pathLength;
s.ReadInt32(pathLength);
@@ -101,7 +101,7 @@ namespace cppcanvas
polygon.transform(aMatrix);
};
- void EMFPCustomLineCap::Read(SvStream& s, ImplRenderer& rR)
+ void EMFPCustomLineCap::Read(SvStream& s, ImplRenderer const & rR)
{
sal_uInt32 header;
diff --git a/cppcanvas/source/mtfrenderer/emfpcustomlinecap.hxx b/cppcanvas/source/mtfrenderer/emfpcustomlinecap.hxx
index c5b96a10e81e..cd5a45eec997 100644
--- a/cppcanvas/source/mtfrenderer/emfpcustomlinecap.hxx
+++ b/cppcanvas/source/mtfrenderer/emfpcustomlinecap.hxx
@@ -35,8 +35,8 @@ namespace cppcanvas
EMFPCustomLineCap();
void SetAttributes(com::sun::star::rendering::StrokeAttributes& aAttributes);
- void ReadPath(SvStream& s, ImplRenderer& rR, bool bFill);
- void Read(SvStream& s, ImplRenderer& rR);
+ void ReadPath(SvStream& s, ImplRenderer const & rR, bool bFill);
+ void Read(SvStream& s, ImplRenderer const & rR);
};
}
}
diff --git a/cppcanvas/source/mtfrenderer/emfppath.cxx b/cppcanvas/source/mtfrenderer/emfppath.cxx
index 506a01f424b1..39dc1bcb9f99 100644
--- a/cppcanvas/source/mtfrenderer/emfppath.cxx
+++ b/cppcanvas/source/mtfrenderer/emfppath.cxx
@@ -102,7 +102,7 @@ namespace cppcanvas
#endif
}
- ::basegfx::B2DPolyPolygon& EMFPPath::GetPolygon (ImplRenderer& rR, bool bMapIt, bool bAddLineToCloseShape)
+ ::basegfx::B2DPolyPolygon& EMFPPath::GetPolygon (ImplRenderer const & rR, bool bMapIt, bool bAddLineToCloseShape)
{
::basegfx::B2DPolygon polygon;
diff --git a/cppcanvas/source/mtfrenderer/emfppath.hxx b/cppcanvas/source/mtfrenderer/emfppath.hxx
index 7f60a76f896f..47fb32a047e6 100644
--- a/cppcanvas/source/mtfrenderer/emfppath.hxx
+++ b/cppcanvas/source/mtfrenderer/emfppath.hxx
@@ -40,7 +40,7 @@ namespace cppcanvas
// TODO: remove rR argument when debug code is no longer needed
void Read(SvStream& s, sal_uInt32 pathFlags, ImplRenderer const & rR);
- ::basegfx::B2DPolyPolygon& GetPolygon(ImplRenderer& rR, bool bMapIt = true, bool bAddLineToCloseShape = false);
+ ::basegfx::B2DPolyPolygon& GetPolygon(ImplRenderer const & rR, bool bMapIt = true, bool bAddLineToCloseShape = false);
};
}
}
diff --git a/cppcanvas/source/mtfrenderer/emfppen.cxx b/cppcanvas/source/mtfrenderer/emfppen.cxx
index 9ca64d53c169..2bd005e4aab4 100644
--- a/cppcanvas/source/mtfrenderer/emfppen.cxx
+++ b/cppcanvas/source/mtfrenderer/emfppen.cxx
@@ -95,7 +95,7 @@ namespace cppcanvas
delete customEndCap;
}
- void EMFPPen::SetStrokeWidth(rendering::StrokeAttributes& rStrokeAttributes, ImplRenderer& rR, const OutDevState& rState)
+ void EMFPPen::SetStrokeWidth(rendering::StrokeAttributes& rStrokeAttributes, ImplRenderer const & rR, const OutDevState& rState)
{
// If a zero width is specified, a minimum value is used, which is determined by the units.
//TODO Add support for other units than Pixel
@@ -169,7 +169,7 @@ namespace cppcanvas
}
}
- void EMFPPen::Read(SvStream& s, ImplRenderer& rR)
+ void EMFPPen::Read(SvStream& s, ImplRenderer const & rR)
{
sal_uInt32 graphicsVersion, penType, penDataFlags, penUnit;
int i;
diff --git a/cppcanvas/source/mtfrenderer/emfppen.hxx b/cppcanvas/source/mtfrenderer/emfppen.hxx
index d905f9da6f2c..d5abfa7e823c 100644
--- a/cppcanvas/source/mtfrenderer/emfppen.hxx
+++ b/cppcanvas/source/mtfrenderer/emfppen.hxx
@@ -60,11 +60,11 @@ namespace cppcanvas
virtual ~EMFPPen() override;
- void SetStrokeWidth(com::sun::star::rendering::StrokeAttributes& rStrokeAttributes, ImplRenderer& rR, const OutDevState& rState);
+ void SetStrokeWidth(com::sun::star::rendering::StrokeAttributes& rStrokeAttributes, ImplRenderer const & rR, const OutDevState& rState);
void SetStrokeAttributes(com::sun::star::rendering::StrokeAttributes& rStrokeAttributes);
- void Read(SvStream& s, ImplRenderer& rR);
+ void Read(SvStream& s, ImplRenderer const & rR);
static sal_Int8 lcl_convertStrokeCap(sal_uInt32 nEmfStroke);
static sal_Int8 lcl_convertLineJoinType(sal_uInt32 nEmfLineJoin);
diff --git a/drawinglayer/source/tools/emfpbrush.cxx b/drawinglayer/source/tools/emfpbrush.cxx
index 9cad339a567a..c6444631e1af 100644
--- a/drawinglayer/source/tools/emfpbrush.cxx
+++ b/drawinglayer/source/tools/emfpbrush.cxx
@@ -95,7 +95,7 @@ namespace emfplushelper
}
}
- void EMFPBrush::Read(SvStream& s, EmfPlusHelperData& rR)
+ void EMFPBrush::Read(SvStream& s, EmfPlusHelperData const & rR)
{
sal_uInt32 header;
diff --git a/drawinglayer/source/tools/emfpbrush.hxx b/drawinglayer/source/tools/emfpbrush.hxx
index 631fea642d9f..6a03f6f50e51 100644
--- a/drawinglayer/source/tools/emfpbrush.hxx
+++ b/drawinglayer/source/tools/emfpbrush.hxx
@@ -123,7 +123,7 @@ namespace emfplushelper
sal_uInt32 GetType() const { return type; }
const ::Color& GetColor() const { return solidColor; }
- void Read(SvStream& s, EmfPlusHelperData& rR);
+ void Read(SvStream& s, EmfPlusHelperData const & rR);
};
}
diff --git a/drawinglayer/source/tools/emfpcustomlinecap.cxx b/drawinglayer/source/tools/emfpcustomlinecap.cxx
index 5543b94b775c..4357276a18f8 100644
--- a/drawinglayer/source/tools/emfpcustomlinecap.cxx
+++ b/drawinglayer/source/tools/emfpcustomlinecap.cxx
@@ -69,7 +69,7 @@ namespace emfplushelper
aAttributes.MiterLimit = miterLimit;
}
- void EMFPCustomLineCap::ReadPath(SvStream& s, EmfPlusHelperData& rR, bool bFill)
+ void EMFPCustomLineCap::ReadPath(SvStream& s, EmfPlusHelperData const & rR, bool bFill)
{
sal_Int32 pathLength;
s.ReadInt32(pathLength);
@@ -92,7 +92,7 @@ namespace emfplushelper
polygon.transform(aMatrix);
};
- void EMFPCustomLineCap::Read(SvStream& s, EmfPlusHelperData& rR)
+ void EMFPCustomLineCap::Read(SvStream& s, EmfPlusHelperData const & rR)
{
sal_uInt32 header;
s.ReadUInt32(header).ReadUInt32(type);
diff --git a/drawinglayer/source/tools/emfpcustomlinecap.hxx b/drawinglayer/source/tools/emfpcustomlinecap.hxx
index f50d0f63bc98..4fb5b459df87 100644
--- a/drawinglayer/source/tools/emfpcustomlinecap.hxx
+++ b/drawinglayer/source/tools/emfpcustomlinecap.hxx
@@ -35,8 +35,8 @@ namespace emfplushelper
EMFPCustomLineCap();
void SetAttributes(com::sun::star::rendering::StrokeAttributes& aAttributes);
- void ReadPath(SvStream& s, EmfPlusHelperData& rR, bool bFill);
- void Read(SvStream& s, EmfPlusHelperData& rR);
+ void ReadPath(SvStream& s, EmfPlusHelperData const & rR, bool bFill);
+ void Read(SvStream& s, EmfPlusHelperData const & rR);
};
}
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index a68297493cb0..ebce2fbbd411 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -697,7 +697,7 @@ namespace emfplushelper
{
}
- void EmfPlusHelperData::combineClip(int combineMode, ::basegfx::B2DPolyPolygon& polygon)
+ void EmfPlusHelperData::combineClip(int combineMode, ::basegfx::B2DPolyPolygon const & polygon)
{
switch (combineMode)
{
diff --git a/drawinglayer/source/tools/emfphelperdata.hxx b/drawinglayer/source/tools/emfphelperdata.hxx
index 253b1de711fc..516a8e4e6a3f 100644
--- a/drawinglayer/source/tools/emfphelperdata.hxx
+++ b/drawinglayer/source/tools/emfphelperdata.hxx
@@ -242,7 +242,7 @@ namespace emfplushelper
// helper functions
::basegfx::BColor EMFPGetBrushColorOrARGBColor(sal_uInt16 flags, sal_uInt32 brushIndexOrColor) const;
- void combineClip(int combineMode, ::basegfx::B2DPolyPolygon& polygon);
+ void combineClip(int combineMode, ::basegfx::B2DPolyPolygon const & polygon);
public:
EmfPlusHelperData(
diff --git a/drawinglayer/source/tools/emfppath.cxx b/drawinglayer/source/tools/emfppath.cxx
index 18b3ddca9dd5..00245d523123 100644
--- a/drawinglayer/source/tools/emfppath.cxx
+++ b/drawinglayer/source/tools/emfppath.cxx
@@ -111,7 +111,7 @@ namespace emfplushelper
#endif
}
- ::basegfx::B2DPolyPolygon& EMFPPath::GetPolygon (EmfPlusHelperData& rR, bool bMapIt, bool bAddLineToCloseShape)
+ ::basegfx::B2DPolyPolygon& EMFPPath::GetPolygon (EmfPlusHelperData const & rR, bool bMapIt, bool bAddLineToCloseShape)
{
::basegfx::B2DPolygon polygon;
aPolygon.clear ();
diff --git a/drawinglayer/source/tools/emfppath.hxx b/drawinglayer/source/tools/emfppath.hxx
index 1b10816bb7c8..81bdcc406a13 100644
--- a/drawinglayer/source/tools/emfppath.hxx
+++ b/drawinglayer/source/tools/emfppath.hxx
@@ -39,7 +39,7 @@ namespace emfplushelper
// TODO: remove rR argument when debug code is no longer needed
void Read(SvStream& s, sal_uInt32 pathFlags, EmfPlusHelperData const & rR);
- ::basegfx::B2DPolyPolygon& GetPolygon(EmfPlusHelperData& rR, bool bMapIt = true, bool bAddLineToCloseShape = false);
+ ::basegfx::B2DPolyPolygon& GetPolygon(EmfPlusHelperData const & rR, bool bMapIt = true, bool bAddLineToCloseShape = false);
};
}
diff --git a/drawinglayer/source/tools/emfppen.cxx b/drawinglayer/source/tools/emfppen.cxx
index 61445f126643..ac9d63a202d9 100644
--- a/drawinglayer/source/tools/emfppen.cxx
+++ b/drawinglayer/source/tools/emfppen.cxx
@@ -86,7 +86,7 @@ namespace emfplushelper
delete customEndCap;
}
- void EMFPPen::SetStrokeWidth(rendering::StrokeAttributes& rStrokeAttributes, EmfPlusHelperData& rR, const ::basegfx::B2DHomMatrix& mapModeTransform)
+ void EMFPPen::SetStrokeWidth(rendering::StrokeAttributes& rStrokeAttributes, EmfPlusHelperData const & rR, const ::basegfx::B2DHomMatrix& mapModeTransform)
{
// If a zero width is specified, a minimum value is used, which is determined by the units.
//TODO Add support for other units than Pixel
@@ -162,7 +162,7 @@ namespace emfplushelper
}
}
- void EMFPPen::Read(SvStream& s, EmfPlusHelperData& rR)
+ void EMFPPen::Read(SvStream& s, EmfPlusHelperData const & rR)
{
sal_uInt32 graphicsVersion, penType;
int i;
diff --git a/drawinglayer/source/tools/emfppen.hxx b/drawinglayer/source/tools/emfppen.hxx
index 12115ad5b089..d3087bdd5412 100644
--- a/drawinglayer/source/tools/emfppen.hxx
+++ b/drawinglayer/source/tools/emfppen.hxx
@@ -68,11 +68,11 @@ namespace emfplushelper
virtual ~EMFPPen() override;
- void SetStrokeWidth(com::sun::star::rendering::StrokeAttributes& rStrokeAttributes, EmfPlusHelperData& rR, const ::basegfx::B2DHomMatrix& mapModeTransform);
+ void SetStrokeWidth(com::sun::star::rendering::StrokeAttributes& rStrokeAttributes, EmfPlusHelperData const & rR, const ::basegfx::B2DHomMatrix& mapModeTransform);
void SetStrokeAttributes(com::sun::star::rendering::StrokeAttributes& rStrokeAttributes);
- void Read(SvStream& s, EmfPlusHelperData& rR);
+ void Read(SvStream& s, EmfPlusHelperData const & rR);
static sal_Int8 lcl_convertStrokeCap(sal_uInt32 nEmfStroke);
static sal_Int8 lcl_convertLineJoinType(sal_uInt32 nEmfLineJoin);
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index b9b4b551ff88..d3f79e6c3712 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -145,7 +145,7 @@ bool lockFile( sal_uInt64 const nStart, sal_uInt64 const nEnd, SvFileStream* pSt
return true;
}
-void unlockFile( sal_uInt64 const nStart, sal_uInt64 const nEnd, SvFileStream * pStream )
+void unlockFile( sal_uInt64 const nStart, sal_uInt64 const nEnd, SvFileStream const * pStream )
{
osl::MutexGuard aGuard( LockMutex::get() );
std::vector<InternalStreamLock> &rLockList = LockList::get();
More information about the Libreoffice-commits
mailing list