[Libreoffice-commits] core.git: vcl/source

Tor Lillqvist tml at collabora.com
Fri Dec 18 08:53:28 PST 2015


 vcl/source/font/PhysicalFontCollection.cxx |   21 ---------------------
 1 file changed, 21 deletions(-)

New commits:
commit 0ebbdd66b6bfc761c2bfd610149c01706e68f9da
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Dec 18 18:52:11 2015 +0200

    SAL_FONTENUM_STABLE_ON_PLATFORM is not defined anywhere
    
    Change-Id: Id4e9fefc3529a8e1b0079b47ff182ef54e19a0e8

diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index c339242..0098b3a 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -189,27 +189,6 @@ void PhysicalFontCollection::InitGenericGlyphFallback() const
         }
     }
 
-#ifdef SAL_FONTENUM_STABLE_ON_PLATFORM // #i113472#
-    // sort the list of fonts for glyph fallback by quality (highest first)
-    // #i33947# keep the EUDC font at the front of the list
-    // an insertion sort is good enough for this short list
-    const int nSortStart = bHasEudc ? 1 : 0;
-    for( int i = nSortStart+1, j; i < nMaxLevel; ++i )
-    {
-        PhysicalFontFamily* pTestFont = pFallbackList[ i ];
-        int nTestQuality = pTestFont->GetMinQuality();
-
-        for( j = i; --j >= nSortStart; )
-        {
-            if( nTestQuality > pFallbackList[j]->GetMinQuality() )
-                pFallbackList[ j+1 ] = pFallbackList[ j ];
-            else
-                break;
-        }
-        pFallbackList[ j+1 ] = pTestFont;
-    }
-#endif
-
     mnFallbackCount = nMaxLevel;
     mpFallbackList  = pFallbackList;
 }


More information about the Libreoffice-commits mailing list