[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx |   22 ++++++++++++++++++++++
 vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx |   13 +++++++++++++
 vcl/unx/generic/gdi/gdiimpl.cxx                 |   21 ---------------------
 vcl/unx/generic/gdi/gdiimpl.hxx                 |   22 ----------------------
 4 files changed, 35 insertions(+), 43 deletions(-)

New commits:
commit 99240ec736524d1888fc12029851852a21fe2147
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 10 14:23:04 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jan 11 08:48:34 2023 +0000

    move unimplemented stubs to X11CairoSalGraphicsImpl
    
    Change-Id: I8fac17a28cd6c399eeb6d80b4d67356b5bd5358e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145270
    Tested-by: Caolán McNamara <caol...@redhat.com>
    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 cdcaa291cfcf..752e70cc3a99 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
@@ -159,4 +159,26 @@ void X11CairoSalGraphicsImpl::copyBits(const SalTwoRect& 
rTR, SalGraphics* pSrcG
     mrCairoCommon.copyBitsCairo(rTR, source, getAntiAlias());
 }
 
+bool X11CairoSalGraphicsImpl::drawPolyLineBezier(sal_uInt32, const Point*, 
const PolyFlags*)
+{
+    return false;
+}
+
+bool X11CairoSalGraphicsImpl::drawPolygonBezier(sal_uInt32, const Point*, 
const PolyFlags*)
+{
+    return false;
+}
+
+bool X11CairoSalGraphicsImpl::drawPolyPolygonBezier(sal_uInt32, const 
sal_uInt32*,
+                                                    const Point* const*, const 
PolyFlags* const*)
+{
+    return false;
+}
+
+bool X11CairoSalGraphicsImpl::drawEPS(tools::Long, tools::Long, tools::Long, 
tools::Long, void*,
+                                      sal_uInt32)
+{
+    return false;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx 
b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
index 8bf49ec423de..b0a8a85e4f90 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
@@ -140,6 +140,19 @@ public:
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
     void copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) 
override;
 
+    bool drawPolyLineBezier(sal_uInt32 nPoints, const Point* pPtAry,
+                            const PolyFlags* pFlgAry) override;
+
+    bool drawPolygonBezier(sal_uInt32 nPoints, const Point* pPtAry,
+                           const PolyFlags* pFlgAry) override;
+
+    bool drawPolyPolygonBezier(sal_uInt32 nPoly, const sal_uInt32* pPoints,
+                               const Point* const* pPtAry,
+                               const PolyFlags* const* pFlgAry) override;
+
+    bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, 
tools::Long nHeight,
+                 void* pPtr, sal_uInt32 nSize) override;
+
     bool hasFastDrawTransformedBitmap() const override;
 
     bool supportsOperation(OutDevSupportType eType) const override;
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index bfe8995c025f..a54977874eef 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -840,27 +840,6 @@ void X11SalGraphicsImpl::SetXORMode( bool bSet, bool )
     }
 }
 
-bool X11SalGraphicsImpl::drawPolyLineBezier( sal_uInt32, const Point*, const 
PolyFlags* )
-{
-    return false;
-}
-
-bool X11SalGraphicsImpl::drawPolygonBezier( sal_uInt32, const Point*, const 
PolyFlags* )
-{
-    return false;
-}
-
-bool X11SalGraphicsImpl::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*,
-                                                const Point* const*, const 
PolyFlags* const* )
-{
-    return false;
-}
-
-bool X11SalGraphicsImpl::drawEPS( 
tools::Long,tools::Long,tools::Long,tools::Long,void*,sal_uInt32 )
-{
-    return false;
-}
-
 tools::Long X11SalGraphicsImpl::GetGraphicsHeight() const
 {
     if( mrParent.m_pFrame )
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 974a7d168423..af5f8b029849 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -129,22 +129,6 @@ public:
     // set fill color for raster operations
     virtual void SetROPFillColor( SalROPColor nROPColor ) override;
 
-    virtual bool drawPolyLineBezier(
-                sal_uInt32 nPoints,
-                const Point* pPtAry,
-                const PolyFlags* pFlgAry ) override;
-
-    virtual bool drawPolygonBezier(
-                sal_uInt32 nPoints,
-                const Point* pPtAry,
-                const PolyFlags* pFlgAry ) override;
-
-    virtual bool drawPolyPolygonBezier(
-                sal_uInt32 nPoly,
-                const sal_uInt32* pPoints,
-                const Point* const* pPtAry,
-                const PolyFlags* const* pFlgAry ) override;
-
     virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& 
rSalBitmap ) override;
 
     virtual void drawBitmap(
@@ -159,12 +143,6 @@ public:
 
     virtual std::shared_ptr<SalBitmap> getBitmap( tools::Long nX, tools::Long 
nY, tools::Long nWidth, tools::Long nHeight ) override;
 
-    virtual bool drawEPS(
-                tools::Long nX, tools::Long nY,
-                tools::Long nWidth, tools::Long nHeight,
-                void* pPtr,
-                sal_uInt32 nSize ) override;
-
     /** Blend bitmap with color channels */
     virtual bool blendBitmap(
                 const SalTwoRect&,