ooo-build r13317 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Jul 21 08:14:22 2008
New Revision: 13317
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13317&view=rev

Log:
	* patches/dev300/apply:
	* patches/dev300/vcl-cairofont-transform-fix.diff: 
	* patches/dev300/tools-resmgr-expansion-fix.diff: took two
	important fixes from cmcfixes46, that's currently targetted at
	3.1. Fixes missing text in gtk dialogs, and messed font transform
	on eps export.	



Added:
   trunk/patches/dev300/tools-resmgr-expansion-fix.diff
   trunk/patches/dev300/vcl-cairofont-transform-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 21 08:14:22 2008
@@ -1934,6 +1934,7 @@
 # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
 ooo59127.vcl.honourcairofont.diff
 vcl-cairofont-multiscreen-fix.diff, thorsten
+vcl-cairofont-transform-fix.diff, i#90037, caolan
 
 [ GStreamer ]
 SectionOwner => rodo
@@ -2573,6 +2574,7 @@
 officecfg-bighandles-default.diff, thorsten
 config_office-msvc-compat.diff, thorsten
 config_office-disable-atl.diff, thorsten
+tools-resmgr-expansion-fix.diff, i#90178, caolan
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
 

Added: trunk/patches/dev300/tools-resmgr-expansion-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/tools-resmgr-expansion-fix.diff	Mon Jul 21 08:14:22 2008
@@ -0,0 +1,11 @@
+--- tools/inc/tools/resmgr.hxx	11 Apr 2008 13:28:38 -0000	1.5
++++ tools/inc/tools/resmgr.hxx	4 Jun 2008 08:14:03 -0000	1.5.20.1
+@@ -38,7 +38,7 @@
+ #include <com/sun/star/lang/Locale.hpp>
+ 
+ #define CREATEVERSIONRESMGR_NAME( Name )   #Name
+-#define CREATEVERSIONRESMGR( Name ) 	   ResMgr::CreateResMgr( #Name )
++#define CREATEVERSIONRESMGR( Name )        ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( Name ) )
+ 
+ #define LOCALE_MAX_FALLBACK 6
+ 

Added: trunk/patches/dev300/vcl-cairofont-transform-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vcl-cairofont-transform-fix.diff	Mon Jul 21 08:14:22 2008
@@ -0,0 +1,98 @@
+--- vcl/source/glyphs/gcach_ftyp.cxx	2008-05-26 15:17:03.000000000 +0100
++++ vcl/source/glyphs/gcach_ftyp.cxx	2008-06-03 13:01:17.000000000 +0100
+@@ -522,7 +522,10 @@
+ void* FreetypeServerFont::GetFtFace() const
+ {
+     if( maSizeFT )
++    {
+         pFTActivateSize( maSizeFT );
++        FT_Set_Transform( maFaceFT, NULL, NULL );
++    }
+ 
+     return maFaceFT;
+ }
+@@ -742,6 +745,7 @@
+     {
+         pFTNewSize( maFaceFT, &maSizeFT );
+         pFTActivateSize( maSizeFT );
++        FT_Set_Transform( maFaceFT, NULL, NULL );
+     }
+     FT_Error rc = FT_Set_Pixel_Sizes( maFaceFT, mnWidth, rFSD.mnHeight );
+     if( rc != FT_Err_Ok )
+@@ -975,7 +979,10 @@
+     }
+ 
+     if( maSizeFT )
++    {
+         pFTActivateSize( maSizeFT );
++        FT_Set_Transform( maFaceFT, NULL, NULL );
++    }
+ 
+     rFactor = 0x100;
+ 
+@@ -1294,7 +1304,10 @@
+ void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
+ {
+     if( maSizeFT )
++    {
+         pFTActivateSize( maSizeFT );
++        FT_Set_Transform( maFaceFT, NULL, NULL );
++    }
+ 
+     int nGlyphFlags;
+     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
+@@ -1382,7 +1395,10 @@
+ bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap ) const
+ {
+     if( maSizeFT )
++    {
+         pFTActivateSize( maSizeFT );
++        FT_Set_Transform( maFaceFT, NULL, NULL );
++    }
+ 
+     int nGlyphFlags;
+     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
+@@ -1542,7 +1558,10 @@
+ bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap ) const
+ {
+     if( maSizeFT )
++    {
+         pFTActivateSize( maSizeFT );
++        FT_Set_Transform( maFaceFT, NULL, NULL );
++    }
+ 
+     int nGlyphFlags;
+     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
+@@ -1796,7 +1815,10 @@
+     // when font faces of different sizes share the same maFaceFT
+     // then we have to make sure that it uses the correct maSizeFT
+     if( maSizeFT )
++    {
+         pFTActivateSize( maSizeFT );
++        FT_Set_Transform( maFaceFT, NULL, NULL );
++    }
+ 
+     // use Freetype's kerning info
+     FT_Vector aKernVal;
+@@ -1831,7 +1853,10 @@
+     // when font faces of different sizes share the same maFaceFT
+     // then we have to make sure that it uses the correct maSizeFT
+     if( maSizeFT )
++    {
+         pFTActivateSize( maSizeFT );
++        FT_Set_Transform( maFaceFT, NULL, NULL );
++    }
+ 
+     // first figure out which glyph pairs are involved in kerning
+     ULONG nKernLength = 0;
+@@ -2231,7 +2257,10 @@
+     ::basegfx::B2DPolyPolygon& rB2DPolyPoly ) const
+ {
+     if( maSizeFT )
++    {
+         pFTActivateSize( maSizeFT );
++	FT_Set_Transform( maFaceFT, NULL, NULL );
++    }
+ 
+     rB2DPolyPoly.clear();
+