ooo-build r15229 - in trunk: . patches/dev300 patches/emf+

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 22:31:36 2009
New Revision: 15229
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15229&view=rev

Log:
2009-01-28  Kohei Yoshida  <kyoshida novell com>

	* patches/emf+/emf+-vcl-renderer-m39.diff:
	* patches/emf+/emf+-vcl-renderer.diff:
	* patches/dev300/apply: adjusted for dev300-m40.  The old patch applied,
	but to the wrong method of the class which caused the build to break.


Added:
   trunk/patches/emf+/emf+-vcl-renderer-m39.diff   (props changed)
      - copied unchanged from r15227, /trunk/patches/emf+/emf+-vcl-renderer.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/emf+/emf+-vcl-renderer.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 22:31:36 2009
@@ -2867,7 +2867,14 @@
 emf+-cppcanvas-emfplus.diff
 emf+-offapi-renderer.diff
 emf+-vcl-bitmap.diff
+
+[ EMFPlus <= dev300-m39 ]
+emf+-vcl-renderer-m39.diff
+
+[ EMFPlus > dev300-m39 ]
 emf+-vcl-renderer.diff
+
+[ EMFPlus ]
 emf+-svtools.diff
 emf+-scp2-renderer.diff
 emf+-crash-fix.diff, n#361534, rodo

Modified: trunk/patches/emf+/emf+-vcl-renderer.diff
==============================================================================
--- trunk/patches/emf+/emf+-vcl-renderer.diff	(original)
+++ trunk/patches/emf+/emf+-vcl-renderer.diff	Wed Jan 28 22:31:36 2009
@@ -1,7 +1,8 @@
-diff -rup vcl-orig/inc/vcl/gdimtf.hxx vcl/inc/vcl/gdimtf.hxx
---- vcl-orig/inc/vcl/gdimtf.hxx	2007-11-09 16:53:41.000000000 +0100
-+++ vcl/inc/vcl/gdimtf.hxx	2007-11-07 18:06:27.000000000 +0100
-@@ -156,6 +156,7 @@ private:
+diff --git vcl/inc/vcl/gdimtf.hxx vcl/inc/vcl/gdimtf.hxx
+index e2725f7..ea7bb10 100644
+--- vcl/inc/vcl/gdimtf.hxx
++++ vcl/inc/vcl/gdimtf.hxx
+@@ -138,6 +138,7 @@ private:
                                                        const OutputDevice&   rMapDev,
                                                        const PolyPolygon&    rPolyPoly,
                                                        const Gradient&	  	rGrad 		);
@@ -9,10 +10,11 @@
  
  //#endif // __PRIVATE
  
-diff -rup vcl-orig/source/gdi/gdimtf.cxx vcl/source/gdi/gdimtf.cxx
---- vcl-orig/source/gdi/gdimtf.cxx	2007-11-09 16:53:43.000000000 +0100
-+++ vcl/source/gdi/gdimtf.cxx	2007-11-09 17:09:31.000000000 +0100
-@@ -66,12 +66,24 @@
+diff --git vcl/source/gdi/gdimtf.cxx vcl/source/gdi/gdimtf.cxx
+index 9b01973..4a96d90 100644
+--- vcl/source/gdi/gdimtf.cxx
++++ vcl/source/gdi/gdimtf.cxx
+@@ -38,12 +38,24 @@
  #include <vcl/salbtype.hxx>
  #include <vcl/outdev.hxx>
  #include <vcl/window.hxx>
@@ -39,7 +41,7 @@
  
  // -----------
  // - Defines -
-@@ -502,6 +541,76 @@ void GDIMetaFile::Play( OutputDevice* pO
+@@ -478,6 +490,76 @@ void GDIMetaFile::Play( OutputDevice* pOut, ULONG nPos )
  
  // ------------------------------------------------------------------------
  
@@ -116,7 +118,7 @@
  void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos,
  						const Size& rSize, ULONG nPos )
  {
-@@ -511,8 +619,12 @@ void GDIMetaFile::Play( OutputDevice* pO
+@@ -487,8 +569,12 @@ void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos,
  
  	if( aDestSize.Width() && aDestSize.Height() )
  	{
@@ -131,21 +133,23 @@
  
  		if( !aTmpPrefSize.Width() )
  			aTmpPrefSize.Width() = aDestSize.Width();
-diff -rup vcl-orig/source/gdi/makefile.mk vcl/source/gdi/makefile.mk
---- vcl-orig/source/gdi/makefile.mk	2007-11-09 16:53:43.000000000 +0100
-+++ vcl/source/gdi/makefile.mk	2007-11-07 11:06:41.000000000 +0100
-@@ -125,6 +126,7 @@ SLOFILES=	$(SLO)$/salmisc.obj 	\
- 
- EXCEPTIONSFILES=	$(SLO)$/outdev.obj		\
+diff --git vcl/source/gdi/makefile.mk vcl/source/gdi/makefile.mk
+index d1fb059..d34bbc1 100644
+--- vcl/source/gdi/makefile.mk
++++ vcl/source/gdi/makefile.mk
+@@ -117,6 +117,7 @@ SLOFILES=	$(SLO)$/salmisc.obj 	\
+ EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
+                     $(SLO)$/outdev.obj		\
  					$(SLO)$/outdev3.obj 	\
 +					$(SLO)$/gdimtf.obj 	\
  					$(SLO)$/gfxlink.obj		\
  					$(SLO)$/print.obj		\
                      $(SLO)$/print2.obj		\
-diff -rup vcl-orig/source/gdi/metaact.cxx vcl/source/gdi/metaact.cxx
---- vcl-orig/source/gdi/metaact.cxx	2007-11-09 16:53:43.000000000 +0100
-+++ vcl/source/gdi/metaact.cxx	2007-11-10 13:44:40.000000000 +0100
-@@ -4041,8 +4047,34 @@ void MetaCommentAction::Scale( double fX
+diff --git vcl/source/gdi/metaact.cxx vcl/source/gdi/metaact.cxx
+index 444fa07..3ad39c4 100644
+--- vcl/source/gdi/metaact.cxx
++++ vcl/source/gdi/metaact.cxx
+@@ -4093,8 +4093,34 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
  				}
  				delete[] mpData;
  				ImplInitDynamicData( static_cast<const BYTE*>( aDest.GetData() ), aDest.Tell() );