rpms/openoffice.org/devel workspace.cairotext01.patch,1.5,1.6

Fri Feb 29 10:12:35 UTC 2008

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30428

Modified Files:
	workspace.cairotext01.patch 
Log Message:
add in RENDER test of workspace.cairotext01

workspace.cairotext01.patch:

Index: workspace.cairotext01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cairotext01.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- workspace.cairotext01.patch	7 Feb 2008 12:29:35 -0000	1.5
+++ workspace.cairotext01.patch	29 Feb 2008 10:11:44 -0000	1.6
@@ -1,11 +1,7 @@
-Index: inc/vcl/glyphcache.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/inc/vcl/glyphcache.hxx,v
-retrieving revision 1.2
-retrieving revision 1.2.282.1
-diff -u -r1.2 -r1.2.282.1
---- openoffice.org.orig/vcl/inc/vcl/glyphcache.hxx	11 Apr 2007 17:55:02 -0000	1.2
-+++ openoffice.org/vcl/inc/vcl/glyphcache.hxx	25 Jan 2008 08:53:45 -0000	1.2.282.1
+Index: gsl/vcl/inc/vcl/glyphcache.hxx
+diff -u gsl/vcl/inc/vcl/glyphcache.hxx:1.2 gsl/vcl/inc/vcl/glyphcache.hxx:1.2.282.1
+--- gsl/vcl/inc/vcl/glyphcache.hxx:1.2	Wed Apr 11 10:55:02 2007
++++ gsl/vcl/inc/vcl/glyphcache.hxx	Fri Jan 25 00:53:45 2008
 @@ -186,6 +186,10 @@
      virtual const ::rtl::OString*   GetFontFileName() const { return NULL; }
      virtual int                 GetFontFaceNumber() const   { return 0; }
@@ -17,14 +13,10 @@
  
      const ImplFontSelectData&   GetFontSelData() const      { return maFontSelData; }
  
-Index: source/glyphs/gcach_ftyp.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
-retrieving revision 1.147
-retrieving revision 1.147.96.1
-diff -u -r1.147 -r1.147.96.1
---- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	26 Nov 2007 15:13:41 -0000	1.147
-+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	5 Feb 2008 16:22:27 -0000	1.147.96.1
+Index: gsl/vcl/source/glyphs/gcach_ftyp.cxx
+diff -u gsl/vcl/source/glyphs/gcach_ftyp.cxx:1.147 gsl/vcl/source/glyphs/gcach_ftyp.cxx:1.147.96.1
+--- gsl/vcl/source/glyphs/gcach_ftyp.cxx:1.147	Mon Nov 26 07:13:41 2007
++++ gsl/vcl/source/glyphs/gcach_ftyp.cxx	Tue Feb  5 08:22:27 2008
 @@ -518,6 +518,16 @@
  
  // -----------------------------------------------------------------------
@@ -42,14 +34,10 @@
  FreetypeManager::~FreetypeManager()
  {
  // This crashes on Solaris 10 
-Index: source/glyphs/gcach_ftyp.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.hxx,v
-retrieving revision 1.39
-retrieving revision 1.39.180.2
-diff -u -r1.39 -r1.39.180.2
---- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.hxx	31 Jul 2007 16:09:30 -0000	1.39
-+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.hxx	5 Feb 2008 16:22:27 -0000	1.39.180.2
+Index: gsl/vcl/source/glyphs/gcach_ftyp.hxx
+diff -u gsl/vcl/source/glyphs/gcach_ftyp.hxx:1.39 gsl/vcl/source/glyphs/gcach_ftyp.hxx:1.39.180.2
+--- gsl/vcl/source/glyphs/gcach_ftyp.hxx:1.39	Tue Jul 31 09:09:30 2007
++++ gsl/vcl/source/glyphs/gcach_ftyp.hxx	Tue Feb  5 08:22:27 2008
 @@ -185,6 +185,10 @@
      virtual const ::rtl::OString* GetFontFileName() const { return mpFontInfo->GetFontFileName(); }
      virtual int                 GetFontFaceNum() const { return mpFontInfo->GetFaceNum(); }
@@ -61,13 +49,10 @@
  
      virtual void                FetchFontMetric( ImplFontMetricData&, long& rFactor ) const;
  
-Index: unx/inc/salgdi.h
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/inc/salgdi.h,v
-retrieving revision 1.41
-diff -u -r1.41 salgdi.h
---- openoffice.org.orig/vcl/unx/inc/salgdi.h	27 Jun 2007 20:41:23 -0000	1.41
-+++ openoffice.org/vcl/unx/inc/salgdi.h	7 Feb 2008 12:07:12 -0000
+Index: gsl/vcl/unx/inc/salgdi.h
+diff -u gsl/vcl/unx/inc/salgdi.h:1.41 gsl/vcl/unx/inc/salgdi.h:1.41.206.2
+--- gsl/vcl/unx/inc/salgdi.h:1.41	Wed Jun 27 13:41:23 2007
++++ gsl/vcl/unx/inc/salgdi.h	Mon Jan 28 00:53:49 2008
 @@ -58,6 +58,8 @@
  #include <vcl/dllapi.h>
  #endif
@@ -115,13 +100,10 @@
      
      void freeResources();
  public:
-Index: unx/source/gdi/salgdi3.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi3.cxx,v
-retrieving revision 1.149
-diff -u -r1.149 salgdi3.cxx
---- openoffice.org.orig/vcl/unx/source/gdi/salgdi3.cxx	12 Dec 2007 13:21:50 -0000	1.149
-+++ openoffice.org/vcl/unx/source/gdi/salgdi3.cxx	7 Feb 2008 12:07:29 -0000
+Index: gsl/vcl/unx/source/gdi/salgdi3.cxx
+diff -u gsl/vcl/unx/source/gdi/salgdi3.cxx:1.149 gsl/vcl/unx/source/gdi/salgdi3.cxx:1.149.66.7
+--- gsl/vcl/unx/source/gdi/salgdi3.cxx:1.149	Wed Dec 12 05:21:50 2007
++++ gsl/vcl/unx/source/gdi/salgdi3.cxx	Thu Feb 28 10:37:07 2008
 @@ -123,6 +123,32 @@
  
  #include <hash_set>
@@ -155,7 +137,7 @@
  using namespace rtl;
  
  // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-@@ -734,6 +760,301 @@
+@@ -734,6 +760,306 @@
  }
  
  //--------------------------------------------------------------------------
@@ -233,6 +215,11 @@
 +    static const char* pDisableCairoText = getenv( "SAL_DISABLE_CAIROTEXT" );
 +    if( pDisableCairoText && (pDisableCairoText[0] == '1') )
 +        return;
++    
++    int nDummy;
++    if( !XQueryExtension( GetX11SalData()->GetDisplay()->GetDisplay(), "RENDER", &nDummy, &nDummy, &nDummy ) )
++        return;
++
 +
 +    OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.so.2" ));
 +    mpCairoLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT );
@@ -457,7 +444,7 @@
  
  void X11SalGraphics::DrawServerAAFontString( const ServerFontLayout& rLayout )
  {
-@@ -1111,15 +1432,20 @@
+@@ -1111,15 +1437,20 @@
      // draw complex text
      ServerFont& rFont = rLayout.GetServerFont();
  


