Device-specific font substitution is not used

This was only used for printer built in fonts, which was dropped in the
previous commit.

Change-Id: Iff62786284470ff3873c8d4b0aae0614bf69c7f3
Reviewed-on: https://gerrit.libreoffice.org/6859
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

20 files changed, 23 insertions, 118 deletions

diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index 5e9140651d0e..cbe3d498070f 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -596,13 +596,6 @@ sal_Bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId nGlyphId, Rectangle& rR
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::GetDevFontSubstList( OutputDevice* )
-{
-    // nothing to do since there are no device-specific fonts on Aqua
-}
-
-// -----------------------------------------------------------------------
-
 void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& )
 {
 }
diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index 402bd6030b86..4a58e887c16d 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -423,13 +423,6 @@ sal_Bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId nGlyphId, Rectangle& rR
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::GetDevFontSubstList( OutputDevice* )
-{
-    // nothing to do since there are no device-specific fonts on Aqua
-}
-
-// -----------------------------------------------------------------------
-
 void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& )
 {
 }
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 682eaa1de950..f2516dfafc6c 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -912,10 +912,6 @@ void GenPspGraphics::ClearDevFontCache()
     GlyphCache::GetInstance().ClearFontCache();
 }
 
-void GenPspGraphics::GetDevFontSubstList( OutputDevice* )
-{
-}
-
 void GenPspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int )
 {
     const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 0a4bbd14cc70..0fde3f0afa9d 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -300,10 +300,6 @@ void SvpSalGraphics::ClearDevFontCache()
 }
 
 
-void SvpSalGraphics::GetDevFontSubstList( OutputDevice* )
-{}
-
-
 bool SvpSalGraphics::AddTempDevFont( ImplDevFontList*,
     const OUString&, const OUString& )
 {
diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h
index b543fe15541f..acf3b097bea2 100644
--- a/vcl/inc/aqua/atsui/salgdi.h
+++ b/vcl/inc/aqua/atsui/salgdi.h
@@ -268,9 +268,6 @@ public:
     virtual void            GetDevFontList( ImplDevFontList* );
     // graphics must drop any cached font info
     virtual void ClearDevFontCache();
-    // graphics should call ImplAddDevFontSubstitute on supplied
-    // OutputDevice for all its device specific preferred font substitutions
-    virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h
index 214d12fdca3f..ae18647632d6 100644
--- a/vcl/inc/coretext/salgdi2.h
+++ b/vcl/inc/coretext/salgdi2.h
@@ -332,9 +332,6 @@ public:
     virtual void            GetDevFontList( ImplDevFontList* );
     // graphics must drop any cached font info
     virtual void ClearDevFontCache();
-    // graphics should call ImplAddDevFontSubstitute on supplied
-    // OutputDevice for all its device specific preferred font substitutions
-    virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 74ccf65137ee..17912bcc023e 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -95,7 +95,6 @@ public:
     virtual void            GetDevFontList( ImplDevFontList* );
     // graphics must drop any cached font info
     virtual void ClearDevFontCache();
-    virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
 
     virtual sal_Bool            CreateFontSubset( const OUString& rToFile,
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 2853c89bf2af..3ffca01fc6ec 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -136,7 +136,6 @@ public:
     virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
     virtual void            GetDevFontList( ImplDevFontList* );
     virtual void ClearDevFontCache();
-    virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
     virtual sal_Bool        CreateFontSubset( const OUString& rToFile,
                                               const PhysicalFontFace*,
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 226a83d8688f..2d145fecdab0 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -211,14 +211,12 @@ private:
     FontInstanceList    maFontInstanceList;
 
 public:
-                        ImplFontCache( bool bPrinter );
+                        ImplFontCache();
                         ~ImplFontCache();
 
     ImplFontEntry*      GetFontEntry( ImplDevFontList*,
-                             const Font&, const Size& rPixelSize, float fExactHeight,
-                ImplDirectFontSubstitution* pDevSpecific );
-    ImplFontEntry*      GetFontEntry( ImplDevFontList*,
-                    FontSelectPattern&, ImplDirectFontSubstitution* pDevSpecific );
+                             const Font&, const Size& rPixelSize, float fExactHeight);
+    ImplFontEntry*      GetFontEntry( ImplDevFontList*, FontSelectPattern& );
     ImplFontEntry*      GetGlyphFallbackFont( ImplDevFontList*, FontSelectPattern&,
                             int nFallbackLevel, OUString& rMissingCodes );
     void                Release( ImplFontEntry* );
@@ -238,7 +236,6 @@ struct ImplOutDevData
     VirtualDevice*              mpRotateDev;
     vcl::ControlLayoutData*     mpRecordLayout;
     Rectangle                   maRecordRect;
-    ImplDirectFontSubstitution      maDevFontSubst;
 
     // #i75163#
     basegfx::B2DHomMatrix*      mpViewTransform;
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index eb3c48023b38..4e1af96bfde1 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -34,7 +34,6 @@ class ImplDevFontListData;
 class ImplGetDevFontList;
 class ImplGetDevSizeList;
 class ImplFontEntry;
-class ImplDirectFontSubstitution;
 class ImplPreMatchFontSubstitution;
 class ImplGlyphFallbackFontSubstitution;
 class FontSelectPattern;
@@ -233,7 +232,7 @@ public:
 
     // find the device font
     ImplDevFontListData*    FindFontFamily( const OUString& rFontName ) const;
-    ImplDevFontListData*    ImplFindByFont( FontSelectPattern&, bool bPrinter, ImplDirectFontSubstitution* ) const;
+    ImplDevFontListData*    ImplFindByFont( FontSelectPattern& ) const;
     ImplDevFontListData*    ImplFindBySearchName( const OUString& ) const;
 
     // suggest fonts for glyph fallback
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 323c66add610..abb57bd3ca02 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -245,10 +245,6 @@ public:
     // graphics must drop any cached font info
     virtual void            ClearDevFontCache() = 0;
 
-    // graphics should call ImplAddDevFontSubstitute on supplied
-    // OutputDevice for all its device specific preferred font substitutions
-    virtual void            GetDevFontSubstList( OutputDevice* ) = 0;
-
     virtual bool            AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ) = 0;
 
     // CreateFontSubset: a method to get a subset of glyhps of a font
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index acb3d7ecaa24..68ca728ca2e1 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -232,7 +232,6 @@ public:
     virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
     virtual void            GetDevFontList( ImplDevFontList* );
     virtual void ClearDevFontCache();
-    virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
     virtual sal_Bool            CreateFontSubset( const OUString& rToFile,
                                               const PhysicalFontFace*,
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 6e96c7023082..24412526710f 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -314,9 +314,6 @@ public:
     virtual void            GetDevFontList( ImplDevFontList* );
     // graphics must drop any cached font info
     virtual void ClearDevFontCache();
-    // graphics should call ImplAddDevFontSubstitute on supplied
-    // OutputDevice for all its device specific preferred font substitutions
-    virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 8203952fd9c4..96962c1578b9 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -295,7 +295,7 @@ bool InitVCL()
 
     // Initialize global data
     pSVData->maGDIData.mpScreenFontList     = new ImplDevFontList;
-    pSVData->maGDIData.mpScreenFontCache    = new ImplFontCache( sal_False );
+    pSVData->maGDIData.mpScreenFontCache    = new ImplFontCache;
     pSVData->maGDIData.mpGrfConverter       = new GraphicConverter;
 
     // Set exception handler
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 8dc042915399..c27cd9353aa4 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -206,14 +206,11 @@ void OutputDevice::ImplUpdateFontData( bool bNewFontLists )
                     if( mpFontCache && mpFontCache != pSVData->maGDIData.mpScreenFontCache )
                         delete mpFontCache;
                     mpFontList = pSVData->maGDIData.mpScreenFontList->Clone( true, true );
-                    mpFontCache = new ImplFontCache( sal_False );
+                    mpFontCache = new ImplFontCache();
                 }
                 else
                 {
-                    if( mpOutDevData )
-                        mpOutDevData->maDevFontSubst.Clear();
                     mpGraphics->GetDevFontList( mpFontList );
-                    mpGraphics->GetDevFontSubstList( this );
                 }
             }
         }
@@ -336,14 +333,6 @@ ImplFontSubstEntry::ImplFontSubstEntry( const OUString& rFontName,
     GetEnglishSearchFontName( maSearchReplaceName );
 }
 
-void OutputDevice::ImplAddDevFontSubstitute( const OUString& rFontName,
-                                             const OUString& rReplaceFontName,
-                                             sal_uInt16 nFlags )
-{
-    ImplInitOutDevData();
-    mpOutDevData->maDevFontSubst.AddFontSubstitute( rFontName, rReplaceFontName, nFlags );
-}
-
 void OutputDevice::RemoveFontSubstitute( sal_uInt16 n )
 {
     ImplDirectFontSubstitution* pSubst = ImplGetSVData()->maGDIData.mpDirectFontSubst;
@@ -387,8 +376,7 @@ bool ImplDirectFontSubstitution::FindFontSubstitute( OUString& rSubstName,
     return false;
 }
 
-static void ImplFontSubstitute( OUString& rFontName,
-    sal_uInt16 nFlags, ImplDirectFontSubstitution* pDevSpecific )
+static void ImplFontSubstitute( OUString& rFontName )
 {
 #ifdef DBG_UTIL
     OUString aTempName = rFontName;
@@ -405,16 +393,6 @@ static void ImplFontSubstitute( OUString& rFontName,
         rFontName = aSubstFontName;
         return;
     }
-
-    // apply device specific font replacement (e.g. to use printer builtin fonts)
-    if( !pDevSpecific )
-        return;
-
-    if( pDevSpecific->FindFontSubstitute( aSubstFontName, rFontName, nFlags ) )
-    {
-        rFontName = aSubstFontName;
-        return;
-    }
 }
 
 Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang,
@@ -552,7 +530,7 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang,
 
                     // get the name of the first available font
                     float fExactHeight = static_cast<float>(aSize.Height());
-                    ImplFontEntry* pEntry = pOutDev->mpFontCache->GetFontEntry( pOutDev->mpFontList, aFont, aSize, fExactHeight, pOutDev->mpOutDevData ? &pOutDev->mpOutDevData->maDevFontSubst : NULL );
+                    ImplFontEntry* pEntry = pOutDev->mpFontCache->GetFontEntry( pOutDev->mpFontList, aFont, aSize, fExactHeight );
                     if (pEntry)
                     {
                         if( pEntry->maFontSelData.mpFontData )
@@ -2182,10 +2160,9 @@ bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPattern& rA, const Fo
     return true;
 }
 
-ImplFontCache::ImplFontCache( bool bPrinter )
+ImplFontCache::ImplFontCache()
 :   mpFirstEntry( NULL ),
-    mnRef0Count( 0 ),
-    mbPrinter( bPrinter )
+    mnRef0Count( 0 )
 {}
 
 ImplFontCache::~ImplFontCache()
@@ -2199,17 +2176,17 @@ ImplFontCache::~ImplFontCache()
 }
 
 ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList,
-    const Font& rFont, const Size& rSize, float fExactHeight, ImplDirectFontSubstitution* pDevSpecific )
+    const Font& rFont, const Size& rSize, float fExactHeight )
 {
     OUString aSearchName = rFont.GetName();
 
     // initialize internal font request object
     FontSelectPattern aFontSelData( rFont, aSearchName, rSize, fExactHeight );
-    return GetFontEntry( pFontList, aFontSelData, pDevSpecific );
+    return GetFontEntry( pFontList, aFontSelData );
 }
 
 ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList,
-    FontSelectPattern& aFontSelData, ImplDirectFontSubstitution* pDevSpecific )
+    FontSelectPattern& aFontSelData )
 {
     // check if a directly matching logical font instance is already cached,
     // the most recently used font usually has a hit rate of >50%
@@ -2228,7 +2205,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList,
     if( !pEntry ) // no direct cache hit
     {
         // find the best matching logical font family and update font selector accordingly
-        pFontFamily = pFontList->ImplFindByFont( aFontSelData, mbPrinter, pDevSpecific );
+        pFontFamily = pFontList->ImplFindByFont( aFontSelData );
         DBG_ASSERT( (pFontFamily != NULL), "ImplFontCache::Get() No logical font found!" );
         if( pFontFamily )
             aFontSelData.maSearchName = pFontFamily->GetSearchName();
@@ -2343,19 +2320,12 @@ namespace
     }
 }
 
-ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
-    bool bPrinter, ImplDirectFontSubstitution* pDevSpecific ) const
+ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD ) const
 {
     // give up if no fonts are available
     if( !Count() )
         return NULL;
 
-    // test if a font in the token list is available
-    // substitute the font if this was requested
-    sal_uInt16 nSubstFlags = FONT_SUBSTITUTE_ALWAYS;
-    if ( bPrinter )
-        nSubstFlags |= FONT_SUBSTITUTE_SCREENONLY;
-
     bool bMultiToken = false;
     sal_Int32 nTokenPos = 0;
     OUString& aSearchName = rFSD.maSearchName; // TODO: get rid of reference
@@ -2380,7 +2350,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
 #endif
 
         GetEnglishSearchFontName( aSearchName );
-        ImplFontSubstitute( aSearchName, nSubstFlags, pDevSpecific );
+        ImplFontSubstitute( aSearchName );
         // #114999# special emboldening for Ricoh fonts
         // TODO: smarter check for special cases by using PreMatch infrastructure?
         if( (rFSD.GetWeight() > WEIGHT_MEDIUM)
@@ -2479,7 +2449,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
         if( mpPreMatchHook )
             if( mpPreMatchHook->FindFontSubstitute( rFSD ) )
                 GetEnglishSearchFontName( aSearchName );
-        ImplFontSubstitute( aSearchName, nSubstFlags, pDevSpecific );
+        ImplFontSubstitute( aSearchName );
         ImplDevFontListData* pFoundData = ImplFindBySearchName( aSearchName );
         if( pFoundData )
             return pFoundData;
@@ -2691,8 +2661,7 @@ ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( ImplDevFontList* pFontList,
         rFontSelData.maSearchName = "";
     }
 
-    // get device font without doing device specific substitutions
-    ImplFontEntry* pFallbackFont = GetFontEntry( pFontList, rFontSelData, NULL );
+    ImplFontEntry* pFallbackFont = GetFontEntry( pFontList, rFontSelData );
     return pFallbackFont;
 }
 
@@ -2925,11 +2894,8 @@ bool OutputDevice::ImplNewFont() const
         aSize.Width() = 1;
 
     // get font entry
-    ImplDirectFontSubstitution* pDevSpecificSubst = NULL;
-    if( mpOutDevData )
-        pDevSpecificSubst = &mpOutDevData->maDevFontSubst;
     ImplFontEntry* pOldEntry = mpFontEntry;
-    mpFontEntry = mpFontCache->GetFontEntry( mpFontList, maFont, aSize, fExactHeight, pDevSpecificSubst );
+    mpFontEntry = mpFontCache->GetFontEntry( mpFontList, maFont, aSize, fExactHeight );
     if( pOldEntry )
         mpFontCache->Release( pOldEntry );
 
@@ -5899,13 +5865,6 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
 
     FontSelectPattern aFontSelData = mpFontEntry->maFontSelData;
 
-    // when device specific font substitution may have been performed for
-    // the originally selected font then make sure that a fallback to that
-    // font is performed first
-    int nDevSpecificFallback = 0;
-    if( mpOutDevData && !mpOutDevData->maDevFontSubst.Empty() )
-        nDevSpecificFallback = 1;
-
     // try if fallback fonts support the missing unicodes
     for( int nFallbackLevel = 1; nFallbackLevel < MAX_FALLBACK; ++nFallbackLevel )
     {
@@ -5916,7 +5875,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
         aFontSelData.mpFontEntry = mpFontEntry; // reset the fontentry to base-level
 #endif
         ImplFontEntry* pFallbackFont = mpFontCache->GetGlyphFallbackFont( mpFontList,
-            aFontSelData, nFallbackLevel-nDevSpecificFallback, aMissingCodes );
+            aFontSelData, nFallbackLevel, aMissingCodes );
         if( !pFallbackFont )
             break;
 
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 7b06e67f0c8a..e2c4aebd1ad9 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -494,7 +494,7 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo )
     // Init data
     ImplUpdatePageData();
     mpFontList = new ImplDevFontList();
-    mpFontCache = new ImplFontCache( sal_True );
+    mpFontCache = new ImplFontCache();
     mpGraphics->GetDevFontList( mpFontList );
 }
 
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 4ef94b9ce462..54d40f300f5a 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -451,7 +451,7 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
     mpFontList = pSVData->maGDIData.mpScreenFontList->Clone( true, false );
 
     // prepare to use new font lists
-    mpFontCache = new ImplFontCache( false );
+    mpFontCache = new ImplFontCache();
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 71a70d1b691f..ebe7d2a3a906 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4193,7 +4193,7 @@ void Window::ImplNewInputContext()
                 aSize.Height() = (12*pFocusWin->mnDPIY)/72;
         }
         pFontEntry = pFocusWin->mpFontCache->GetFontEntry( pFocusWin->mpFontList,
-                         rFont, aSize, static_cast<float>(aSize.Height()), NULL );
+                         rFont, aSize, static_cast<float>(aSize.Height()) );
         if ( pFontEntry )
             aNewContext.mpFont = &pFontEntry->maFontSelData;
     }
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index d6a5069710fb..9f2e88220708 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -580,13 +580,6 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
 
 // ----------------------------------------------------------------------------
 
-void X11SalGraphics::GetDevFontSubstList( OutputDevice* )
-{
-    // no device specific font substitutions on X11 needed
-}
-
-// ----------------------------------------------------------------------------
-
 void cairosubcallback(void* pPattern)
 {
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 59f8f4ee879e..97cc98be191b 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2256,11 +2256,6 @@ void WinSalGraphics::ClearDevFontCache()
     //anything to do here ?
 }
 
-// ----------------------------------------------------------------------------
-
-void WinSalGraphics::GetDevFontSubstList( OutputDevice* )
-{}
-
 // -----------------------------------------------------------------------
 
 sal_Bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& rRect )