include/vcl/devicecoordinate.hxx | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 5e218b5c51f7d9cd10bd9db832879efca41b9c75
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jan 12 21:19:32 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jan 13 18:31:35 2022 +0100
always use B2DPoint for DevicePoint
Change-Id: If75c3448776743f1b9efbf84a487cfc0c75364ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128365
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/devicecoordinate.hxx b/include/vcl/devicecoordinate.hxx
index 708cb6ead0e3..215f0ca74975 100644
--- a/include/vcl/devicecoordinate.hxx
+++ b/include/vcl/devicecoordinate.hxx
@@ -7,24 +7,21 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_DEVICE_COORDINATE_HXX
-#define INCLUDED_VCL_DEVICE_COORDINATE_HXX
+#pragma once
#include <config_vcl.h>
-#if VCL_FLOAT_DEVICE_PIXEL
#include <basegfx/point/b2dpoint.hxx>
-typedef double DeviceCoordinate;
typedef basegfx::B2DPoint DevicePoint;
+#if VCL_FLOAT_DEVICE_PIXEL
+
+typedef double DeviceCoordinate;
+
#else /* !VCL_FLOAT_DEVICE_PIXEL */
-#include <basegfx/point/b2ipoint.hxx>
typedef sal_Int32 DeviceCoordinate;
-typedef basegfx::B2IPoint DevicePoint;
#endif /* ! Carpet Cushion */
-#endif /* NDef INCLUDED_VCL_DEVICE_COORDINATE_HXX */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
