drop newly unused code

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

3 files changed, 1 insertions, 169 deletions

diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 83f847d4d78c..eed51ef8b41f 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -230,9 +230,8 @@ public:
     struct RenderEntry
     {
         Pixmap      m_aPixmap;
-        Picture     m_aPicture;
 
-        RenderEntry() : m_aPixmap( 0 ), m_aPicture( 0 ) {}
+        RenderEntry() : m_aPixmap( 0 ) {}
     };
 
     typedef std::unordered_map<int,RenderEntry> RenderEntryMap;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index c146e4c40e85..ed0a9d10ad9e 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);
-    XRenderPictFormat*              GetXRenderFormat() const;
     void                    SetXRenderFormat( XRenderPictFormat* pXRenderFormat ) { m_pXRenderFormat = pXRenderFormat; }
 
     const SalX11Screen&             GetScreenNumber() const { return m_nXScreen; }
@@ -168,7 +167,6 @@ private:
 
     SalX11Screen                    m_nXScreen;
     mutable XRenderPictFormat*      m_pXRenderFormat;
-    XID                             m_aXRenderPicture;
 
     Region                          mpClipRegion;
     Pixmap                          hBrush_;        // Dither
diff --git a/vcl/inc/unx/x11/xrender_peer.hxx b/vcl/inc/unx/x11/xrender_peer.hxx
deleted file mode 100644
index e1006f88ed44..000000000000
--- a/vcl/inc/unx/x11/xrender_peer.hxx
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_VCL_UNX_X11_XRENDER_PEER_HXX
-#define INCLUDED_VCL_UNX_X11_XRENDER_PEER_HXX
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-struct _XTrap; // on some older systems this is not declared within Xrender.h
-#include <X11/extensions/Xrender.h>
-
-#include <tools/color.hxx>
-
-
-class XRenderPeer
-{
-public:
-    static XRenderPeer& GetInstance();
-
-private:
-                        XRenderPeer();
-    void                InitRenderLib();
-
-    Display*            mpDisplay;
-    XRenderPictFormat*  mpStandardFormatA8;
-
-public:
-    XRenderPictFormat* GetStandardFormatA8() const;
-    XRenderPictFormat* FindStandardFormat(int nFormat) const;
-
-    // the methods below are thin wrappers for the XRENDER API
-    XRenderPictFormat* FindVisualFormat( Visual const * ) const;
-    Picture     CreatePicture( Drawable, const XRenderPictFormat*,
-                    unsigned long nDrawable, const XRenderPictureAttributes* ) const;
-    void        ChangePicture( Picture, unsigned long nValueMask,
-                    const XRenderPictureAttributes* ) const;
-    void        SetPictureClipRegion( Picture, Region ) const;
-    void        CompositePicture( int nOp, Picture aSrc, Picture aMask, Picture aDst,
-                    int nXSrc, int nYSrc,
-                    int nXDst, int nYDst, unsigned nWidth, unsigned nHeight ) const;
-    void        FreePicture( Picture ) const;
-
-    void        FillRectangle( int nOp, Picture aDst, const XRenderColor*,
-                               int nX, int nY, unsigned nW, unsigned nH ) const;
-    void        CompositeTrapezoids( int nOp, Picture aSrc, Picture aDst,
-                    const XRenderPictFormat*, int nXSrc, int nYSrc,
-                    const XTrapezoid*, int nCount ) const;
-    void        CompositeTriangles( int nOp, Picture aSrc, Picture aDst,
-                    const XRenderPictFormat*, int nXSrc, int nYSrc,
-                    const XTriangle*, int nCount ) const;
-};
-
-inline XRenderPictFormat* XRenderPeer::GetStandardFormatA8() const
-{
-    return mpStandardFormatA8;
-}
-
-inline XRenderPictFormat* XRenderPeer::FindStandardFormat(int nFormat) const
-{
-    return XRenderFindStandardFormat(mpDisplay, nFormat);
-}
-
-inline XRenderPictFormat* XRenderPeer::FindVisualFormat( Visual const * pVisual ) const
-{
-    return XRenderFindVisualFormat ( mpDisplay, pVisual );
-}
-
-inline Picture XRenderPeer::CreatePicture( Drawable aDrawable,
-    const XRenderPictFormat* pVisFormat, unsigned long nValueMask,
-    const XRenderPictureAttributes* pRenderAttr ) const
-{
-    return XRenderCreatePicture( mpDisplay, aDrawable, pVisFormat,
-                                 nValueMask, pRenderAttr );
-}
-
-inline void XRenderPeer::ChangePicture( Picture aPicture,
-    unsigned long nValueMask, const XRenderPictureAttributes* pRenderAttr ) const
-{
-    XRenderChangePicture( mpDisplay, aPicture, nValueMask, pRenderAttr );
-}
-
-inline void XRenderPeer::SetPictureClipRegion( Picture aPicture,
-    Region aXlibRegion ) const
-{
-    XRenderSetPictureClipRegion( mpDisplay, aPicture, aXlibRegion );
-}
-
-inline void XRenderPeer::CompositePicture( int nXRenderOp,
-    Picture aSrcPic, Picture aMaskPic, Picture aDstPic,
-    int nSrcX, int nSrcY, int nDstX, int nDstY,
-    unsigned nWidth, unsigned nHeight ) const
-{
-    XRenderComposite( mpDisplay, nXRenderOp, aSrcPic, aMaskPic, aDstPic,
-                      nSrcX, nSrcY, 0/*nMaskX*/, 0/*nMaskY*/, nDstX, nDstY, nWidth, nHeight );
-}
-
-inline void XRenderPeer::FreePicture( Picture aPicture ) const
-{
-    XRenderFreePicture( mpDisplay, aPicture );
-}
-
-inline void XRenderPeer::FillRectangle( int a, Picture b, const XRenderColor* c,
-    int d, int e, unsigned int f, unsigned int g) const
-{
-    XRenderFillRectangle( mpDisplay, a, b, c, d, e, f, g );
-}
-
-inline void XRenderPeer::CompositeTrapezoids( int nOp,
-    Picture aSrc, Picture aDst, const XRenderPictFormat* pXRPF,
-    int nXSrc, int nYSrc, const XTrapezoid* pXT, int nCount ) const
-{
-    XRenderCompositeTrapezoids( mpDisplay, nOp, aSrc, aDst, pXRPF,
-        nXSrc, nYSrc, pXT, nCount );
-}
-
-inline void XRenderPeer::CompositeTriangles( int nOp,
-    Picture aSrc, Picture aDst, const XRenderPictFormat* pXRPF,
-    int nXSrc, int nYSrc, const XTriangle* pXT, int nCount ) const
-{
-    XRenderCompositeTriangles( mpDisplay, nOp, aSrc, aDst, pXRPF,
-        nXSrc, nYSrc, pXT, nCount );
-}
-
-inline XRenderColor GetXRenderColor( Color rColor, double fTransparency )
-{
-    XRenderColor aRetVal;
-    // convert the Color
-    aRetVal.red   = rColor.GetRed(); aRetVal.red   |= (aRetVal.red   << 8);
-    aRetVal.green = rColor.GetGreen(); aRetVal.green |= (aRetVal.green << 8);
-    aRetVal.blue  = rColor.GetBlue(); aRetVal.blue  |= (aRetVal.blue  << 8);
-
-    // handle transparency
-    aRetVal.alpha = 0xFFFF; // default to opaque
-    if( fTransparency != 0 )
-    {
-        const double fAlpha = 1.0 - fTransparency;
-        aRetVal.alpha = static_cast<sal_uInt16>(fAlpha * 0xFFFF + 0.5);
-        // xrender wants pre-multiplied colors
-        aRetVal.red   = static_cast<sal_uInt16>(fAlpha * aRetVal.red + 0.5);
-        aRetVal.green = static_cast<sal_uInt16>(fAlpha * aRetVal.green + 0.5);
-        aRetVal.blue  = static_cast<sal_uInt16>(fAlpha * aRetVal.blue + 0.5);
-    }
-
-    return aRetVal;
-}
-
-#endif // INCLUDED_VCL_UNX_X11_XRENDER_PEER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */