ooo-build r12250 - in trunk: . patches/dev300 patches/src680

[mloiseleur svn gnome org]

Author: mloiseleur
Date: Mon Apr 21 13:39:45 2008
New Revision: 12250
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12250&view=rev

Log:
fix for a cairo patch & move to dev300

Added:
   trunk/patches/dev300/ooo85470.workspace.cairotext01.diff
      - copied, changed from r12249, /trunk/patches/src680/ooo85470.workspace.cairotext01.diff
Removed:
   trunk/patches/src680/ooo85470.workspace.cairotext01.diff
Modified:
   trunk/ChangeLog

Copied: trunk/patches/dev300/ooo85470.workspace.cairotext01.diff (from r12249, /trunk/patches/src680/ooo85470.workspace.cairotext01.diff)
==============================================================================
--- /trunk/patches/src680/ooo85470.workspace.cairotext01.diff	(original)
+++ trunk/patches/dev300/ooo85470.workspace.cairotext01.diff	Mon Apr 21 13:39:45 2008
@@ -10,17 +10,17 @@
 +    virtual int                 GetLoadFlags() const { return 0; }
 +    virtual bool                NeedsArtificialBold() const { return false; }
 +    virtual bool		        NeedsArtificialItalic() const { return false; }
- 
+
      const ImplFontSelectData&   GetFontSelData() const      { return maFontSelData; }
- 
+
 Index: vcl/source/glyphs/gcach_ftyp.cxx
 diff -u vcl/source/glyphs/gcach_ftyp.cxx:1.147 vcl/source/glyphs/gcach_ftyp.cxx:1.147.96.1
 --- vcl/source/glyphs/gcach_ftyp.cxx:1.147	Mon Nov 26 07:13:41 2007
 +++ vcl/source/glyphs/gcach_ftyp.cxx	Tue Feb  5 08:22:27 2008
 @@ -518,6 +518,16 @@
- 
+
  // -----------------------------------------------------------------------
- 
+
 +void* FreetypeServerFont::GetFtFace() const
 +{
 +    if( maSizeFT )
@@ -33,7 +33,7 @@
 +
  FreetypeManager::~FreetypeManager()
  {
- // This crashes on Solaris 10 
+ // This crashes on Solaris 10
 Index: vcl/source/glyphs/gcach_ftyp.hxx
 diff -u vcl/source/glyphs/gcach_ftyp.hxx:1.39 vcl/source/glyphs/gcach_ftyp.hxx:1.39.180.2
 --- vcl/source/glyphs/gcach_ftyp.hxx:1.39	Tue Jul 31 09:09:30 2007
@@ -46,26 +46,25 @@
 +    virtual int               	GetLoadFlags() const { return mnLoadFlags; }
 +    virtual bool                NeedsArtificialBold() const { return mbArtBold; }
 +    virtual bool                NeedsArtificialItalic() const { return mbArtItalic; }
- 
+
      virtual void                FetchFontMetric( ImplFontMetricData&, long& rFactor ) const;
- 
+
 Index: vcl/unx/inc/salgdi.h
 diff -u vcl/unx/inc/salgdi.h:1.41 vcl/unx/inc/salgdi.h:1.41.206.2
---- vcl/unx/inc/salgdi.h:1.41	Wed Jun 27 13:41:23 2007
-+++ vcl/unx/inc/salgdi.h	Mon Jan 28 00:53:49 2008
-@@ -58,6 +58,8 @@
- #include <vcl/dllapi.h>
- #endif
- 
-+#include <deque>
-+
+--- vcl/unx/inc/salgdi.h.orig 2008-04-20 15:04:40.000000000 +0200
++++ vcl/unx/inc/salgdi.h  2008-04-20 15:07:00.000000000 +0200
+@@ -47,6 +47,7 @@
+ #include "tools/fract.hxx"
+ #include "vcl/dllapi.h"
  #include "xfont.hxx"
- 
++#include <deque>
+
  // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+ struct  ImplFontMetricData;
 @@ -78,6 +80,19 @@
- 
+
  // -=-= SalGraphicsData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
- 
+
 +class CairoFontsCache
 +{
 +private:
@@ -89,10 +88,10 @@
 -	void*           pRenderFormat_;
 +    void*           pRenderFormat_;
 +    CairoFontsCache m_aCairoFontsCache;
- 
+
      XLIB_Region     pPaintRegion_;
      XLIB_Region     pClipRegion_;
-@@ -198,6 +214,7 @@
+@@ -201,6 +201,7 @@
      void                    DrawServerSimpleFontString( const ServerFontLayout& );
      void                    DrawServerAAFontString( const ServerFontLayout& );
      bool                    DrawServerAAForcedString( const ServerFontLayout& );
@@ -105,9 +104,9 @@
 --- vcl/unx/source/gdi/salgdi3.cxx:1.149	Wed Dec 12 05:21:50 2007
 +++ vcl/unx/source/gdi/salgdi3.cxx	Thu Feb 28 10:37:07 2008
 @@ -123,6 +123,32 @@
- 
+
  #include <hash_set>
- 
+
 +struct cairo_surface_t;
 +struct cairo_t;
 +struct cairo_font_face_t;
@@ -135,11 +134,11 @@
 +    BOX extents;
 +};
  using namespace rtl;
- 
+
  // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 @@ -734,6 +760,306 @@
  }
- 
+
  //--------------------------------------------------------------------------
 +namespace {
 +
@@ -147,7 +146,7 @@
 +{
 +private:
 +    oslModule mpCairoLib;
-+    
++
 +    cairo_surface_t* (*mp_xlib_surface_create_with_xrender_format)(Display *, Drawable , Screen *, XRenderPictFormat *, int , int );
 +    void (*mp_surface_destroy)(cairo_surface_t *);
 +    cairo_t* (*mp_create)(cairo_surface_t *);
@@ -178,7 +177,7 @@
 +    cairo_t* create(cairo_surface_t *surface) { return (*mp_create)(surface); }
 +    void destroy(cairo_t *cr) { (*mp_destroy)(cr); }
 +    void clip(cairo_t *cr) { (*mp_clip)(cr); }
-+    void rectangle(cairo_t *cr, double x, double y, double width, double height) 
++    void rectangle(cairo_t *cr, double x, double y, double width, double height)
 +        { (*mp_rectangle)(cr, x, y, width, height); }
 +    cairo_font_face_t* ft_font_face_create_for_ft_face(FT_Face face, int load_flags)
 +        { return (*mp_ft_font_face_create_for_ft_face)(face, load_flags); }
@@ -215,7 +214,7 @@
 +    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;
@@ -226,11 +225,11 @@
 +    if( !mpCairoLib )
 +	return;
 +
-+    mp_xlib_surface_create_with_xrender_format = (cairo_surface_t* (*)(Display *, Drawable , Screen *, XRenderPictFormat *, int , int )) 
++    mp_xlib_surface_create_with_xrender_format = (cairo_surface_t* (*)(Display *, Drawable , Screen *, XRenderPictFormat *, int , int ))
 +        osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_xlib_surface_create_with_xrender_format" );
-+    mp_surface_destroy = (void(*)(cairo_surface_t*)) 
++    mp_surface_destroy = (void(*)(cairo_surface_t*))
 +        osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_surface_destroy" );
-+    mp_create = (cairo_t*(*)(cairo_surface_t*)) 
++    mp_create = (cairo_t*(*)(cairo_surface_t*))
 +        osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_create" );
 +    mp_destroy = (void(*)(cairo_t*))
 +        osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_destroy" );
@@ -257,7 +256,7 @@
 +    mp_set_source_rgb = (void (*)(cairo_t *, double , double , double ))
 +        osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_source_rgb" );
 +
-+    if( !( 
++    if( !(
 +            mp_xlib_surface_create_with_xrender_format &&
 +            mp_surface_destroy &&
 +            mp_create &&
@@ -394,8 +393,8 @@
 +    {
 +	for (long i = 0; i < pClipRegion_->numRects; ++i)
 +	{
-+            rCairo.rectangle(cr, 
-+                pClipRegion_->rects[i].x1, 
++            rCairo.rectangle(cr,
++                pClipRegion_->rects[i].x1,
 +                pClipRegion_->rects[i].y1,
 +                pClipRegion_->rects[i].x2 - pClipRegion_->rects[i].x1,
 +                pClipRegion_->rects[i].y2 - pClipRegion_->rects[i].y1);
@@ -403,8 +402,8 @@
 +        rCairo.clip(cr);
 +    }
 +
-+    rCairo.set_source_rgb(cr, 
-+        SALCOLOR_RED(nTextColor_)/255.0, 
++    rCairo.set_source_rgb(cr,
++        SALCOLOR_RED(nTextColor_)/255.0,
 +        SALCOLOR_GREEN(nTextColor_)/255.0,
 +        SALCOLOR_BLUE(nTextColor_)/255.0);
 +
@@ -441,13 +440,13 @@
 +}
 +
 +//--------------------------------------------------------------------------
- 
+
  void X11SalGraphics::DrawServerAAFontString( const ServerFontLayout& rLayout )
  {
 @@ -1111,15 +1437,20 @@
      // draw complex text
      ServerFont& rFont = rLayout.GetServerFont();
- 
+
 -    X11GlyphPeer& rGlyphPeer = X11GlyphCache::GetInstance().GetPeer();
 -    if( rGlyphPeer.GetGlyphSet( rFont, m_nScreen ) )
 -        DrawServerAAFontString( rLayout );
@@ -470,5 +469,5 @@
 +            DrawServerAAForcedString( rLayout );
 +    }
  }
- 
+
  //--------------------------------------------------------------------------