Do all svp text rendering with cairo

enabling us to delete a whole pile of foo

For android we patch cairo, which is internal in that case, to swap the rgb
components so that cairo then matches the OpenGL GL_RGBA format so we can use
it there where we don't have GL_BGRA support.

Change-Id: I25e34889c7b7263438b143dd2a2ad882fb0f190a

1 files changed, 0 insertions, 10 deletions

diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 5f9d9806e4b6..5d926f5ba469 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -30,7 +30,6 @@
 #include <basebmp/scanlineformats.hxx>
 
 #include <list>
-#include <map>
 
 #include <time.h>
 
@@ -88,9 +87,6 @@ class VCL_DLLPUBLIC SvpSalInstance : public SalGenericInstance
 
     void                    DoReleaseYield( int nTimeoutMS );
 
-    typedef std::map< sal_uInt16, ::basebmp::Format > BitCountFormatMap;
-    BitCountFormatMap m_aBitCountFormatMap;
-
 public:
     static SvpSalInstance*  s_pDefaultInstance;
 
@@ -171,12 +167,6 @@ public:
 
     virtual GenPspGraphics *CreatePrintGraphics() override;
 
-    // We want to be able to select colourspace, i.e. ARGB vs RGBA vs BGRA etc.
-    // -- as the rest of vcl always uses bit depths, it is perhaps simplest
-    // to let us simply change the mapping of bitcount to format (which was
-    // previously unchangeable).
-    void setBitCountFormatMapping( sal_uInt16 nBitCount, ::basebmp::Format aFormat );
-
     ::basebmp::Format getFormatForBitCount( sal_uInt16 );
 };