remove defunct pXRenderFormat field

Change-Id: Id48feeb0738bc89e9ba8580871db6e5fb307bfd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145290
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 2 insertions, 21 deletions

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index f7374a06d54e..b7bdb56228d1 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -156,7 +156,6 @@ struct SystemGraphicsData
     sal_uIntPtr     hDrawable;      // a drawable
     void*           pVisual;        // the visual in use
     int             nScreen;        // the current screen of the drawable
-    void*           pXRenderFormat; // render format for drawable
 #endif
 #if USE_HEADLESS_CODE
     void*           pSurface;       // the cairo surface when using svp-based backends, which includes gtk[3|4]
@@ -177,7 +176,6 @@ struct SystemGraphicsData
         , hDrawable( 0 )
         , pVisual( nullptr )
         , nScreen( 0 )
-        , pXRenderFormat( nullptr )
 #endif
 #if USE_HEADLESS_CODE
         , pSurface( nullptr )
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index ed0a9d10ad9e..4302f849337a 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -101,7 +101,6 @@ public:
     virtual SalGraphicsImpl*        GetImpl() const override;
     SalGeometryProvider*            GetGeometryProvider() const;
     void                            SetDrawable(Drawable d, cairo_surface_t* surface, SalX11Screen nXScreen);
-    void                    SetXRenderFormat( XRenderPictFormat* pXRenderFormat ) { m_pXRenderFormat = pXRenderFormat; }
 
     const SalX11Screen&             GetScreenNumber() const { return m_nXScreen; }
 
@@ -166,7 +165,6 @@ private:
     std::unique_ptr<SalColormap>    m_pDeleteColormap;
 
     SalX11Screen                    m_nXScreen;
-    mutable XRenderPictFormat*      m_pXRenderFormat;
 
     Region                          mpClipRegion;
     Pixmap                          hBrush_;        // Dither
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index 6ff9c8bd205c..9ec8167fbfdd 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -65,8 +65,7 @@ namespace cairo
         pDisplay(pSysDat.pDisplay),
         hDrawable(pSysDat.hDrawable),
         pVisual(pSysDat.pVisual),
-        nScreen(pSysDat.nScreen),
-        pRenderFormat(pSysDat.pXRenderFormat)
+        nScreen(pSysDat.nScreen)
     {}
 
     X11SysData::X11SysData( const SystemEnvData& pSysDat, const SalFrame* pReference ) :
@@ -248,7 +247,6 @@ namespace cairo
 
         aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
         aSystemGraphicsData.hDrawable = mpPixmap ? mpPixmap->mhDrawable : maSysData.hDrawable;
-        aSystemGraphicsData.pXRenderFormat = maSysData.pRenderFormat;
         aSystemGraphicsData.pSurface = pSurface;
 
         int width = cairo_xlib_surface_get_width(pSurface);
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 6a534ac4e236..b4347c0dfa59 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -83,7 +83,6 @@ X11SalGraphics::X11SalGraphics():
     m_pFrame(nullptr),
     m_pVDev(nullptr),
     m_nXScreen( 0 ),
-    m_pXRenderFormat(nullptr),
     mpClipRegion(nullptr),
     hBrush_(None),
     bWindow_(false),
@@ -162,7 +161,6 @@ void X11SalGraphics::SetDrawable(Drawable aDrawable, cairo_surface_t* pSurface,
     }
 
     maX11Common.m_hDrawable = aDrawable;
-    SetXRenderFormat( nullptr );
 }
 
 void X11SalGraphics::Init( X11SalFrame& rFrame, Drawable aTarget,
@@ -341,7 +339,6 @@ SystemGraphicsData X11SalGraphics::GetGraphicsData() const
     aRes.hDrawable = maX11Common.m_hDrawable;
     aRes.pVisual   = GetVisual().visual;
     aRes.nScreen   = m_nXScreen.getXScreen();
-    aRes.pXRenderFormat = m_pXRenderFormat;
     return aRes;
 }
 
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index 047437a7f78c..ee23e9112d96 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -135,17 +135,7 @@ X11SalVirtualDevice::X11SalVirtualDevice(const SalGraphics& rGraphics, tools::Lo
         bExternPixmap_ = false;
     }
 
-    XRenderPictFormat* pXRenderFormat = pData ? static_cast<XRenderPictFormat*>(pData->pXRenderFormat) : nullptr;
-    if( pXRenderFormat )
-    {
-        pGraphics_->SetXRenderFormat( pXRenderFormat );
-        if( pXRenderFormat->colormap )
-            pColormap = new SalColormap( pDisplay_, pXRenderFormat->colormap, m_nXScreen );
-        else
-            pColormap = new SalColormap( nBitCount );
-        bDeleteColormap = true;
-    }
-    else if( nBitCount != pDisplay_->GetVisual( m_nXScreen ).GetDepth() )
+    if( nBitCount != pDisplay_->GetVisual( m_nXScreen ).GetDepth() )
     {
         pColormap = new SalColormap( nBitCount );
         bDeleteColormap = true;