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

[Kohei Yoshida]

 patches/dev300/apply                                  |    3 -
 patches/dev300/fontconfig-cache-pre-substitution.diff |   48 ------------------
 2 files changed, 51 deletions(-)

New commits:
commit bc108dd82a2efffb01a65bffccf723a6c36f98db
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Sep 29 17:54:29 2010 -0400

    Removed fontconfig-cache-pre-substitution.diff; moved to the libs-gui repo.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f140b34..0fd72e5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2403,9 +2403,6 @@ svx-fontwork-crash-fix.diff, n#526342, thorsten
 # expand path placeholders early in template dialog
 normalize-template-paths-fix.diff, n#512146, thorsten
 
-# cache fontconfig's pre-substitution result for better rendering performance.
-fontconfig-cache-pre-substitution.diff, n#529532, kohei
-
 [ OOXMLExport ]
 oox-pptx-export-hyperlinks.diff, n#499124, rodo
 oox-pptx-export-vertical-text.diff, n#498737, rodo
diff --git a/patches/dev300/fontconfig-cache-pre-substitution.diff b/patches/dev300/fontconfig-cache-pre-substitution.diff
deleted file mode 100644
index cc64c99..0000000
--- a/patches/dev300/fontconfig-cache-pre-substitution.diff
+++ /dev/null
@@ -1,48 +0,0 @@
----
- vcl/unx/source/gdi/salgdi3.cxx |   21 +++++++++++++++++----
- 1 files changed, 17 insertions(+), 4 deletions(-)
-
-diff --git vcl/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salgdi3.cxx
-index b9ac7b6..fc89fa7 100644
---- vcl/unx/source/gdi/salgdi3.cxx
-+++ vcl/unx/source/gdi/salgdi3.cxx
-@@ -1993,6 +1993,11 @@ class FcPreMatchSubstititution
- {
- public:
-     bool FindFontSubstitute( ImplFontSelectData& ) const;
-+
-+private:
-+    typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >
-+        CachedFontMapType;
-+    mutable CachedFontMapType maCachedFontMap;
- };
- 
- class FcGlyphFallbackSubstititution
-@@ -2188,12 +2193,20 @@ bool FcPreMatchSubstititution::FindFontSubstitute( ImplFontSelectData &rFontSelD
-     ||  0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( "opensymbol", 10) )
-         return false;
- 
-+    CachedFontMapType::const_iterator itr = maCachedFontMap.find(rFontSelData.maTargetName);
-+    if (itr != maCachedFontMap.end())
-+    {
-+        // Cached substitution pair
-+        rFontSelData.maSearchName = itr->second;
-+        return true;
-+    }
-+
-     rtl::OUString 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, aOut.maSearchName));
-+
-     if( !aOut.maSearchName.Len() )
-         return false;
- 
--- 
-1.7.0.1
-