diff options
| -rw-r--r-- | compilerplugins/clang/store/fpcomparison.cxx | 8 | ||||
| -rw-r--r-- | config_host/config_vcl.h.in | 14 | ||||
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | include/vcl/devicecoordinate.hxx | 12 |
4 files changed, 2 insertions, 51 deletions
diff --git a/compilerplugins/clang/store/fpcomparison.cxx b/compilerplugins/clang/store/fpcomparison.cxx index faaec0110fa5..84d0aaee545b 100644 --- a/compilerplugins/clang/store/fpcomparison.cxx +++ b/compilerplugins/clang/store/fpcomparison.cxx @@ -31,8 +31,6 @@ public: virtual void run() override { - vclFloatDevicePixel = compiler.getPreprocessor() - .getIdentifierInfo("VCL_FLOAT_DEVICE_PIXEL")->hasMacroDefinition(); TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } @@ -43,7 +41,6 @@ private: bool ignore(FunctionDecl* ); enum class EState { None, TraverseProcess, TraverseIgnore }; EState meState = EState::None; - bool vclFloatDevicePixel; }; bool FpComparison::TraverseFunctionDecl(FunctionDecl* function) @@ -323,9 +320,8 @@ bool FpComparison::ignore(FunctionDecl* function) || dc.Function("testPlotAreaManualLayoutXLSX").Class("Chart2ExportTest").GlobalNamespace() || dc.Function("testLegendManualLayoutXLSX").Class("Chart2ExportTest").GlobalNamespace() || dc.Function("SetScreenNumber").Class("AquaSalFrame").GlobalNamespace() - || (vclFloatDevicePixel - && (dc.Function("Justify").Class("GenericSalLayout").GlobalNamespace() - || dc.Function("AdjustLayout").Class("MultiSalLayout").GlobalNamespace())) + || dc.Function("Justify").Class("GenericSalLayout").GlobalNamespace() + || dc.Function("AdjustLayout").Class("MultiSalLayout").GlobalNamespace() // vcl/headless/svpgdi.cxx, ba4a124b0c0c66fd275f5147d55eeec27ce78da9: || dc.Function("drawAlphaBitmap").Class("SvpSalGraphics").GlobalNamespace() || dc.Function("drawMask").Class("SvpSalGraphics").GlobalNamespace() diff --git a/config_host/config_vcl.h.in b/config_host/config_vcl.h.in deleted file mode 100644 index 81419d2c0ded..000000000000 --- a/config_host/config_vcl.h.in +++ /dev/null @@ -1,14 +0,0 @@ -/* - -Settings about vcl -*/ - -#ifndef CONFIG_VCL_H -#define CONFIG_VCL_H - -/* Nature of the device pixel coordinate system. - * We either use long or double for coordinates. - */ -#define VCL_FLOAT_DEVICE_PIXEL 0 - -#endif diff --git a/configure.ac b/configure.ac index 3ffb5fd42613..3dea1ce2bd47 100644 --- a/configure.ac +++ b/configure.ac @@ -2076,11 +2076,6 @@ AC_ARG_ENABLE(customtarget-components, AS_HELP_STRING([--enable-customtarget-components], [Generates the static UNO object constructor mapping from the build.])) -AC_ARG_ENABLE(float_device_pixel, - AS_HELP_STRING([--enable-float-device-pixel], - [Uses doubles for VCL device coordinates instead of 32-bit integers.]), -,) - dnl =================================================================== dnl Optional Packages (--with/without-) dnl =================================================================== @@ -9287,7 +9282,6 @@ else AC_MSG_RESULT([yes]) ENABLE_FUZZERS="TRUE" AC_DEFINE([ENABLE_FUZZERS],1) - AC_DEFINE([VCL_FLOAT_DEVICE_PIXEL],1) BUILD_TYPE="$BUILD_TYPE FUZZERS" fi AC_SUBST(LIB_FUZZING_ENGINE) @@ -11674,18 +11668,6 @@ EPOXY_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/epoxy/include" libo_CHECK_SYSTEM_MODULE([epoxy], [EPOXY], [epoxy >= 1.2]) dnl =================================================================== -dnl Set vcl option: coordinate device in double or sal_Int32 -dnl =================================================================== - -AC_MSG_CHECKING([Type to use for Device Pixel coordinates]) -if test "$enable_float_device_pixel" = yes; then - AC_DEFINE(VCL_FLOAT_DEVICE_PIXEL) - AC_MSG_RESULT([double]) -else - AC_MSG_RESULT([sal_Int32]) -fi - -dnl =================================================================== dnl Show which vclplugs will be built. dnl =================================================================== R="" @@ -14991,7 +14973,6 @@ AC_CONFIG_HEADERS([config_host/config_skia.h]) AC_CONFIG_HEADERS([config_host/config_typesizes.h]) AC_CONFIG_HEADERS([config_host/config_validation.h]) AC_CONFIG_HEADERS([config_host/config_vendor.h]) -AC_CONFIG_HEADERS([config_host/config_vcl.h]) AC_CONFIG_HEADERS([config_host/config_vclplug.h]) AC_CONFIG_HEADERS([config_host/config_version.h]) AC_CONFIG_HEADERS([config_host/config_oauth2.h]) diff --git a/include/vcl/devicecoordinate.hxx b/include/vcl/devicecoordinate.hxx index 215f0ca74975..edc39a80258a 100644 --- a/include/vcl/devicecoordinate.hxx +++ b/include/vcl/devicecoordinate.hxx @@ -9,19 +9,7 @@ #pragma once -#include <config_vcl.h> - #include <basegfx/point/b2dpoint.hxx> typedef basegfx::B2DPoint DevicePoint; -#if VCL_FLOAT_DEVICE_PIXEL - -typedef double DeviceCoordinate; - -#else /* !VCL_FLOAT_DEVICE_PIXEL */ - -typedef sal_Int32 DeviceCoordinate; - -#endif /* ! Carpet Cushion */ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |