vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit a4053378b7a98d8a18415ba5acd8b69ba28793a2
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Tue Nov 13 14:04:58 2012 +0100
Solve scope issues with older gtk
Change-Id: Icceb9586b4051009a8843b4672b79daf22e07830
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index c1bdf3c..d8c1f69 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -4028,9 +4028,14 @@ void GtkSalGraphics::updateSettings( AllSettings&
rSettings )
static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) =
(cairo_font_options_t*(*)(GdkScreen*))osl_getAsciiFunctionSymbol(
GetSalData()->m_pPlugin, "gdk_screen_get_font_options" );
if( gdk_screen_get_font_options != NULL )
-#endif
+ {
const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options(
pScreen );
+ aStyleSet.SetCairoFontOptions( pNewOptions );
+ }
+#else
+ const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options(
pScreen );
aStyleSet.SetCairoFontOptions( pNewOptions );
+#endif
// finally update the collected settings
rSettings.SetStyleSettings( aStyleSet );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
