ooo-build r12911 - in trunk: . patches/dev300
- From: thorstenb svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12911 - in trunk: . patches/dev300
- Date: Tue, 17 Jun 2008 10:46:07 +0000 (UTC)
Author: thorstenb
Date: Tue Jun 17 10:46:07 2008
New Revision: 12911
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12911&view=rev
Log:
* patches/dev300/vcl-cairofont-multiscreen-fix.diff:
* patches/dev300/apply: call
xlib_surface_create_with_xrender_format with the right screen.
Added:
trunk/patches/dev300/vcl-cairofont-multiscreen-fix.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Tue Jun 17 10:46:07 2008
@@ -1655,7 +1655,7 @@
[ CairoFonts ]
# needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
ooo59127.vcl.honourcairofont.diff
-
+vcl-cairofont-multiscreen-fix.diff, thorsten
[ GStreamer ]
SectionOwner => rodo
Added: trunk/patches/dev300/vcl-cairofont-multiscreen-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vcl-cairofont-multiscreen-fix.diff Tue Jun 17 10:46:07 2008
@@ -0,0 +1,11 @@
+--- vcl/unx/source/gdi/salgdi3.cxx
++++ vcl/unx/source/gdi/salgdi3.cxx
+@@ -944,7 +944,7 @@ void X11SalGraphics::DrawCairoAAFontString( const ServerFontLayout& rLayout )
+ Display* pDisplay = GetXDisplay();
+
+ cairo_surface_t *surface = rCairo.xlib_surface_create_with_xrender_format (pDisplay,
+- hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, 1, 1);
++ hDrawable_, ScreenOfDisplay(pDisplay, m_nScreen), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
+
+ /*
+ * It might be ideal to cache surface and cairo context between calls and
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]