[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                  |    2 
 patches/dev300/fontconfig-cache-pre-substitution.diff |   37 +++++++-----------
 2 files changed, 16 insertions(+), 23 deletions(-)

New commits:
commit e564cc00c8f223f78c72e76ed63ff2b771d1f3a2
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri May 28 10:24:50 2010 -0400

    Adjusted and re-enabled the fontconfig cache patch for dev300-m77.
    
    * patches/dev300/apply:
    * patches/dev300/fontconfig-cache-pre-substitution.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c1e8841..d52b276 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3184,7 +3184,7 @@ svx-fontwork-crash-fix.diff, n#526342, thorsten
 normalize-template-paths-fix.diff, n#512146, thorsten
 
 # cache fontconfig's pre-substitution result for better rendering performance.
-# FIXME dev300-m77 fontconfig-cache-pre-substitution.diff, n#529532, kohei #FIXME
+fontconfig-cache-pre-substitution.diff, n#529532, kohei
 
 oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
 oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
diff --git a/patches/dev300/fontconfig-cache-pre-substitution.diff b/patches/dev300/fontconfig-cache-pre-substitution.diff
index fe2f8c9..6f11750 100644
--- a/patches/dev300/fontconfig-cache-pre-substitution.diff
+++ b/patches/dev300/fontconfig-cache-pre-substitution.diff
@@ -1,17 +1,8 @@
-From 67634e2e7f2d432e86891e16e5df33c4b068e0b9 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:06:30 +0200
-Subject: [PATCH 715/878] fontconfig-cache-pre-substitution.diff
-
----
- vcl/unx/source/gdi/salgdi3.cxx |   16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx
-index b54bdd4..e26403b 100644
---- a/vcl/unx/source/gdi/salgdi3.cxx
-+++ b/vcl/unx/source/gdi/salgdi3.cxx
-@@ -2028,6 +2028,11 @@ class FcPreMatchSubstititution
+diff --git vcl/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salgdi3.cxx
+index 87fe0bf..8e5fe27 100644
+--- vcl/unx/source/gdi/salgdi3.cxx
++++ vcl/unx/source/gdi/salgdi3.cxx
+@@ -1977,6 +1977,11 @@ class FcPreMatchSubstititution
  {
  public:
      bool FindFontSubstitute( ImplFontSelectData& ) const;
@@ -23,7 +14,7 @@ index b54bdd4..e26403b 100644
  };
  
  class FcGlyphFallbackSubstititution
-@@ -2156,8 +2161,19 @@ bool FcPreMatchSubstititution::FindFontSubstitute( ImplFontSelectData &rFontSelD
+@@ -2172,12 +2177,20 @@ bool FcPreMatchSubstititution::FindFontSubstitute( ImplFontSelectData &rFontSelD
      ||  0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( "opensymbol", 10) )
          return false;
  
@@ -34,15 +25,17 @@ index b54bdd4..e26403b 100644
 +        rFontSelData.maSearchName = itr->second;
 +        return true;
 +    }
++
      rtl::OUString aDummy;
-     const rtl::OUString aOUName = GetFcSubstitute( rFontSelData, aDummy );
+     const ImplFontSelectData aOut = GetFcSubstitute( rFontSelData, aDummy );
+-    // TODO: cache the font substitution suggestion
+-    // FC doing it would be preferable because it knows the invariables
+-    // e.g. FC knows the FC rule that all Arial gets replaced by LiberationSans
+-    // whereas we would have to check for every size or attribute
 +
 +    maCachedFontMap.insert(
-+        CachedFontMapType::value_type(rFontSelData.maTargetName, aOUName));
++        CachedFontMapType::value_type(rFontSelData.maTargetName, aOut.maSearchName));
 +
-     if( !aOUName.getLength() )
+     if( !aOut.maSearchName.Len() )
          return false;
-     const String aName( aOUName );
--- 
-1.7.0.1
-
+