[Libreoffice-commits] core.git: include/vcl
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 8 10:26:39 UTC 2021
include/vcl/outdev.hxx | 129 +++++++++++++++++++++++--------------------------
1 file changed, 63 insertions(+), 66 deletions(-)
New commits:
commit 19e0c59a722dca6cd8b6ca61ed421c34c2773d18
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 8 10:05:34 2021 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 8 12:26:05 2021 +0200
annotate LogicToPixel etc with SAL_WARN_UNUSED_RESULT
Change-Id: Id5e58e6350f463817159642d30733f0b7e43a44a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118607
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index eb3c7815450a..fce10e1ef077 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1603,75 +1603,72 @@ public:
@return the current offset in pixel
*/
- Size GetPixelOffset() const { return Size(mnOutOffOrigX, mnOutOffOrigY);}
-
- Point LogicToPixel( const Point& rLogicPt ) const;
- Size LogicToPixel( const Size& rLogicSize ) const;
- tools::Rectangle LogicToPixel( const tools::Rectangle& rLogicRect ) const;
- tools::Polygon LogicToPixel( const tools::Polygon& rLogicPoly ) const;
- tools::PolyPolygon LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly ) const;
- basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const;
- vcl::Region LogicToPixel( const vcl::Region& rLogicRegion )const;
- Point LogicToPixel( const Point& rLogicPt,
- const MapMode& rMapMode ) const;
- Size LogicToPixel( const Size& rLogicSize,
- const MapMode& rMapMode ) const;
- tools::Rectangle LogicToPixel( const tools::Rectangle& rLogicRect,
- const MapMode& rMapMode ) const;
- tools::Polygon LogicToPixel( const tools::Polygon& rLogicPoly,
- const MapMode& rMapMode ) const;
- basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly,
- const MapMode& rMapMode ) const;
-
- Point PixelToLogic( const Point& rDevicePt ) const;
- Size PixelToLogic( const Size& rDeviceSize ) const;
- tools::Rectangle PixelToLogic( const tools::Rectangle& rDeviceRect ) const;
- tools::Polygon PixelToLogic( const tools::Polygon& rDevicePoly ) const;
- tools::PolyPolygon PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly ) const;
- basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly ) const;
- vcl::Region PixelToLogic( const vcl::Region& rDeviceRegion ) const;
- Point PixelToLogic( const Point& rDevicePt,
- const MapMode& rMapMode ) const;
- Size PixelToLogic( const Size& rDeviceSize,
- const MapMode& rMapMode ) const;
- tools::Rectangle PixelToLogic( const tools::Rectangle& rDeviceRect,
- const MapMode& rMapMode ) const;
- tools::Polygon PixelToLogic( const tools::Polygon& rDevicePoly,
- const MapMode& rMapMode ) const;
- basegfx::B2DPolygon PixelToLogic( const basegfx::B2DPolygon& rDevicePoly,
- const MapMode& rMapMode ) const;
- basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly,
- const MapMode& rMapMode ) const;
-
- Point LogicToLogic( const Point& rPtSource,
- const MapMode* pMapModeSource,
- const MapMode* pMapModeDest ) const;
- Size LogicToLogic( const Size& rSzSource,
- const MapMode* pMapModeSource,
- const MapMode* pMapModeDest ) const;
- tools::Rectangle LogicToLogic( const tools::Rectangle& rRectSource,
- const MapMode* pMapModeSource,
- const MapMode* pMapModeDest ) const;
- static Point LogicToLogic( const Point& rPtSource,
- const MapMode& rMapModeSource,
- const MapMode& rMapModeDest );
- static Size LogicToLogic( const Size& rSzSource,
- const MapMode& rMapModeSource,
- const MapMode& rMapModeDest );
- static tools::Rectangle LogicToLogic( const tools::Rectangle& rRectSource,
- const MapMode& rMapModeSource,
- const MapMode& rMapModeDest );
- static tools::Long LogicToLogic( tools::Long nLongSource,
- MapUnit eUnitSource,
- MapUnit eUnitDest );
-
- static basegfx::B2DPolygon LogicToLogic( const basegfx::B2DPolygon& rPoly,
- const MapMode& rMapModeSource,
- const MapMode& rMapModeDest );
+ SAL_WARN_UNUSED_RESULT Size GetPixelOffset() const { return Size(mnOutOffOrigX, mnOutOffOrigY);}
+
+ SAL_WARN_UNUSED_RESULT Point LogicToPixel(const Point& rLogicPt) const;
+ SAL_WARN_UNUSED_RESULT Size LogicToPixel(const Size& rLogicSize) const;
+ SAL_WARN_UNUSED_RESULT tools::Rectangle LogicToPixel(const tools::Rectangle& rLogicRect) const;
+ SAL_WARN_UNUSED_RESULT tools::Polygon LogicToPixel(const tools::Polygon& rLogicPoly) const;
+ SAL_WARN_UNUSED_RESULT tools::PolyPolygon LogicToPixel(const tools::PolyPolygon& rLogicPolyPoly) const;
+ SAL_WARN_UNUSED_RESULT basegfx::B2DPolyPolygon LogicToPixel(const basegfx::B2DPolyPolygon& rLogicPolyPoly) const;
+ SAL_WARN_UNUSED_RESULT vcl::Region LogicToPixel(const vcl::Region& rLogicRegion)const;
+ SAL_WARN_UNUSED_RESULT Point LogicToPixel(const Point& rLogicPt, const MapMode& rMapMode) const;
+ SAL_WARN_UNUSED_RESULT Size LogicToPixel(const Size& rLogicSize, const MapMode& rMapMode) const;
+ SAL_WARN_UNUSED_RESULT tools::Rectangle LogicToPixel(const tools::Rectangle& rLogicRect,
+ const MapMode& rMapMode) const;
+ SAL_WARN_UNUSED_RESULT tools::Polygon LogicToPixel(const tools::Polygon& rLogicPoly,
+ const MapMode& rMapMode) const;
+ SAL_WARN_UNUSED_RESULT basegfx::B2DPolyPolygon LogicToPixel(const basegfx::B2DPolyPolygon& rLogicPolyPoly,
+ const MapMode& rMapMode) const;
+
+ SAL_WARN_UNUSED_RESULT Point PixelToLogic(const Point& rDevicePt) const;
+ SAL_WARN_UNUSED_RESULT Size PixelToLogic(const Size& rDeviceSize) const;
+ SAL_WARN_UNUSED_RESULT tools::Rectangle PixelToLogic(const tools::Rectangle& rDeviceRect) const;
+ SAL_WARN_UNUSED_RESULT tools::Polygon PixelToLogic(const tools::Polygon& rDevicePoly) const;
+ SAL_WARN_UNUSED_RESULT tools::PolyPolygon PixelToLogic(const tools::PolyPolygon& rDevicePolyPoly) const;
+ SAL_WARN_UNUSED_RESULT basegfx::B2DPolyPolygon PixelToLogic(const basegfx::B2DPolyPolygon& rDevicePolyPoly) const;
+ SAL_WARN_UNUSED_RESULT vcl::Region PixelToLogic(const vcl::Region& rDeviceRegion) const;
+ SAL_WARN_UNUSED_RESULT Point PixelToLogic(const Point& rDevicePt, const MapMode& rMapMode) const;
+ SAL_WARN_UNUSED_RESULT Size PixelToLogic(const Size& rDeviceSize, const MapMode& rMapMode) const;
+ SAL_WARN_UNUSED_RESULT tools::Rectangle PixelToLogic(const tools::Rectangle& rDeviceRect,
+ const MapMode& rMapMode) const;
+ SAL_WARN_UNUSED_RESULT tools::Polygon PixelToLogic(const tools::Polygon& rDevicePoly,
+ const MapMode& rMapMode) const;
+ SAL_WARN_UNUSED_RESULT basegfx::B2DPolygon PixelToLogic(const basegfx::B2DPolygon& rDevicePoly,
+ const MapMode& rMapMode) const;
+ SAL_WARN_UNUSED_RESULT basegfx::B2DPolyPolygon PixelToLogic(const basegfx::B2DPolyPolygon& rDevicePolyPoly,
+ const MapMode& rMapMode) const;
+
+ SAL_WARN_UNUSED_RESULT Point LogicToLogic(const Point& rPtSource,
+ const MapMode* pMapModeSource,
+ const MapMode* pMapModeDest) const;
+ SAL_WARN_UNUSED_RESULT Size LogicToLogic(const Size& rSzSource,
+ const MapMode* pMapModeSource,
+ const MapMode* pMapModeDest) const;
+ SAL_WARN_UNUSED_RESULT tools::Rectangle LogicToLogic(const tools::Rectangle& rRectSource,
+ const MapMode* pMapModeSource,
+ const MapMode* pMapModeDest) const;
+ SAL_WARN_UNUSED_RESULT static Point LogicToLogic(const Point& rPtSource,
+ const MapMode& rMapModeSource,
+ const MapMode& rMapModeDest);
+ SAL_WARN_UNUSED_RESULT static Size LogicToLogic(const Size& rSzSource,
+ const MapMode& rMapModeSource,
+ const MapMode& rMapModeDest);
+ SAL_WARN_UNUSED_RESULT static tools::Rectangle LogicToLogic(const tools::Rectangle& rRectSource,
+ const MapMode& rMapModeSource,
+ const MapMode& rMapModeDest);
+ SAL_WARN_UNUSED_RESULT static tools::Long LogicToLogic(tools::Long nLongSource,
+ MapUnit eUnitSource,
+ MapUnit eUnitDest);
+
+ SAL_WARN_UNUSED_RESULT static basegfx::B2DPolygon LogicToLogic(const basegfx::B2DPolygon& rPoly,
+ const MapMode& rMapModeSource,
+ const MapMode& rMapModeDest);
// create a mapping transformation from rMapModeSource to rMapModeDest (the above methods
// for B2DPoly/Polygons use this internally anyway to transform the B2DPolygon)
- static basegfx::B2DHomMatrix LogicToLogic(const MapMode& rMapModeSource, const MapMode& rMapModeDest);
+ SAL_WARN_UNUSED_RESULT static basegfx::B2DHomMatrix LogicToLogic(const MapMode& rMapModeSource,
+ const MapMode& rMapModeDest);
/** Convert a logical rectangle to a rectangle in physical device pixel units.
More information about the Libreoffice-commits
mailing list