cairo svp: More build fixes.

Change-Id: If36bb90dc221304f242a0747316ce2713bceb89f

7 files changed, 10 insertions, 10 deletions

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 16723fd4eaf1..13411d3ac138 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1376,7 +1376,7 @@ public:
                                                          vcl::TextLayoutCache const* = nullptr) const;
     SAL_DLLPRIVATE SalLayout*   ImplGlyphFallbackLayout( SalLayout*, ImplLayoutArgs& ) const;
     // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI
-    SAL_DLLPRIVATE SalLayout*   getFallbackFont(ImplFontEntry &rFallbackFont,
+    SAL_DLLPRIVATE SalLayout*   getFallbackFont(
                                     FontSelectPattern &rFontSelData, int nFallbackLevel,
                                     ImplLayoutArgs& rLayoutArgs) const;
 
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 79e61c62c909..79d0cfb32348 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -798,7 +798,7 @@ bool GenPspGraphics::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilitie
     return m_pServerFont[0]->GetFontCapabilities(rFontCapabilities);
 }
 
-sal_uInt16 GenPspGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel )
+void GenPspGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel )
 {
     // release all fonts that are to be overridden
     for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
@@ -813,7 +813,7 @@ sal_uInt16 GenPspGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLeve
 
     // return early if there is no new font
     if( !pEntry )
-        return 0;
+        return;
 
     sal_IntPtr nID = pEntry->mpFontData ? pEntry->mpFontData->GetFontId() : 0;
 
@@ -849,7 +849,7 @@ sal_uInt16 GenPspGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLeve
     }
 
     // set the printer font
-    return m_pPrinterGfx->SetFont( nID,
+    m_pPrinterGfx->SetFont( nID,
                                    pEntry->mnHeight,
                                    pEntry->mnWidth,
                                    pEntry->mnOrientation,
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index f2c54c782baa..ccb5b3acad72 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -389,7 +389,7 @@ void SvpSalFrame::SetInputContext( SalInputContext* )
 {
 }
 
-void SvpSalFrame::EndExtTextInput( EndExtTextInputFlags )
+void SvpSalFrame::EndExtTextInput( sal_uInt16 )
 {
 }
 
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 3503f21d9d47..9867860ebf20 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -97,7 +97,7 @@ public:
     using SalFrame::Flush;
     virtual void                Flush() override;
     virtual void                SetInputContext( SalInputContext* pContext ) override;
-    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) override;
+    virtual void                EndExtTextInput( sal_uInt16 nFlags ) override;
     virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) override;
     virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) override;
     virtual LanguageType        GetInputLanguage() override;
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 15ce6b93ed67..0fa98245b1de 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -157,7 +157,7 @@ public:
     // wait next event and dispatch
     // must returned by UserEvent (SalFrame::PostEvent)
     // and timer
-    virtual SalYieldResult  DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) override;
+    virtual void            Yield( bool bWait, bool bHandleAllCurrentEvents ) override;
     virtual bool            AnyInput( VclInputFlags nType ) override;
 
     // may return NULL to disable session management
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 253f1c398255..d25e523f8d45 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -2143,7 +2143,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
         }
 
         // create and add glyph fallback layout to multilayout
-        SalLayout* pFallback = getFallbackFont(*pFallbackFont, aFontSelData,
+        SalLayout* pFallback = getFallbackFont(aFontSelData,
             nFallbackLevel, rLayoutArgs);
         if (pFallback)
         {
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 055153d95270..0569be12e689 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
-        ServerFontInstance* pSFE = static_cast<ServerFontInstance*>( pEntry->mpFontInstance );
+        ServerFont* pSFE = static_cast<ServerFont*>( pEntry->mpFontInstance );
         pSFE->HandleFontOptions();
 
         return true;
@@ -102,7 +102,7 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev
 
 FontConfigFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes, int nSize);
 
-void ServerFontInstance::HandleFontOptions()
+void ServerFont::HandleFontOptions()
 {
     if( !mpServerFont )
         return;