cairo svp: More build fixes.

Change-Id: Iefb5f60b7b5b90b62bb785c76a9ca46634052167

10 files changed, 19 insertions, 52 deletions

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 7701372e17ab..d9bd50462397 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -539,7 +539,7 @@ void SvpSalGraphics::drawPolyLine(sal_uInt32 nPoints, const SalPoint* pPtAry)
     aPoly.setClosed(false);
 
     drawPolyLine(aPoly, 0.0, basegfx::B2DVector(1.0, 1.0), basegfx::B2DLineJoin::B2DLINEJOIN_MITER,
-                 css::drawing::LineCap_BUTT/*, 15.0 * F_PI180 default*/);
+                 css::drawing::LineCap_BUTT);
 }
 
 void SvpSalGraphics::drawPolygon(sal_uInt32 nPoints, const SalPoint* pPtAry)
@@ -700,8 +700,7 @@ bool SvpSalGraphics::drawPolyLine(
     double fTransparency,
     const basegfx::B2DVector& rLineWidths,
     basegfx::B2DLineJoin eLineJoin,
-    css::drawing::LineCap eLineCap,
-    double fMiterMinimumAngle)
+    css::drawing::LineCap eLineCap)
 {
     // short circuit if there is nothing to do
     const int nPointCount = rPolyLine.count();
@@ -710,7 +709,7 @@ bool SvpSalGraphics::drawPolyLine(
         return true;
     }
 
-    const bool bNoJoin = (basegfx::B2DLineJoin::NONE == eLineJoin && basegfx::fTools::more(rLineWidths.getX(), 0.0));
+    const bool bNoJoin = (basegfx::B2DLINEJOIN_NONE == eLineJoin && basegfx::fTools::more(rLineWidths.getX(), 0.0));
 
     cairo_t* cr = getCairoContext(false);
     clipRegion(cr);
@@ -719,21 +718,18 @@ bool SvpSalGraphics::drawPolyLine(
     cairo_line_join_t eCairoLineJoin = CAIRO_LINE_JOIN_MITER;
     switch (eLineJoin)
     {
-        case basegfx::B2DLineJoin::Bevel:
+        case basegfx::B2DLINEJOIN_BEVEL:
             eCairoLineJoin = CAIRO_LINE_JOIN_BEVEL;
             break;
-        case basegfx::B2DLineJoin::Round:
+        case basegfx::B2DLINEJOIN_ROUND:
             eCairoLineJoin = CAIRO_LINE_JOIN_ROUND;
             break;
-        case basegfx::B2DLineJoin::NONE:
-        case basegfx::B2DLineJoin::Miter:
+        case basegfx::B2DLINEJOIN_NONE:
+        case basegfx::B2DLINEJOIN_MITER:
             eCairoLineJoin = CAIRO_LINE_JOIN_MITER;
             break;
     }
 
-    // convert miter minimum angle to miter limit
-    double fMiterLimit = 1.0 / sin( fMiterMinimumAngle / 2.0);
-
     // setup cap attribute
     cairo_line_cap_t eCairoLineCap(CAIRO_LINE_CAP_BUTT);
 
@@ -764,7 +760,7 @@ bool SvpSalGraphics::drawPolyLine(
     cairo_set_line_join(cr, eCairoLineJoin);
     cairo_set_line_cap(cr, eCairoLineCap);
     cairo_set_line_width(cr, rLineWidths.getX());
-    cairo_set_miter_limit(cr, fMiterLimit);
+    cairo_set_miter_limit(cr, 15.0);
 
 
     basegfx::B2DRange extents(0, 0, 0, 0);
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index adae728a2ed6..e1dc70f80eda 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -302,9 +302,8 @@ SalBitmap* SvpSalInstance::CreateSalBitmap()
 #endif
 }
 
-SalYieldResult SvpSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong const nReleased)
+void SvpSalInstance::Yield(bool bWait, bool bHandleAllCurrentEvents)
 {
-    (void) nReleased;
     assert(nReleased == 0); // not implemented
     // first, check for already queued events.
 
@@ -368,9 +367,6 @@ SalYieldResult SvpSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents,
 
         DoReleaseYield(nTimeoutMS);
     }
-
-    return bEvent ? SalYieldResult::EVENT :
-                    SalYieldResult::TIMEOUT;
 }
 
 void SvpSalInstance::DoReleaseYield( int nTimeoutMS )
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index e81328087ea0..0e6f5034d155 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -163,8 +163,7 @@ public:
                                           double fTransparency,
                                           const basegfx::B2DVector& rLineWidths,
                                           basegfx::B2DLineJoin,
-                                          css::drawing::LineCap/*,
-                                          double fMiterMinimumAngle*/) override;
+                                          css::drawing::LineCap) override;
     virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
     virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 693dea718241..dfeff4221126 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -39,10 +39,6 @@ public:
         return ClipRectangleList;   }
     void        ResetClipRegion()   {
         numClipRectangles = 0;      }
-    sal_uInt16      GetClipRegionType() {
-        return nClipRegionType;     }
-    void        SetClipRegionType( sal_uInt16 nType ) {
-        nClipRegionType = nType;    }
     int         GetRectangleCount() {
         return numClipRectangles;   }
 
@@ -51,7 +47,6 @@ private:
     XRectangle* ClipRectangleList;
     int         numClipRectangles;
     int         maxClipRectangles;
-    sal_uInt16      nClipRegionType;
 };
 
 class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 2206705cf908..5cb77b052636 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
-    ImplServerFontEntry* pServerFont = GlyphCache::GetInstance().CacheFont( *pEntry );
+    ServerFont* pServerFont = GlyphCache::GetInstance().CacheFont( *pEntry );
     if( pServerFont != nullptr )
     {
         // ignore fonts with e.g. corrupted font files
@@ -100,7 +100,7 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev
     return false;
 }
 
-ImplFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes, int nSize);
+ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize);
 
 void ImplServerFontEntry::HandleFontOptions()
 {
@@ -201,7 +201,7 @@ void CairoTextRender::DrawServerFontLayout( const ServerFontLayout& rLayout )
     if (cairo_glyphs.empty())
         return;
 
-    ImplServerFontEntry& rFont = rLayout.GetServerFont();
+    ServerFont& rFont = rLayout.GetServerFont();
     const FontSelectPattern& rFSD = rFont.GetFontSelData();
     int nHeight = rFSD.mnHeight;
     int nWidth = rFSD.mnWidth ? rFSD.mnWidth : nHeight;
@@ -434,7 +434,7 @@ void cairosubcallback(void* pPattern)
     cairo_ft_font_options_substitute(pFontOptions, static_cast<FcPattern*>(pPattern));
 }
 
-FontConfigFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes, int nSize)
+FontConfigFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize)
 {
     psp::FastPrintFontInfo aInfo;
 
@@ -465,7 +465,7 @@ bool CairoTextRender::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect
     if( nLevel >= MAX_FALLBACK )
         return false;
 
-    ImplServerFontEntry* pSF = mpServerFont[ nLevel ];
+    ServerFont* pSF = mpServerFont[ nLevel ];
     if( !pSF )
         return false;
 
@@ -496,7 +496,7 @@ bool CairoTextRender::GetGlyphOutline( sal_GlyphId aGlyphId,
     if( nLevel >= MAX_FALLBACK )
         return false;
 
-    ImplServerFontEntry* pSF = mpServerFont[ nLevel ];
+    ServerFont* pSF = mpServerFont[ nLevel ];
     if( !pSF )
         return false;
 
@@ -539,7 +539,7 @@ SystemFontData CairoTextRender::GetSysFontData( int nFallbackLevel ) const
 
     if (mpServerFont[nFallbackLevel] != nullptr)
     {
-        ImplServerFontEntry* rFont = mpServerFont[nFallbackLevel];
+        ServerFont* rFont = mpServerFont[nFallbackLevel];
         aSysFontData.nFontId = rFont->GetFtFace();
         aSysFontData.nFontFlags = rFont->GetLoadFlags();
         aSysFontData.bFakeBold = rFont->NeedsArtificialBold();
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
index ce816c0c3af6..e04a67ff8d30 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
@@ -19,7 +19,6 @@ public:
 
     virtual cairo_t* getCairoContext() SAL_OVERRIDE;
     virtual void getSurfaceOffset(double& nDX, double& nDY) SAL_OVERRIDE;
-    virtual void drawSurface(cairo_t* cr) SAL_OVERRIDE;
     virtual void releaseCairoContext(cairo_t* cr) SAL_OVERRIDE;
 };
 
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 2dce489df249..0905fad359a8 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -887,16 +887,6 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData )
     return false;
 }
 
-bool X11SalBitmap::Crop( const Rectangle& /*rRectPixel*/ )
-{
-    return false;
-}
-
-bool X11SalBitmap::Erase( const ::Color& /*rFillColor*/ )
-{
-    return false;
-}
-
 bool X11SalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, BmpScaleFlag /*nScaleFlag*/ )
 {
     return false;
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index b6be71f3d536..91382014948e 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -224,13 +224,6 @@ bool X11SalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
     return mxImpl->drawAlphaRect( nX, nY, nWidth, nHeight, nTransparency );
 }
 
-void X11SalGraphics::drawBitmap( const SalTwoRect& rRect,
-                                 const SalBitmap& rBitmap,
-                                 SalColor nColor )
-{
-    mxImpl->drawBitmap( rRect, rBitmap, nColor );
-}
-
 void X11SalGraphics::drawMask( const SalTwoRect& rPosAry,
                                const SalBitmap &rSalBitmap,
                                SalColor nMaskColor )
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 53afb0107aec..6f50cce305a4 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -106,9 +106,9 @@ bool X11SalGraphics::GetFontCapabilities(vcl::FontCapabilities &rGetImplFontCapa
 
 // SalGraphics
 
-sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel )
+void X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel )
 {
-    return mxTextRenderImpl->SetFont(pEntry, nFallbackLevel);
+    mxTextRenderImpl->SetFont(pEntry, nFallbackLevel);
 }
 
 void
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index c5e01a3567f9..d4af921689f7 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -184,7 +184,6 @@ SalClipRegion::SalClipRegion()
     ClipRectangleList = NULL;
     numClipRectangles = 0;
     maxClipRectangles = 0;
-    nClipRegionType   = SAL_OBJECT_CLIP_INCLUDERECTS;
 }
 
 SalClipRegion::~SalClipRegion()