cairo svp: More build fixes.

Change-Id: I1f615c51f637a6e93afc8428c7ad8d869fa61637

6 files changed, 9 insertions, 26 deletions

diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 79d0cfb32348..68618b163376 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -528,13 +528,6 @@ void GenPspGraphics::drawBitmap( const SalTwoRect&,
     OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent bitmap");
 }
 
-void GenPspGraphics::drawBitmap( const SalTwoRect&,
-                              const SalBitmap&,
-                              SalColor )
-{
-    OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent color");
-}
-
 void GenPspGraphics::drawMask( const SalTwoRect&,
                             const SalBitmap &,
                             SalColor )
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 2c2408bec8c9..209b1ba66a43 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -450,13 +450,13 @@ void SvpSalGraphics::SetROPLineColor( SalROPColor nROPColor )
 {
     switch( nROPColor )
     {
-        case SalROPColor::N0:
+        case SAL_ROP_0:
             m_aLineColor = MAKE_SALCOLOR(0, 0, 0);
             break;
-        case SalROPColor::N1:
+        case SAL_ROP_1:
             m_aLineColor = MAKE_SALCOLOR(0xff, 0xff, 0xff);
             break;
-        case SalROPColor::Invert:
+        case SAL_ROP_INVERT:
             m_aLineColor = MAKE_SALCOLOR(0xff, 0xff, 0xff);
             break;
     }
@@ -466,13 +466,13 @@ void SvpSalGraphics::SetROPFillColor( SalROPColor nROPColor )
 {
     switch( nROPColor )
     {
-        case SalROPColor::N0:
+        case SAL_ROP_0:
             m_aFillColor = MAKE_SALCOLOR(0, 0, 0);
             break;
-        case SalROPColor::N1:
+        case SAL_ROP_1:
             m_aFillColor = MAKE_SALCOLOR(0xff, 0xff, 0xff);
             break;
-        case SalROPColor::Invert:
+        case SAL_ROP_INVERT:
             m_aFillColor = MAKE_SALCOLOR(0xff, 0xff, 0xff);
             break;
     }
@@ -538,7 +538,7 @@ void SvpSalGraphics::drawPolyLine(sal_uInt32 nPoints, const SalPoint* pPtAry)
         aPoly.setB2DPoint(i, basegfx::B2DPoint(pPtAry[i].mnX, pPtAry[i].mnY));
     aPoly.setClosed(false);
 
-    drawPolyLine(aPoly, 0.0, basegfx::B2DVector(1.0, 1.0), basegfx::B2DLineJoin::Miter,
+    drawPolyLine(aPoly, 0.0, basegfx::B2DVector(1.0, 1.0), basegfx::B2DLineJoin::Middle,
                  css::drawing::LineCap_BUTT, 15.0 * F_PI180 /*default*/);
 }
 
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index d88684fc4ff2..7356f4c32ae6 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -139,7 +139,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
     if( pJobSetup->mpDriverData )
         rtl_freeMemory( pJobSetup->mpDriverData );
 
-    sal_uInt32 nBytes;
+    int nBytes;
     void* pBuffer = nullptr;
     if( rData.getStreamBuffer( pBuffer, nBytes ) )
     {
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 776b7bf1505d..c4bb9f47e702 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -172,9 +172,6 @@ public:
                                         const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
-                                        SalColor nTransparentColor ) SAL_OVERRIDE;
-    virtual void            drawBitmap( const SalTwoRect& rPosAry,
-                                        const SalBitmap& rSalBitmap,
                                         const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
     virtual void            drawMask( const SalTwoRect& rPosAry,
                                       const SalBitmap& rSalBitmap,
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index bbd0ee13cac3..ef034225e882 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -63,8 +63,6 @@ public:
     virtual void            ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) = 0;
     virtual bool            GetSystemData( BitmapSystemData& rData ) = 0;
 
-    virtual bool            Crop( const Rectangle& rRectPixel ) = 0;
-    virtual bool            Erase( const Color& rFillColor ) = 0;
     virtual bool            Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) = 0;
     virtual bool            Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) = 0;
 
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 84f1e8ff14eb..8cb5e313b4d5 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -114,7 +114,7 @@ public:
     virtual void                    SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
 
     virtual void                    SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual sal_uInt16              SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
+    virtual void                    SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
     virtual void                    GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
     virtual const FontCharMapPtr    GetFontCharMap() const SAL_OVERRIDE;
     virtual bool                    GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
@@ -216,11 +216,6 @@ public:
     virtual void                    drawBitmap(
                                         const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
-                                        SalColor nTransparentColor ) SAL_OVERRIDE;
-
-    virtual void                    drawBitmap(
-                                        const SalTwoRect& rPosAry,
-                                        const SalBitmap& rSalBitmap,
                                         const SalBitmap& rMaskBitmap ) SAL_OVERRIDE;
 
     virtual void                    drawMask(