summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-06-02 21:04:29 +0200
committerMiklos Vajna <vmiklos@collabora.com>2020-06-03 09:07:15 +0200
commit2276f0b80552d9f7ba70e1273600d47b1693eb24 (patch)
tree98d4d6e709610fcf80835ab93245b1bca00002c8
parenta68e4fcbcfb7c78c6247d24ecb141e1d87d7c46e (diff)
writerfilter: mark these as const to make it explicit they return a copy
I.e. move / scale doesn't modify the wrap polygon, it returns a modified copy. Change-Id: Ic0b23a1c9de0ce90032656351d9744dace2ef4e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95384 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--writerfilter/source/dmapper/WrapPolygonHandler.cxx22
-rw-r--r--writerfilter/source/dmapper/WrapPolygonHandler.hxx14
2 files changed, 18 insertions, 18 deletions
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index 0eec61089e2d..c67ed2ab7020 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -48,22 +48,22 @@ void WrapPolygon::addPoint(const awt::Point & rPoint)
mPoints.push_back(rPoint);
}
-WrapPolygon::Points_t::iterator WrapPolygon::begin()
+WrapPolygon::Points_t::const_iterator WrapPolygon::begin() const
{
return mPoints.begin();
}
-WrapPolygon::Points_t::iterator WrapPolygon::end()
+WrapPolygon::Points_t::const_iterator WrapPolygon::end() const
{
return mPoints.end();
}
-WrapPolygon::Pointer_t WrapPolygon::move(const awt::Point & rPoint)
+WrapPolygon::Pointer_t WrapPolygon::move(const awt::Point & rPoint) const
{
WrapPolygon::Pointer_t pResult(new WrapPolygon);
- Points_t::iterator aIt = begin();
- Points_t::iterator aItEnd = end();
+ Points_t::const_iterator aIt = begin();
+ Points_t::const_iterator aItEnd = end();
while (aIt != aItEnd)
{
@@ -75,12 +75,12 @@ WrapPolygon::Pointer_t WrapPolygon::move(const awt::Point & rPoint)
return pResult;
}
-WrapPolygon::Pointer_t WrapPolygon::scale(const Fraction & rFractionX, const Fraction & rFractionY)
+WrapPolygon::Pointer_t WrapPolygon::scale(const Fraction & rFractionX, const Fraction & rFractionY) const
{
WrapPolygon::Pointer_t pResult(new WrapPolygon);
- Points_t::iterator aIt = begin();
- Points_t::iterator aItEnd = end();
+ Points_t::const_iterator aIt = begin();
+ Points_t::const_iterator aItEnd = end();
while (aIt != aItEnd)
{
@@ -92,7 +92,7 @@ WrapPolygon::Pointer_t WrapPolygon::scale(const Fraction & rFractionX, const Fra
return pResult;
}
-WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSrcSize)
+WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSrcSize) const
{
WrapPolygon::Pointer_t pResult;
@@ -114,7 +114,7 @@ WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSr
return pResult;
}
-WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygonPixel(const awt::Size & rSrcSize)
+WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygonPixel(const awt::Size & rSrcSize) const
{
WrapPolygon::Pointer_t pResult;
@@ -138,7 +138,7 @@ WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygonPixel(const awt::Size
}
WrapPolygon::Pointer_t WrapPolygon::correctCrop(const awt::Size& rGraphicSize,
- const text::GraphicCrop& rGraphicCrop)
+ const text::GraphicCrop& rGraphicCrop) const
{
WrapPolygon::Pointer_t pResult;
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index e9e58dc0907b..6418496fd643 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -49,15 +49,15 @@ public:
void addPoint(const css::awt::Point & rPoint);
- Points_t::iterator begin();
- Points_t::iterator end();
+ Points_t::const_iterator begin() const;
+ Points_t::const_iterator end() const;
- WrapPolygon::Pointer_t move(const css::awt::Point & rMove);
- WrapPolygon::Pointer_t scale(const Fraction & rFractionX, const Fraction & rFractionY);
- WrapPolygon::Pointer_t correctWordWrapPolygon(const css::awt::Size & rSrcSize);
- WrapPolygon::Pointer_t correctWordWrapPolygonPixel(const css::awt::Size & rSrcSize);
+ WrapPolygon::Pointer_t move(const css::awt::Point & rMove) const;
+ WrapPolygon::Pointer_t scale(const Fraction & rFractionX, const Fraction & rFractionY) const;
+ WrapPolygon::Pointer_t correctWordWrapPolygon(const css::awt::Size & rSrcSize) const;
+ WrapPolygon::Pointer_t correctWordWrapPolygonPixel(const css::awt::Size & rSrcSize) const;
WrapPolygon::Pointer_t correctCrop(const css::awt::Size& rGraphicSize,
- const css::text::GraphicCrop& rGraphicCrop);
+ const css::text::GraphicCrop& rGraphicCrop) const;
css::drawing::PointSequenceSequence getPointSequenceSequence() const;
};