cairo svp: Even more build fixes.

Change-Id: Ibba9b1c599c801ab9af0f4fed6babbffae63d205

6 files changed, 9 insertions, 23 deletions

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 209b1ba66a43..7701372e17ab 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -538,8 +538,8 @@ 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::Middle,
-                 css::drawing::LineCap_BUTT, 15.0 * F_PI180 /*default*/);
+    drawPolyLine(aPoly, 0.0, basegfx::B2DVector(1.0, 1.0), basegfx::B2DLineJoin::B2DLINEJOIN_MITER,
+                 css::drawing::LineCap_BUTT/*, 15.0 * F_PI180 default*/);
 }
 
 void SvpSalGraphics::drawPolygon(sal_uInt32 nPoints, const SalPoint* pPtAry)
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 99a819a39969..405d9049376e 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -82,8 +82,6 @@ public:
 
     bool            GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
 
-    bool            Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
-    bool            Erase( const Color& rFillColor ) SAL_OVERRIDE;
     bool            Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE;
     bool            Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE;
 
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 927cd6238125..d6861787fdc6 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -85,7 +85,7 @@ public:
 
        @returns the name of the screen
     */
-    virtual OUString GetDisplayScreenName( unsigned int nScreen ) = 0;
+    virtual OUString GetDisplayScreenName( unsigned int /*nScreen*/ ) { return OUString(); }
 
     /*  Shows a native message box with the specified title, message and button
         combination.
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 65d85ba862e5..edd8b023266f 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -146,8 +146,6 @@ public:
     virtual void                ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE;
     virtual bool                GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
 
-    virtual bool                Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
-    virtual bool                Erase( const Color& rFillColor ) SAL_OVERRIDE;
     virtual bool                Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE;
     virtual bool                Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE;
 };
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 34635a14c9c5..2baafe73221b 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -827,16 +827,6 @@ bool OpenGLSalBitmap::GetSystemData( BitmapSystemData& /*rData*/ )
 #endif
 }
 
-bool OpenGLSalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
-{
-    return false;
-}
-
-bool OpenGLSalBitmap::Erase( const ::Color& /*rFillColor*/ )
-{
-    return false;
-}
-
 bool OpenGLSalBitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol )
 {
     OpenGLZone aZone;
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index f863b3a86355..2206705cf908 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -77,7 +77,7 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev
         return false;
 
     // handle the request for a non-native X11-font => use the GlyphCache
-    ServerFont* pServerFont = GlyphCache::GetInstance().CacheFont( *pEntry );
+    ImplServerFontEntry* pServerFont = GlyphCache::GetInstance().CacheFont( *pEntry );
     if( pServerFont != nullptr )
     {
         // ignore fonts with e.g. corrupted font files
@@ -91,7 +91,7 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev
         mpServerFont[ nFallbackLevel ] = pServerFont;
 
         // apply font specific-hint settings
-        ServerFont* pSFE = static_cast<ServerFont*>( pEntry->mpFontEntry );
+        ImplServerFontEntry* pSFE = static_cast<ImplServerFontEntry*>( pEntry->mpFontEntry );
         pSFE->HandleFontOptions();
 
         return true;
@@ -201,7 +201,7 @@ void CairoTextRender::DrawServerFontLayout( const ServerFontLayout& rLayout )
     if (cairo_glyphs.empty())
         return;
 
-    ServerFont& rFont = rLayout.GetServerFont();
+    ImplServerFontEntry& rFont = rLayout.GetServerFont();
     const FontSelectPattern& rFSD = rFont.GetFontSelData();
     int nHeight = rFSD.mnHeight;
     int nWidth = rFSD.mnWidth ? rFSD.mnWidth : nHeight;
@@ -465,7 +465,7 @@ bool CairoTextRender::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect
     if( nLevel >= MAX_FALLBACK )
         return false;
 
-    ServerFont* pSF = mpServerFont[ nLevel ];
+    ImplServerFontEntry* pSF = mpServerFont[ nLevel ];
     if( !pSF )
         return false;
 
@@ -496,7 +496,7 @@ bool CairoTextRender::GetGlyphOutline( sal_GlyphId aGlyphId,
     if( nLevel >= MAX_FALLBACK )
         return false;
 
-    ServerFont* pSF = mpServerFont[ nLevel ];
+    ImplServerFontEntry* pSF = mpServerFont[ nLevel ];
     if( !pSF )
         return false;
 
@@ -539,7 +539,7 @@ SystemFontData CairoTextRender::GetSysFontData( int nFallbackLevel ) const
 
     if (mpServerFont[nFallbackLevel] != nullptr)
     {
-        ServerFont* rFont = mpServerFont[nFallbackLevel];
+        ImplServerFontEntry* rFont = mpServerFont[nFallbackLevel];
         aSysFontData.nFontId = rFont->GetFtFace();
         aSysFontData.nFontFlags = rFont->GetLoadFlags();
         aSysFontData.bFakeBold = rFont->NeedsArtificialBold();