rpms/openoffice.org/devel openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: dcbw

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11032

Modified Files:
	openoffice.org-1.9.104-use-fontconfig-everywhere.patch 
Log Message:
Use glyph fallback for text sizes >=3, not >=6.  Otherwise, things like
slideshow previews just show boxes because their text size is greatly reduced.


openoffice.org-1.9.104-use-fontconfig-everywhere.patch:
 psprint/source/fontmanager/fontcache.cxx |    2 
 vcl/inc/outdev.h                         |    3 
 vcl/inc/outfont.hxx                      |   15 +
 vcl/source/gdi/outdev3.cxx               |  398 ++++++++++++++++++++++++-------
 vcl/util/makefile.mk                     |    2 
 5 files changed, 330 insertions(+), 90 deletions(-)

Index: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.104-use-fontconfig-everywhere.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch	26 May 2005 18:04:37 -0000	1.2
+++ openoffice.org-1.9.104-use-fontconfig-everywhere.patch	27 May 2005 14:37:24 -0000	1.3
@@ -49,7 +49,7 @@
      void                Invalidate();
  };
 --- SRC680_m104/vcl/source/gdi/outdev3.cxx.fontconfig	2005-05-25 13:09:50.000000000 -0400
-+++ SRC680_m104/vcl/source/gdi/outdev3.cxx	2005-05-26 14:02:10.000000000 -0400
++++ SRC680_m104/vcl/source/gdi/outdev3.cxx	2005-05-27 10:33:03.000000000 -0400
 @@ -185,6 +185,9 @@
  #include <memory>
  #include <algorithm>
@@ -485,6 +485,15 @@
      return pFallbackFont;
  }
  
+@@ -6103,7 +6313,7 @@
+     // do glyph fallback if needed
+     // #105768# avoid fallback for very small font sizes
+     if( aLayoutArgs.NeedFallback() )
+-        if( mpFontEntry && (mpFontEntry->maFontSelData.mnHeight >= 6) )
++        if( mpFontEntry && (mpFontEntry->maFontSelData.mnHeight >= 3) )
+             pSalLayout = ImplGlyphFallbackLayout( pSalLayout, aLayoutArgs );
+ 
+     // position, justify, etc. the layout
 @@ -6147,6 +6357,17 @@
          rLayoutArgs.ResetPos();
      }