Use DeviceCorrdinate for DXArray in FillDXArray and ImplLayoutArgs

Change-Id: Ifba7104a13cf737200c81d1a1bd5ece9a29da60e

2 files changed, 32 insertions, 3 deletions

diff --git a/include/vcl/devicecoordinate.hxx b/include/vcl/devicecoordinate.hxx
new file mode 100644
index 000000000000..bcc2bb2255b8
--- /dev/null
+++ b/include/vcl/devicecoordinate.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_DEVICE_COORDINATE_HXX
+#define INCLUDED_VCL_DEVICE_COORDINATE_HXX
+
+#include <config_vcl.h>
+
+#if VCL_FLOAT_DEVICE_PIXEL
+#include <basegfx/point/b2dpoint.hxx>
+typedef double DeviceCoordinate;
+typedef ::basegfx::B2DPoint DevicePoint;
+
+#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: */
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index f251db3da6e5..d59067a43177 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -20,14 +20,13 @@
 #ifndef INCLUDED_VCL_OUTDEV_HXX
 #define INCLUDED_VCL_OUTDEV_HXX
 
-#include <config_vcl.h>
-
 #include <tools/gen.hxx>
 #include <tools/solar.h>
 #include <tools/rc.hxx>
 #include <tools/color.hxx>
 #include <tools/poly.hxx>
 
+#include <vcl/devicecoordinate.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
 #include <vcl/region.hxx>
@@ -1250,7 +1249,7 @@ public:
                                             const Point& rLogicPos = Point(0,0), long nLogicWidth=0,
                                             const sal_Int32* pLogicDXArray=NULL, int flags=0 ) const;
     SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( OUString&, const sal_Int32 nIndex, const sal_Int32 nLen,
-                                                         long nPixelWidth, const sal_Int32* pPixelDXArray, int flags = 0 ) const;
+                                                         DeviceCoordinate nPixelWidth, const DeviceCoordinate* pPixelDXArray, int flags = 0 ) const;
     SAL_DLLPRIVATE SalLayout*   ImplGlyphFallbackLayout( SalLayout*, ImplLayoutArgs& ) const;
     // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI
     SAL_DLLPRIVATE SalLayout*   getFallbackFont(ImplFontEntry &rFallbackFont,