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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Jul 10 09:54:33 2008
New Revision: 13144
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13144&view=rev

Log:
	* patches/dev300/svg-import-filter-gfxfilter.diff:
	A few forgotten places where after-the-fact coordinate mapping was
	necessary.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/svg-import-filter-gfxfilter.diff

Modified: trunk/patches/dev300/svg-import-filter-gfxfilter.diff
==============================================================================
--- trunk/patches/dev300/svg-import-filter-gfxfilter.diff	(original)
+++ trunk/patches/dev300/svg-import-filter-gfxfilter.diff	Thu Jul 10 09:54:33 2008
@@ -90,7 +90,7 @@
 +
  #endif // SVGFILTER_HXX
 diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
-index 2525999..a714454 100644
+index 2525999..cda0efd 100644
 --- filter/source/svg/svgreader.cxx
 +++ filter/source/svg/svgreader.cxx
 @@ -7,6 +7,7 @@
@@ -478,10 +478,10 @@
 +                    // -> blatant copy from svx/source/xml/xmlgrhlp.cxx
 +
 +                    const Rectangle aBounds(
-+                        Point(basegfx::fround(x),
-+                              basegfx::fround(y)),
-+                        Size(basegfx::fround(width),
-+                             basegfx::fround(height)));
++                        Point(basegfx::fround(pt100thmm(x)),
++                              basegfx::fround(pt100thmm(y))),
++                        Size(basegfx::fround(pt100thmm(width)),
++                             basegfx::fround(pt100thmm(height))));
 +                    aGraphic.Draw(&mrOutDev,
 +                                  aBounds.TopLeft(),
 +                                  aBounds.GetSize());
@@ -533,7 +533,7 @@
 +                // actually export text
 +                Font aFont(maCurrState.maFontFamily, 
 +                           Size(0,
-+                                basegfx::fround(maCurrState.mnFontSize)));
++                                basegfx::fround(pt100thmm(maCurrState.mnFontSize))));
 +
 +                // extract basic transformations out of CTM
 +                basegfx::B2DTuple aScale, aTranslate;
@@ -555,8 +555,8 @@
 +
 +                // TODO(F2): update bounds
 +                mrOutDev.SetFont(aFont);
-+                mrOutDev.DrawText(Point(basegfx::fround(x),
-+                                        basegfx::fround(y)),
++                mrOutDev.DrawText(Point(basegfx::fround(pt100thmm(x)),
++                                        basegfx::fround(pt100thmm(y))),
 +                                  sText.makeStringAndClear());
 +                break;
 +            }
@@ -743,7 +743,7 @@
 +                            ::PolyPolygon(
 +                                basegfx::tools::createAreaGeometryForPolygon(
 +                                    aPoly.getB2DPolygon(i),
-+                                    aState.mnStrokeWidth/2.0,
++                                    pt100thmm(aState.mnStrokeWidth/2.0),
 +                                    aState.meLineJoin)).getB2DPolyPolygon()),
 +                        true));
 +                // TODO(F2): line ends