rpms/openoffice.org/devel workspace.vcl39.patch,1.7,1.8
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Aug 17 08:14:36 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10388
Modified Files:
workspace.vcl39.patch
Log Message:
patch wasn't fully applied in merge
workspace.vcl39.patch:
padmin/source/fontentry.cxx | 6
psprint/inc/psprint/fontmanager.hxx | 2
psprint/source/fontmanager/fontcache.cxx | 38 --
psprint/source/fontmanager/fontconfig.cxx | 7
psprint/source/fontmanager/fontmanager.cxx | 17 -
psprint/source/fontsubset/sft.c | 8
psprint/source/fontsubset/sft.h | 2
toolkit/source/awt/vclxtoolkit.cxx | 5
vcl/inc/salframe.hxx | 2
vcl/inc/sallayout.hxx | 10
vcl/inc/scrbar.hxx | 1
vcl/inc/window.hxx | 2
vcl/source/app/stdtext.cxx | 5
vcl/source/app/svapp.cxx | 5
vcl/source/app/svdata.cxx | 41 +-
vcl/source/control/button.cxx | 52 ++-
vcl/source/control/edit.cxx | 6
vcl/source/control/ilstbox.cxx | 29 -
vcl/source/control/scrbar.cxx | 88 +++--
vcl/source/gdi/bmpfast.cxx | 34 +-
vcl/source/gdi/sallayout.cxx | 49 ++
vcl/source/window/brdwin.cxx | 7
vcl/source/window/menu.cxx | 63 ++-
vcl/source/window/msgbox.cxx | 23 +
vcl/source/window/scrwnd.cxx | 11
vcl/source/window/splitwin.cxx | 15
vcl/source/window/window.cxx | 5
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 33 -
vcl/unx/gtk/window/gtkframe.cxx | 92 +++--
vcl/unx/inc/plugins/gtk/gtkframe.hxx | 1
vcl/unx/inc/salframe.h | 1
vcl/unx/inc/wmadaptor.hxx | 21 +
vcl/unx/source/app/soicon.cxx | 3
vcl/unx/source/app/wmadaptor.cxx | 111 ++++++
vcl/unx/source/gdi/pspgraphics.cxx | 2
vcl/unx/source/gdi/xfont.cxx | 5
vcl/unx/source/window/salframe.cxx | 37 ++
vcl/win/inc/salgdi.h | 1
vcl/win/source/gdi/salgdi.cxx | 2
vcl/win/source/gdi/salgdi3.cxx | 274 ++++++++++++----
vcl/win/source/gdi/winlayout.cxx | 492 ++++++++++++++++++-----------
vcl/win/source/window/salframe.cxx | 15
42 files changed, 1148 insertions(+), 475 deletions(-)
Index: workspace.vcl39.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.vcl39.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- workspace.vcl39.patch 15 Aug 2005 13:16:59 -0000 1.7
+++ workspace.vcl39.patch 17 Aug 2005 08:14:34 -0000 1.8
@@ -48,6 +48,101 @@
italic::type m_eItalic;
width::type m_eWidth;
weight::type m_eWeight;
+Index: source/fontmanager/fontcache.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/fontcache.cxx,v
+retrieving revision 1.12
+retrieving revision 1.12.14.2
+diff -u -p -u -r1.12 -r1.12.14.2
+--- openoffice.org.orig/psprint/source/fontmanager/fontcache.cxx 31 Jan 2005 08:59:14 -0000 1.12
++++ openoffice.org/psprint/source/fontmanager/fontcache.cxx 22 Mar 2005 10:26:15 -0000 1.12.14.2
+@@ -203,7 +203,7 @@ void FontCache::flush()
+ /*
+ * for each font entry write:
+ * name[;name[;name]]
+- * fontnr;PSName;italic;weight;width;pitch;encoding;ascend;descend;leading;vsubst;gxw;gxh;gyw;gyh;useroverrride[;{metricfile,typeflags}]
++ * fontnr;PSName;italic;weight;width;pitch;encoding;ascend;descend;leading;vsubst;gxw;gxh;gyw;gyh;useroverrride[;{metricfile,typeflags}][;stylename]
+ */
+ if( nEntrySize > 1 )
+ nSubEntry = static_cast<const PrintFontManager::TrueTypeFontFile*>(*it)->m_nCollectionEntry;
+@@ -267,6 +267,11 @@ void FontCache::flush()
+ break;
+ default: break;
+ }
++ if( (*it)->m_aStyleName.getLength() )
++ {
++ aLine.Append( ';' );
++ aLine.Append( ByteString( String( (*it)->m_aStyleName ), RTL_TEXTENCODING_UTF8 ) );
++ }
+ aStream.WriteLine( aLine );
+ }
+ aStream.WriteLine( ByteString() );
+@@ -467,6 +472,8 @@ void FontCache::read()
+ break;
+ default: break;
+ }
++ if( nIndex != STRING_NOTFOUND )
++ pFont->m_aStyleName = String( aLine.Copy( nIndex ), RTL_TEXTENCODING_UTF8 );
+
+ bool bObsolete = false;
+ if( bKeepOnlyUserOverridden )
+@@ -492,32 +499,6 @@ void FontCache::read()
+ else
+ bObsolete = true;
+ }
+- FontCacheEntry& rEntry = (*pDir)[aFile].m_aEntry;
+- if( ! bObsolete )
+- {
+- /*
+- * #i20287# duplicate lines could exist because of
+- * fontcache code prior to OOo 1.1.1, ignore them
+- */
+- for( FontCacheEntry::const_iterator entry = rEntry.begin();
+- entry != rEntry.end() && ! bObsolete; ++entry )
+- {
+- const PrintFontManager::PrintFont* pOld = *entry;
+- if( pOld->m_eType == pFont->m_eType &&
+- pOld->m_nFamilyName == pFont->m_nFamilyName &&
+- pOld->m_nPSName == pFont->m_nPSName &&
+- pOld->m_eItalic == pFont->m_eItalic &&
+- pOld->m_eWidth == pFont->m_eWidth &&
+- pOld->m_ePitch == pFont->m_ePitch &&
+- pOld->m_aEncoding == pFont->m_aEncoding &&
+- pOld->m_bFontEncodingOnly == pFont->m_bFontEncodingOnly &&
+- pOld->m_nAscend == pFont->m_nAscend &&
+- pOld->m_nDescend == pFont->m_nDescend
+- )
+- bObsolete = true;
+- }
+- }
+-
+ if( bObsolete )
+ {
+ m_bDoFlush = true;
+@@ -528,6 +509,7 @@ void FontCache::read()
+ continue;
+ }
+
++ FontCacheEntry& rEntry = (*pDir)[aFile].m_aEntry;
+ rEntry.push_back( pFont );
+ }
+ }
+@@ -575,6 +557,7 @@ void FontCache::copyPrintFont( const Pri
+ default: break;
+ }
+ pTo->m_nFamilyName = pFrom->m_nFamilyName;
++ pTo->m_aStyleName = pFrom->m_aStyleName;
+ pTo->m_aAliases = pFrom->m_aAliases;
+ pTo->m_nPSName = pFrom->m_nPSName;
+ pTo->m_eItalic = pFrom->m_eItalic;
+@@ -637,6 +620,7 @@ bool FontCache::equalsPrintFont( const P
+ default: break;
+ }
+ if( pRight->m_nFamilyName != pLeft->m_nFamilyName ||
++ pRight->m_aStyleName != pLeft->m_aStyleName ||
+ pRight->m_nPSName != pLeft->m_nPSName ||
+ pRight->m_eItalic != pLeft->m_eItalic ||
+ pRight->m_eWeight != pLeft->m_eWeight ||
Index: source/fontmanager/fontconfig.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
More information about the fedora-cvs-commits
mailing list