ooo-build r11243 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Jan 11 08:31:28 2008
New Revision: 11243
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11243&view=rev

Log:
2008-01-11  Rene Engelhard  <rene debian org>

        * patches/src680/apply,
          patches/src680/ooo84684.vcl.fixfontconfig.diff: import patch from
          Fedora to fix #i84684


Added:
   trunk/patches/src680/ooo84684.vcl.fixfontconfig.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Fri Jan 11 08:31:28 2008
@@ -1532,6 +1532,7 @@
 
 [ FedoraFixes ]
 #FIXME src680: ooo64508.vcl.honourfontconfighinting.diff
+ooo84684.vcl.fixfontconfig.diff
 
 #FIXME src680: buildfix-font-hints-svp.diff
 

Added: trunk/patches/src680/ooo84684.vcl.fixfontconfig.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/ooo84684.vcl.fixfontconfig.diff	Fri Jan 11 08:31:28 2008
@@ -0,0 +1,50 @@
+Index: inc/vcl/outfont.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/inc/vcl/outfont.hxx,v
+retrieving revision 1.3
+diff -u -r1.3 outfont.hxx
+--- vcl/inc/vcl/outfont.hxx	12 Dec 2007 13:19:39 -0000	1.3
++++ vcl/inc/vcl/outfont.hxx	19 Dec 2007 10:55:40 -0000
+@@ -237,6 +237,7 @@
+     // find the device font
+     ImplDevFontListData*    FindFontFamily( const String& rFontName ) const;
+     ImplDevFontListData*    ImplFindByFont( ImplFontSelectData&, bool bPrinter, ImplDirectFontSubstitution* ) const;
++    void ImplChangeByFontSubstitute(ImplFontSelectData& aFontSelData) const;
+     ImplDevFontListData*    ImplFindBySearchName( const String& ) const;
+ 
+     // suggest fonts for glyph fallback
+Index: source/gdi/outdev3.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
+retrieving revision 1.234
+diff -u -r1.234 outdev3.cxx
+--- vcl/source/gdi/outdev3.cxx	12 Dec 2007 13:20:52 -0000	1.234
++++ vcl/source/gdi/outdev3.cxx	19 Dec 2007 10:56:52 -0000
+@@ -2916,6 +2916,7 @@
+     if( !pEntry ) // no direct cache hit
+     {
+         // find the best matching logical font family and update font selector accordingly
++	pFontList->ImplChangeByFontSubstitute(aFontSelData);
+         pFontFamily = pFontList->ImplFindByFont( aFontSelData, mbPrinter, pDevSpecific );
+         DBG_ASSERT( (pFontFamily != NULL), "ImplFontCache::Get() No logical font found!" );
+         if( pFontFamily )
+@@ -2970,6 +2971,19 @@
+ 
+ // -----------------------------------------------------------------------
+ 
++void ImplDevFontList::ImplChangeByFontSubstitute(ImplFontSelectData& aFontSelData) const
++{
++    if( mpPreMatchHook )
++    {
++        xub_StrLen nTokenPos = 0;
++        aFontSelData.maTargetName = GetNextFontToken( aFontSelData.maSearchName, nTokenPos );
++        if( mpPreMatchHook->FindFontSubstitute( aFontSelData ) )
++            aFontSelData.maName = aFontSelData.maSearchName;
++    }
++}
++
++// -----------------------------------------------------------------------
++
+ ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD,
+     bool bPrinter, ImplDirectFontSubstitution* pDevSpecific ) const
+ {