rpms/openoffice.org/devel openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch, NONE, 1.1 .cvsignore, 1.156, 1.157 openoffice.org.spec, 1.1478, 1.1479 sources, 1.281, 1.282
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Apr 15 15:59:04 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30169
Modified Files:
.cvsignore openoffice.org.spec sources
Added Files:
openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
Log Message:
add openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch:
--- NEW FILE openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch ---
diff -ru vcl/inc/vcl/glyphcache.hxx vcl/inc/vcl/glyphcache.hxx
--- openoffice.org.orig/vcl/inc/vcl/glyphcache.hxx 2008-04-15 08:44:36.000000000 +0100
+++ openoffice.org/vcl/inc/vcl/glyphcache.hxx 2008-04-15 16:24:06.000000000 +0100
@@ -105,8 +105,9 @@
struct IFSD_Hash{ size_t operator()( const ImplFontSelectData& ) const; };
typedef ::std::hash_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList;
FontList maFontList;
-
+public:
ULONG mnMaxSize; // max overall cache size in bytes
+private:
mutable ULONG mnBytesUsed;
mutable long mnLruIndex;
mutable int mnGlyphCount;
diff -ru vcl/inc/vcl/settings.hxx vcl/inc/vcl/settings.hxx
--- openoffice.org.orig/vcl/inc/vcl/settings.hxx 2008-04-15 08:44:37.000000000 +0100
+++ openoffice.org/vcl/inc/vcl/settings.hxx 2008-04-15 08:47:15.000000000 +0100
@@ -449,6 +449,7 @@
ULONG mnSymbolsStyle;
ULONG mnPreferredSymbolsStyle;
USHORT mnSkipDisabledInMenus;
+ const void* mpFontOptions;
};
// -----------------
@@ -746,6 +747,11 @@
BOOL GetSkipDisabledInMenus() const
{ return (BOOL) mpData->mnSkipDisabledInMenus; }
+ void SetCairoFontOptions( const void *pOptions )
+ { CopyData(); mpData->mpFontOptions = pOptions; }
+ const void* GetCairoFontOptions() const
+ { return mpData->mpFontOptions; }
+
void SetAppFont( const Font& rFont )
{ CopyData(); mpData->maAppFont = rFont; }
const Font& GetAppFont() const
diff -ru vcl/source/app/settings.cxx vcl/source/app/settings.cxx
--- openoffice.org.orig/vcl/source/app/settings.cxx 2008-04-15 08:44:34.000000000 +0100
+++ openoffice.org/vcl/source/app/settings.cxx 2008-04-15 08:48:27.000000000 +0100
@@ -466,6 +466,7 @@
mnToolbarIconSize = STYLE_TOOLBAR_ICONSIZE_UNKNOWN;
mnSymbolsStyle = STYLE_SYMBOLS_AUTO;
mnPreferredSymbolsStyle = STYLE_SYMBOLS_AUTO;
+ mpFontOptions = NULL;
SetStandardStyles();
}
@@ -568,6 +569,7 @@
mnToolbarIconSize = rData.mnToolbarIconSize;
mnSymbolsStyle = rData.mnSymbolsStyle;
mnPreferredSymbolsStyle = rData.mnPreferredSymbolsStyle;
+ mpFontOptions = rData.mpFontOptions;
}
// -----------------------------------------------------------------------
diff -ru vcl/source/window/winproc.cxx vcl/source/window/winproc.cxx
--- openoffice.org.orig/vcl/source/window/winproc.cxx 2008-04-15 08:44:34.000000000 +0100
+++ openoffice.org/vcl/source/window/winproc.cxx 2008-04-15 16:40:53.000000000 +0100
@@ -121,6 +121,7 @@
#ifndef _SV_MENU_HXX
#include <vcl/menu.hxx>
#endif
+#include <vcl/glyphcache.hxx>
#include <dndlcon.hxx>
@@ -2255,9 +2256,14 @@
nType = DATACHANGED_DISPLAY;
break;
case SALEVENT_FONTCHANGED:
+ {
+ ULONG nOldSize = GlyphCache::GetInstance().mnMaxSize;
+ GlyphCache::GetInstance().mnMaxSize = 0;
OutputDevice::ImplUpdateAllFontData( TRUE );
+ GlyphCache::GetInstance().mnMaxSize = nOldSize;
nType = DATACHANGED_FONTS;
break;
+ }
case SALEVENT_DATETIMECHANGED:
nType = DATACHANGED_DATETIME;
break;
diff -ru vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 2008-04-15 08:44:28.000000000 +0100
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 2008-04-15 16:21:17.000000000 +0100
@@ -3286,6 +3287,11 @@
aStyleSet.GetWindowColor().IsDark() );
aStyleSet.SetHighContrastMode( bHC );
+ const cairo_font_options_t *pNewOptions = 0;
+ if (GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ))
+ pNewOptions = gdk_screen_get_font_options(pScreen);
+ aStyleSet.SetCairoFontOptions( pNewOptions );
+
// finally update the collected settings
rSettings.SetStyleSettings( aStyleSet );
diff -ru vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 2008-04-15 08:44:28.000000000 +0100
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 2008-04-15 16:38:26.000000000 +0100
@@ -2942,10 +2942,13 @@
// redraw itself to adjust to the new style
// where there IS no new style resulting in tremendous unnecessary flickering
if( pPrevious != NULL )
+ {
// signalStyleSet does NOT usually have the gdk lock
// so post user event to safely dispatch the SALEVENT_SETTINGSCHANGED
// note: settings changed for multiple frames is avoided in winproc.cxx ImplHandleSettings
pThis->getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_SETTINGSCHANGED );
+ pThis->getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_FONTCHANGED );
+ }
/* #i64117# gtk sets a nice background pixmap
* but we actually don't really want that, so save
diff -ru vcl/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salgdi3.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/salgdi3.cxx 2008-04-15 08:44:29.000000000 +0100
+++ openoffice.org/vcl/unx/source/gdi/salgdi3.cxx 2008-04-15 11:58:46.000000000 +0100
@@ -782,6 +782,7 @@
void (*mp_set_font_matrix)(cairo_t *, const cairo_matrix_t *);
void (*mp_show_glyphs)(cairo_t *, const cairo_glyph_t *, int );
void (*mp_set_source_rgb)(cairo_t *, double , double , double );
+ void (*mp_set_font_options)(cairo_t *, const void *);
bool canEmbolden() const { return false; }
@@ -817,6 +818,8 @@
{ (*mp_show_glyphs)(cr, glyphs, no_glyphs); }
void set_source_rgb(cairo_t *cr, double red, double green, double blue)
{ (*mp_set_source_rgb)(cr, red, green, blue); }
+ void set_font_options(cairo_t *cr, const void *options)
+ { (*mp_set_font_options)(cr, options); }
};
static CairoWrapper* pCairoInstance = NULL;
@@ -875,6 +878,8 @@
osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_show_glyphs" );
mp_set_source_rgb = (void (*)(cairo_t *, double , double , double ))
osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_source_rgb" );
+ mp_set_font_options = (void (*)(cairo_t *, const void *options ))
+ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_font_options" );
if( !(
mp_xlib_surface_create_with_xrender_format &&
@@ -891,7 +896,8 @@
mp_matrix_rotate &&
mp_set_font_matrix &&
mp_show_glyphs &&
- mp_set_source_rgb
+ mp_set_source_rgb &&
+ mp_set_font_options
) )
{
osl_unloadModule( mpCairoLib );
@@ -1009,6 +1015,9 @@
cairo_t *cr = rCairo.create(surface);
rCairo.surface_destroy(surface);
+ if (const void *pOptions = Application::GetSettings().GetStyleSettings().GetCairoFontOptions())
+ rCairo.set_font_options(cr, pOptions);
+
if( pClipRegion_ && !XEmptyRegion( pClipRegion_ ) )
{
for (long i = 0; i < pClipRegion_->numRects; ++i)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- .cvsignore 14 Apr 2008 08:55:31 -0000 1.156
+++ .cvsignore 15 Apr 2008 15:58:21 -0000 1.157
@@ -4,4 +4,3 @@
Tigert-templates.tar.gz
unowinreg.dll
bengali.sdf
-DEV300_m6.tar.bz2
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1478
retrieving revision 1.1479
diff -u -r1.1478 -r1.1479
--- openoffice.org.spec 14 Apr 2008 13:31:43 -0000 1.1478
+++ openoffice.org.spec 15 Apr 2008 15:58:21 -0000 1.1479
@@ -1,5 +1,5 @@
%define oootag DEV300
-%define ooomilestone 6
+%define ooomilestone 7
%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
@@ -140,6 +140,7 @@
Patch67: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
Patch68: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
Patch69: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+Patch70: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1249,6 +1250,7 @@
%patch67 -p1 -b .ooo85691.vcl.tooltipcolor.patch
%patch68 -p1 -b .ooo87991.fpickersafe.patch
%patch69 -p1 -b .ooo88260.decl-defi-mismatch.patch
+%patch70 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3279,11 +3281,12 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Mon Apr 14 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.6.1
+* Tue Apr 15 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.7.1
- next version
- drop integrated openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
- extend selinux bodge to s390x
- add openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+- add openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
* Wed Apr 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.4
- Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- sources 15 Apr 2008 14:40:47 -0000 1.281
+++ sources 15 Apr 2008 15:58:21 -0000 1.282
@@ -4,5 +4,4 @@
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
0c0e868b34329d90a7c9a92f1704775c bengali.sdf
-53242099a96ddb9921175ebb469fcc89 DEV300_m6.tar.bz2
2933c0f42c5d29989494d14097bab0bf DEV300_m7.tar.bz2
More information about the fedora-extras-commits
mailing list