ooo-build r14368 - in trunk: . patches/dev300

[michael svn gnome org]

Author: michael
Date: Tue Oct 21 09:19:00 2008
New Revision: 14368
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14368&view=rev

Log:
2008-10-21  Michael Meeks  <michael meeks novell com>

        * patches/dev300/psprint.defconfig_changes.diff: add 990 section
        fix to compile vs. m9, and rotate older m7 version.



Added:
   trunk/patches/dev300/psprint.defconfig_changes-m7.diff   (props changed)
      - copied unchanged from r14367, /trunk/patches/dev300/psprint.defconfig_changes.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/psprint.defconfig_changes.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Oct 21 09:19:00 2008
@@ -2775,4 +2775,9 @@
 # and in the Start Menu on Windows
 win32-tooltips.diff, tml
 
+# stop font updatess crashing OO.o - to be merged up-stream
+# soon, hence < m28
+[ Fixes < dev300-m28 >= ooo300-m9 ]
 psprint.defconfig_changes.diff, n#436441, flr
+[ Fixes < dev300-m28 < ooo300-m9 ]
+psprint.defconfig_changes-m7.diff, n#436441, flr

Modified: trunk/patches/dev300/psprint.defconfig_changes.diff
==============================================================================
--- trunk/patches/dev300/psprint.defconfig_changes.diff	(original)
+++ trunk/patches/dev300/psprint.defconfig_changes.diff	Tue Oct 21 09:19:00 2008
@@ -70,6 +70,15 @@
      rWrapper.FcPatternDestroy( pPattern );
  
      FcFontSet*  pSet = NULL;
+@@ -990,7 +990,7 @@
+     if( ! rWrapper.isValid() )
+         return aHints;
+ 
+-    FcConfig* pConfig = rWrapper.getDefConfig();
++    FcConfig* pConfig = rWrapper.FcConfigGetCurrent();
+     FcPattern* pPattern = rWrapper.FcPatternCreate();
+ 
+     lcl_InfoToPattern( rInfo, rWrapper, pPattern );
 @@ -1049,7 +1045,7 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star
      if( ! rWrapper.isValid() )
          return false;