ooo-build r12704 - in branches/ooo-build-2-4-1: . patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu May 29 14:40:54 2008
New Revision: 12704
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12704&view=rev

Log:
	* patches/src680/svg-import-filter-gfxfilter.diff: fixed a case
	where emf+ renderer was crashing.



Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/svg-import-filter-gfxfilter.diff

Modified: branches/ooo-build-2-4-1/patches/src680/svg-import-filter-gfxfilter.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/svg-import-filter-gfxfilter.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/svg-import-filter-gfxfilter.diff	Thu May 29 14:40:54 2008
@@ -124,7 +124,7 @@
                  // TODO(F2): line ends
              }
  
-@@ -1896,4 +1914,734 @@
+@@ -1896,4 +1914,745 @@
      return sal_True;
  }
  
@@ -672,18 +672,29 @@
 +                GDIMetaFile		aMtf;
 +
 +                aVDev.EnableOutput( FALSE );
++                aVDev.SetMapMode( mrOutDev.GetMapMode() );
 +                aMtf.Record( &aVDev );
++
++                aVDev.SetLineColor();
++                aVDev.SetFillColor();
 +                aVDev.DrawGradient(::PolyPolygon(aPoly),aGradient);
 +
++                const Rectangle aMtfBounds(
++                    basegfx::fround(aBounds.getMinX()),
++                    basegfx::fround(aBounds.getMinY()),
++                    basegfx::fround(aBounds.getMaxX()),
++                    basegfx::fround(aBounds.getMaxY()));
++
++                MapMode aMap(mrOutDev.GetMapMode());
 +                aMtf.Stop();
 +                aMtf.WindStart();
-+                aMtf.SetPrefMapMode( MAP_100TH_MM );
-+                aMtf.SetPrefSize( Size(basegfx::fround(aBounds.getMaxX()),
-+                                       basegfx::fround(aBounds.getMaxY())) );
++                aMap.SetOrigin( aMtfBounds.TopLeft() );
++                aMtf.SetPrefMapMode( aMap );
++                aMtf.SetPrefSize( aMtfBounds.GetSize() );
 +
 +                mrOutDev.DrawTransparent(aMtf,
-+                                         Point(),
-+                                         aMtf.GetPrefSize(),
++                                         aMtfBounds.TopLeft(),
++                                         aMtfBounds.GetSize(),
 +                                         aTransparencyGradient);
 +            }
 +            else