Kaydet (Commit) 84b1fab6 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:constparams in cppcanvas,drawinglayer

Change-Id: I15cac1411c985afe8d7cb9439214a8092702bdb8
Reviewed-on: https://gerrit.libreoffice.org/44343Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst de05d4ee
...@@ -89,7 +89,7 @@ namespace cppcanvas ...@@ -89,7 +89,7 @@ namespace cppcanvas
} }
} }
void EMFPBrush::Read(SvStream& s, ImplRenderer& rR) void EMFPBrush::Read(SvStream& s, ImplRenderer const & rR)
{ {
sal_uInt32 header; sal_uInt32 header;
......
...@@ -121,7 +121,7 @@ namespace cppcanvas ...@@ -121,7 +121,7 @@ namespace cppcanvas
sal_uInt32 GetType() const { return type; } sal_uInt32 GetType() const { return type; }
const ::Color& GetColor() const { return solidColor; } const ::Color& GetColor() const { return solidColor; }
void Read(SvStream& s, ImplRenderer& rR); void Read(SvStream& s, ImplRenderer const & rR);
}; };
} }
} }
......
...@@ -74,7 +74,7 @@ namespace cppcanvas ...@@ -74,7 +74,7 @@ namespace cppcanvas
aAttributes.MiterLimit = miterLimit; 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; sal_Int32 pathLength;
s.ReadInt32(pathLength); s.ReadInt32(pathLength);
...@@ -101,7 +101,7 @@ namespace cppcanvas ...@@ -101,7 +101,7 @@ namespace cppcanvas
polygon.transform(aMatrix); polygon.transform(aMatrix);
}; };
void EMFPCustomLineCap::Read(SvStream& s, ImplRenderer& rR) void EMFPCustomLineCap::Read(SvStream& s, ImplRenderer const & rR)
{ {
sal_uInt32 header; sal_uInt32 header;
......
...@@ -35,8 +35,8 @@ namespace cppcanvas ...@@ -35,8 +35,8 @@ namespace cppcanvas
EMFPCustomLineCap(); EMFPCustomLineCap();
void SetAttributes(com::sun::star::rendering::StrokeAttributes& aAttributes); void SetAttributes(com::sun::star::rendering::StrokeAttributes& aAttributes);
void ReadPath(SvStream& s, ImplRenderer& rR, bool bFill); void ReadPath(SvStream& s, ImplRenderer const & rR, bool bFill);
void Read(SvStream& s, ImplRenderer& rR); void Read(SvStream& s, ImplRenderer const & rR);
}; };
} }
} }
......
...@@ -102,7 +102,7 @@ namespace cppcanvas ...@@ -102,7 +102,7 @@ namespace cppcanvas
#endif #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; ::basegfx::B2DPolygon polygon;
......
...@@ -40,7 +40,7 @@ namespace cppcanvas ...@@ -40,7 +40,7 @@ namespace cppcanvas
// TODO: remove rR argument when debug code is no longer needed // TODO: remove rR argument when debug code is no longer needed
void Read(SvStream& s, sal_uInt32 pathFlags, ImplRenderer const & rR); 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);
}; };
} }
} }
......
...@@ -95,7 +95,7 @@ namespace cppcanvas ...@@ -95,7 +95,7 @@ namespace cppcanvas
delete customEndCap; 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. // 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 //TODO Add support for other units than Pixel
...@@ -169,7 +169,7 @@ namespace cppcanvas ...@@ -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; sal_uInt32 graphicsVersion, penType, penDataFlags, penUnit;
int i; int i;
......
...@@ -60,11 +60,11 @@ namespace cppcanvas ...@@ -60,11 +60,11 @@ namespace cppcanvas
virtual ~EMFPPen() override; 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 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_convertStrokeCap(sal_uInt32 nEmfStroke);
static sal_Int8 lcl_convertLineJoinType(sal_uInt32 nEmfLineJoin); static sal_Int8 lcl_convertLineJoinType(sal_uInt32 nEmfLineJoin);
......
...@@ -95,7 +95,7 @@ namespace emfplushelper ...@@ -95,7 +95,7 @@ namespace emfplushelper
} }
} }
void EMFPBrush::Read(SvStream& s, EmfPlusHelperData& rR) void EMFPBrush::Read(SvStream& s, EmfPlusHelperData const & rR)
{ {
sal_uInt32 header; sal_uInt32 header;
......
...@@ -123,7 +123,7 @@ namespace emfplushelper ...@@ -123,7 +123,7 @@ namespace emfplushelper
sal_uInt32 GetType() const { return type; } sal_uInt32 GetType() const { return type; }
const ::Color& GetColor() const { return solidColor; } const ::Color& GetColor() const { return solidColor; }
void Read(SvStream& s, EmfPlusHelperData& rR); void Read(SvStream& s, EmfPlusHelperData const & rR);
}; };
} }
......
...@@ -69,7 +69,7 @@ namespace emfplushelper ...@@ -69,7 +69,7 @@ namespace emfplushelper
aAttributes.MiterLimit = miterLimit; 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; sal_Int32 pathLength;
s.ReadInt32(pathLength); s.ReadInt32(pathLength);
...@@ -92,7 +92,7 @@ namespace emfplushelper ...@@ -92,7 +92,7 @@ namespace emfplushelper
polygon.transform(aMatrix); polygon.transform(aMatrix);
}; };
void EMFPCustomLineCap::Read(SvStream& s, EmfPlusHelperData& rR) void EMFPCustomLineCap::Read(SvStream& s, EmfPlusHelperData const & rR)
{ {
sal_uInt32 header; sal_uInt32 header;
s.ReadUInt32(header).ReadUInt32(type); s.ReadUInt32(header).ReadUInt32(type);
......
...@@ -35,8 +35,8 @@ namespace emfplushelper ...@@ -35,8 +35,8 @@ namespace emfplushelper
EMFPCustomLineCap(); EMFPCustomLineCap();
void SetAttributes(com::sun::star::rendering::StrokeAttributes& aAttributes); void SetAttributes(com::sun::star::rendering::StrokeAttributes& aAttributes);
void ReadPath(SvStream& s, EmfPlusHelperData& rR, bool bFill); void ReadPath(SvStream& s, EmfPlusHelperData const & rR, bool bFill);
void Read(SvStream& s, EmfPlusHelperData& rR); void Read(SvStream& s, EmfPlusHelperData const & rR);
}; };
} }
......
...@@ -697,7 +697,7 @@ namespace emfplushelper ...@@ -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) switch (combineMode)
{ {
......
...@@ -242,7 +242,7 @@ namespace emfplushelper ...@@ -242,7 +242,7 @@ namespace emfplushelper
// helper functions // helper functions
::basegfx::BColor EMFPGetBrushColorOrARGBColor(sal_uInt16 flags, sal_uInt32 brushIndexOrColor) const; ::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: public:
EmfPlusHelperData( EmfPlusHelperData(
......
...@@ -111,7 +111,7 @@ namespace emfplushelper ...@@ -111,7 +111,7 @@ namespace emfplushelper
#endif #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; ::basegfx::B2DPolygon polygon;
aPolygon.clear (); aPolygon.clear ();
......
...@@ -39,7 +39,7 @@ namespace emfplushelper ...@@ -39,7 +39,7 @@ namespace emfplushelper
// TODO: remove rR argument when debug code is no longer needed // TODO: remove rR argument when debug code is no longer needed
void Read(SvStream& s, sal_uInt32 pathFlags, EmfPlusHelperData const & rR); 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);
}; };
} }
......
...@@ -86,7 +86,7 @@ namespace emfplushelper ...@@ -86,7 +86,7 @@ namespace emfplushelper
delete customEndCap; 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. // 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 //TODO Add support for other units than Pixel
...@@ -162,7 +162,7 @@ namespace emfplushelper ...@@ -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; sal_uInt32 graphicsVersion, penType;
int i; int i;
......
...@@ -68,11 +68,11 @@ namespace emfplushelper ...@@ -68,11 +68,11 @@ namespace emfplushelper
virtual ~EMFPPen() override; 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 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_convertStrokeCap(sal_uInt32 nEmfStroke);
static sal_Int8 lcl_convertLineJoinType(sal_uInt32 nEmfLineJoin); static sal_Int8 lcl_convertLineJoinType(sal_uInt32 nEmfLineJoin);
......
...@@ -145,7 +145,7 @@ bool lockFile( sal_uInt64 const nStart, sal_uInt64 const nEnd, SvFileStream* pSt ...@@ -145,7 +145,7 @@ bool lockFile( sal_uInt64 const nStart, sal_uInt64 const nEnd, SvFileStream* pSt
return true; 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() ); osl::MutexGuard aGuard( LockMutex::get() );
std::vector<InternalStreamLock> &rLockList = LockList::get(); std::vector<InternalStreamLock> &rLockList = LockList::get();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment