vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx | 4 ----
vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx | 7 -------
vcl/unx/generic/gdi/salgdi.cxx | 6 ------
3 files changed, 17 deletions(-)
New commits:
commit ae8c40abd2e1af063a4d199e4f198b3d78964f34
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jan 2 20:48:07 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jan 4 19:23:50 2023 +0000
always use X11CairoSalGraphicsImpl
Change-Id: I7971e17eb7eb9778fcc2d3e7c98028c6cd438004
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144971
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
index 0a1e8fe02200..874bf4bd4cf8 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
@@ -19,8 +19,6 @@
#include "X11CairoSalGraphicsImpl.hxx"
-#if ENABLE_CAIRO_CANVAS
-
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/curve/b2dcubicbezier.hxx>
@@ -159,6 +157,4 @@ bool X11CairoSalGraphicsImpl::drawPolyLine(const
basegfx::B2DHomMatrix& rObjectT
return bRetval;
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
index 41a3d945f607..2c7ab449a97c 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
-#include <config_cairo_canvas.h>
-
-#if ENABLE_CAIRO_CANVAS
-
#include <cairo-xlib.h>
#include <unx/salgdi.h>
#include "gdiimpl.hxx"
@@ -92,6 +87,4 @@ public:
bool bPixelSnapHairline) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index d6eecfecb1e8..7ee133d2c87f 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -57,9 +57,7 @@
#include "cairo_xlib_cairo.hxx"
#include <cairo-xlib.h>
-#if ENABLE_CAIRO_CANVAS
#include "X11CairoSalGraphicsImpl.hxx"
-#endif
// X11Common
@@ -121,11 +119,7 @@ X11SalGraphics::X11SalGraphics():
#endif
{
mxTextRenderImpl.reset(new X11CairoTextRender(*this));
-#if ENABLE_CAIRO_CANVAS
mxImpl.reset(new X11CairoSalGraphicsImpl(*this, maX11Common));
-#else
- mxImpl.reset(new X11SalGraphicsImpl(*this));
-#endif
}
}
