cairo svp: More build fixes.

Change-Id: I351eb0c1468caf5e4d9580b13d46db135cf993f9

5 files changed, 10 insertions, 16 deletions

diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 180ad2c5d0d6..9086dd2581d7 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -101,7 +101,7 @@ BitmapBuffer* ImplCreateDIB(
                 }
                 default:
                     nBitCount = 32;
-                    SAL_FALLTHROUGH;
+                    // fall-through
                 case 32:
                 {
                     pDIB->mnFormat = SVP_CAIRO_FORMAT;
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 53957893cd07..f982716c8a89 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -120,7 +120,7 @@ void SvpSalFrame::GetFocus()
     if( s_pFocusFrame == this )
         return;
 
-    if( (m_nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION | SAL_FRAME_STYLE_FLOAT)) == SAL_FRAME_STYLE_NONE )
+    if( (m_nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION | SAL_FRAME_STYLE_FLOAT)) == 0 )
     {
         if( s_pFocusFrame )
             s_pFocusFrame->LoseFocus();
@@ -157,7 +157,7 @@ void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
     delete pSvpGraphics;
 }
 
-bool SvpSalFrame::PostEvent(ImplSVEvent* pData)
+bool SvpSalFrame::PostEvent(void* pData)
 {
     m_pInstance->PostEvent( this, pData, SALEVENT_USEREVENT );
     return true;
@@ -340,7 +340,7 @@ void SvpSalFrame::SetWindowState( const SalFrameState *pState )
 
 bool SvpSalFrame::GetWindowState( SalFrameState* pState )
 {
-    pState->mnState = WindowStateState::Normal;
+    pState->mnState = WINDOWSTATE_STATE_NORMAL;
     pState->mnX      = maGeometry.nX;
     pState->mnY      = maGeometry.nY;
     pState->mnWidth  = maGeometry.nWidth;
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index ccbb85f829e8..0eb4bfdc22e7 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -511,11 +511,6 @@ protected:
     virtual void                drawBitmap(
                                     const SalTwoRect& rPosAry,
                                     const SalBitmap& rSalBitmap,
-                                    SalColor nTransparentColor ) = 0;
-
-    virtual void                drawBitmap(
-                                    const SalTwoRect& rPosAry,
-                                    const SalBitmap& rSalBitmap,
                                     const SalBitmap& rMaskBitmap ) = 0;
 
     virtual void                drawMask(
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index c07722f887a4..e4ee3a23a02e 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -46,8 +46,7 @@ public:
 
     // Set new size using a buffer at the given address
     virtual bool            SetSizeUsingBuffer( long nNewDX, long nNewDY,
-                                                const basebmp::RawMemorySharedArray & /* pBuffer */,
-                                                const bool /* bTopDown */
+                                                sal_uInt8 * /*pBuffer*/
                                               )
         {
             // Only the headless virtual device has an implementation that uses
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 0569be12e689..f863b3a86355 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -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->mpFontInstance );
+        ServerFont* pSFE = static_cast<ServerFont*>( pEntry->mpFontEntry );
         pSFE->HandleFontOptions();
 
         return true;
@@ -100,9 +100,9 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev
     return false;
 }
 
-FontConfigFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes, int nSize);
+ImplFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes, int nSize);
 
-void ServerFont::HandleFontOptions()
+void ImplServerFontEntry::HandleFontOptions()
 {
     if( !mpServerFont )
         return;
@@ -260,7 +260,7 @@ void CairoTextRender::DrawServerFontLayout( const ServerFontLayout& rLayout )
         cairo_font_face_t* font_face = static_cast<cairo_font_face_t*>(CairoFontsCache::FindCachedFont(aId));
         if (!font_face)
         {
-            const FontConfigFontOptions *pOptions = rFont.GetFontOptions().get();
+            const ImplFontOptions *pOptions = rFont.GetFontOptions().get();
             void *pPattern = pOptions ? pOptions->GetPattern(aFace, aId.mbEmbolden) : nullptr;
             if (pPattern)
                 font_face = cairo_ft_font_face_create_for_pattern(static_cast<FcPattern*>(pPattern));
@@ -410,7 +410,7 @@ void CairoTextRender::GetDevFontList( PhysicalFontCollection* pFontCollection )
         int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID );
 
         // inform GlyphCache about this font provided by the PsPrint subsystem
-        FontAttributes aDFA = GenPspGraphics::Info2FontAttributes( aInfo );
+        ImplFontAttributes aDFA = GenPspGraphics::Info2FontAttributes( aInfo );
         aDFA.IncreaseQualityBy( 4096 );
         const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
         rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA );