ooo-build r12389 - in branches/ooo-build-2-4: . patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue Apr 29 20:14:46 2008
New Revision: 12389
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12389&view=rev

Log:
	* patches/src680/cairo-canvas-use-window-screen.diff: removed
	unused function, moved include out of namespace decl



Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/cairo-canvas-use-window-screen.diff

Modified: branches/ooo-build-2-4/patches/src680/cairo-canvas-use-window-screen.diff
==============================================================================
--- branches/ooo-build-2-4/patches/src680/cairo-canvas-use-window-screen.diff	(original)
+++ branches/ooo-build-2-4/patches/src680/cairo-canvas-use-window-screen.diff	Tue Apr 29 20:14:46 2008
@@ -13,15 +13,13 @@
 diff -rup canvas/source/cairo-orig/cairo_helper.cxx canvas/source/cairo/cairo_helper.cxx
 --- canvas/source/cairo-orig/cairo_helper.cxx	2008-04-28 18:00:30.000000000 +0200
 +++ canvas/source/cairo/cairo_helper.cxx	2008-04-28 18:11:31.000000000 +0200
-@@ -38,6 +38,7 @@
- #include <X11/Xutil.h>
- 
- #include <cairo.h>
-+#include <cairo_helper.hxx>
- #include <cairo-xlib.h>
+@@ -57,13 +57,19 @@ namespace cairo {
+ #endif
+ }
  
- #ifdef CAIRO_HAS_GLITZ_SURFACE
-@@ -63,9 +64,18 @@ using namespace ::cairo;
++#include "cairo_helper.hxx"
++
+ using namespace ::cairo;
  
  //#define OOO_CANVAS_GLITZ 1
  
@@ -34,15 +32,10 @@
 +    XGetWindowAttributes( (::cairo::Display*) cairoHelperGetDisplay( pSysData ), cairoHelperGetWindow( pSysData ), &aWA );
 +
 +    return aWA.screen;
-+}
-+
-+int cairoHelperGetScreenNumber( const void* pSysData )
-+{
-+    return XScreenNumberOfScreen( (::cairo::Screen*) cairoHelperGetScreen( pSysData ) );
  }
  
  void*
-@@ -76,7 +86,7 @@ cairoHelperGetGlitzDrawable( const Syste
+@@ -74,7 +80,7 @@ cairoHelperGetGlitzDrawable( const Syste
      Display* display = (Display*) pSysData->pDisplay;
      ::cairo::Window window = pSysData->aWindow;
      VisualID vid = XVisualIDFromVisual( (Visual*) pSysData->pVisual );
@@ -54,11 +47,9 @@
 diff -rup canvas/source/cairo-orig/cairo_helper.hxx canvas/source/cairo/cairo_helper.hxx
 --- canvas/source/cairo-orig/cairo_helper.hxx	2008-04-28 18:00:30.000000000 +0200
 +++ canvas/source/cairo/cairo_helper.hxx	2008-04-28 18:10:10.000000000 +0200
-@@ -1,4 +1,5 @@
+@@ -1,4 +1,4 @@
 -int   cairoHelperGetDefaultScreen( void* display );
 +void* cairoHelperGetScreen( const void* pSysData );
-+int   cairoHelperGetScreenNumber( const void* pSysData );
  void* cairoHelperGetGlitzDrawable( const void* pSysData, int width, int height );
  void* cairoHelperGetGlitzSurface( const void* pSysData, void *drawable, int x, int y, int width, int height );
  void* cairoHelperGetSurface( const void* pSysData, int x, int y, int width, int height );
-Only in canvas/source/cairo: cairo_helper.hxx.~1.2.~