rpms/openoffice.org/devel openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.15, 1.16 openoffice.org.spec, 1.1150, 1.1151
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 4 12:40:46 UTC 2007
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5319
Modified Files:
openoffice.org-1.9.129.ooo54603.fontconfig.patch
openoffice.org.spec
Log Message:
Resolves: rhbz#223190 make a final fallback to a font with a known working notdet glyph
openoffice.org-1.9.129.ooo54603.fontconfig.patch:
OOE680_m6/psprint/inc/psprint/fontmanager.hxx | 11
OOE680_m6/psprint/source/fontmanager/fontcache.cxx | 2
OOE680_m6/psprint/source/fontmanager/fontconfig.cxx | 410 +++++++++++++++----
OOE680_m6/psprint/source/fontmanager/fontmanager.cxx | 9
OOE680_m6/vcl/inc/outdev.h | 2
OOE680_m6/vcl/inc/outfont.hxx | 15
OOE680_m6/vcl/inc/sallayout.hxx | 1
OOE680_m6/vcl/source/gdi/outdev3.cxx | 367 ++++++++++++-----
OOE680_m6/vcl/source/gdi/sallayout.cxx | 46 ++
OOE680_m6/vcl/source/glyphs/gcach_layout.cxx | 12
OOE680_m6/vcl/source/window/window.cxx | 5
OOE680_m6/vcl/util/makefile.mk | 2
vcl/inc/sallayout.hxx | 3
vcl/source/gdi/outdev3.cxx | 11
vcl/source/gdi/sallayout.cxx | 19
15 files changed, 740 insertions(+), 175 deletions(-)
Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch 23 Jan 2007 12:15:33 -0000 1.15
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch 4 Apr 2007 12:40:42 -0000 1.16
@@ -210,7 +210,7 @@
DBG_ASSERT( (pFontFamily != NULL), "ImplFontCache::Get() No logical font found!" );
if( pFontFamily )
aFontSelData.maSearchName = pFontFamily->GetSearchName();
-@@ -3024,115 +3146,121 @@
+@@ -3024,115 +3146,143 @@
// -----------------------------------------------------------------------
ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList,
@@ -336,7 +336,29 @@
- }
+ if ( !cached )
+ {
-+ String aName(GetFcSubstitute( aSelData, aGlyphs ));
++ String aName;
++ if (nFallbackLevel != MAX_FALLBACK -1)
++ aName = GetFcSubstitute( aSelData, aGlyphs );
++ else
++ {
++ /*
++ There is no font that can handle this, to be safe let's set a font
++ which has a known working .notdef glyph
++ */
++ const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
++ std::vector<sal_Unicode> aDummy;
++ std::vector<String> aNames;
++ aNames.push_back(String(RTL_CONSTASCII_USTRINGPARAM("Sazanami Gothic")));
++ aName = rMgr.Substitute(aNames, aDummy, ByteString(),
++ psp::italic::Unknown, psp::weight::Unknown, psp::width::Unknown, psp::pitch::Unknown);
++ if (aName != String(RTL_CONSTASCII_USTRINGPARAM("Sazanami Gothic")))
++ {
++ aNames.clear();
++ aNames.push_back(OUString(RTL_CONSTASCII_USTRINGPARAM("DejaVu LGC Sans")));
++ aName = rMgr.Substitute(aNames, aDummy, ByteString(),
++ psp::italic::Unknown, psp::weight::Unknown, psp::width::Unknown, psp::pitch::Unknown);
++ }
++ }
+ if (aName.Len())
+ aSelData.maSearchName = aName;
+ }
@@ -1463,23 +1485,3 @@
// prepare merging components
nStartNew[ nLevel ] = nStartOld[ nLevel ] = 0;
-@@ -1745,7 +1758,8 @@
- (!maFallbackRuns[ n ].PosIsInAnyRun( nCharPos[0] ) )
- )
- {
-- mpLayouts[0]->DropGlyph( nStartOld[0] );
-+ if (!(mbInComplete && (n == mnLevel-1)))
-+ mpLayouts[0]->DropGlyph( nStartOld[0] );
- nStartOld[0] = nStartNew[0];
- nValid[0] = mpLayouts[0]->GetNextGlyphs( 1, &nDummy, aPos,
- nStartNew[0], &nGlyphAdv[0], &nCharPos[0] );
-@@ -1864,7 +1878,8 @@
-
- void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const
- {
-- for( int i = mnLevel; --i >= 0; )
-+ int nLevel = mbInComplete ? mnLevel-1 : mnLevel;
-+ for( int i = nLevel; --i >= 0; )
- {
- SalLayout& rLayout = *mpLayouts[ i ];
- rLayout.DrawBase() = maDrawBase;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1150
retrieving revision 1.1151
diff -u -r1.1150 -r1.1151
--- openoffice.org.spec 3 Apr 2007 11:28:57 -0000 1.1150
+++ openoffice.org.spec 4 Apr 2007 12:40:42 -0000 1.1151
@@ -1,11 +1,11 @@
%define oootag OOF680
%define ooomilestone 14
-%define rh_rpm_release 3
+%define rh_rpm_release 4
# gcc#19664#
%define stlvisibilityfcked 1
# undef to get english only and no-langpacks for a quick smoketest build
-%define langpacks 1
+%define langpacks 0
# undef to revert to the traditional print dialog
%define gtkprintui 1
# undef to revert from combining startup libs into a single libsoffice
@@ -25,7 +25,8 @@
%define ooo_base_name %{oootag}_m%{ooomilestone}
-ExclusiveArch: ppc %{ix86} x86_64
+#ExclusiveArch: ppc %{ix86} x86_64
+ExclusiveArch: %{ix86}
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
Version: 2.2.0
@@ -2634,6 +2635,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Wed Apr 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.4
+- Resolves: rhbz#223190 make a final fallback to a font with a known
+ working notdef glyph
+
* Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.3
- Resolves: rhbz#233944 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
- add aliases for the english autocorrect files
@@ -2688,7 +2693,8 @@
- a better fix for the persistant visibility markup problem
* Wed Feb 21 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-8.3
-- add workspace.configrefactor01.patch and knock approx 1/2 sec off warm start
+- add workspace.configrefactor01.patch and knock .1 sec off warm start
+ http://people.redhat.com/caolanm/speed/configmgr.refactor.ods
* Tue Feb 20 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-8.2
- ooo#74692 64bit form controls
More information about the fedora-cvs-commits
mailing list