[ooo-build-commit] Branch 'ooo/OOO320' - binfilter/bf_svtools filter/source

[Jan Holesovsky]

 binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx |    6 +++---
 filter/source/svg/svgwriter.cxx                          |   10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 460fbba7d9c33915bf99f7bfe1b096f837a14d30
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Oct 27 14:01:25 2009 +0000

    CWS-TOOLING: integrate CWS impress178
    2009-10-16 19:54:41 +0200 sj  r276995 : removed warning
    2009-10-16 17:46:12 +0200 sj  r276993 : #i103757# applied patch (fixed crash if model changes)
    2009-10-16 16:06:07 +0200 sj  r276985 : CWS-TOOLING: rebase CWS impress178 to branches/OOO320 at 276942 (milestone: OOO320:m2)
    2009-10-08 13:51:23 +0200 sj  r276790 : #i105654# fixed closing of line geometry
    2009-10-07 17:26:56 +0200 sj  r276762 : #i105606# fixed object shadow
    2009-10-07 17:25:39 +0200 sj  r276761 : minor improvements
    2009-10-07 11:48:26 +0200 af  r276745 : #i103047# Prevent context menu of LayoutMenu from being shown when user clicks on background.
    2009-10-07 11:33:59 +0200 af  r276743 : #i99866# Set position of the design control manually.
    2009-10-06 17:18:23 +0200 sj  r276721 : minor improvements
    2009-10-05 18:34:23 +0200 sj  r276692 : #105606# fixed fontsize problem
    2009-10-05 17:26:21 +0200 af  r276691 : #i105354# Never process more than one request in a row.
    2009-10-02 13:24:25 +0200 af  r276639 : #i94242# Taking insertion position of slide sorter correctly into account.
    2009-10-01 13:46:47 +0200 aw  r276602 : #i102224# some Polygon/PolyPolygon usages in SVMConverter ignored the possible curve status of tools::Polygon; added at least an AdaptiveSubdivide
    2009-10-01 12:33:56 +0200 aw  r276588 : #i102224# ImplWritePolyPolygon killed the curve information at the PolyPolygon by NOT copying the flags
    2009-09-30 17:48:56 +0200 aw  r276567 : #i102224# removed GetSimple() from Polygon and PolyPolygon, replaced completely with AdaptiveSubdivide
    2009-09-30 15:45:46 +0200 aw  r276559 : #i102048# secured primitive creation for dimension lines with linestyle none
    2009-09-30 14:56:41 +0200 af  r276556 : #i105471# Reordered statements in ~SdModule.
    2009-09-30 14:47:12 +0200 aw  r276555 : #i105373# corrected curve ignoring places in MetaFile export

diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx
index bcc51cb..96d2ce1 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx
@@ -715,7 +715,7 @@ void WMFWriter::WMFRecord_Polygon(const Polygon & rPoly)
 
     Polygon aSimplePoly;
     if ( rPoly.HasFlags() )
-        rPoly.GetSimple( aSimplePoly );
+        rPoly.AdaptiveSubdivide( aSimplePoly );
     else
         aSimplePoly = rPoly;
     nSize = aSimplePoly.GetSize();
@@ -730,7 +730,7 @@ void WMFWriter::WMFRecord_PolyLine(const Polygon & rPoly)
     USHORT nSize,i;
     Polygon aSimplePoly;
     if ( rPoly.HasFlags() )
-        rPoly.GetSimple( aSimplePoly );
+        rPoly.AdaptiveSubdivide( aSimplePoly );
     else
         aSimplePoly = rPoly;
     nSize=aSimplePoly.GetSize();
@@ -752,7 +752,7 @@ void WMFWriter::WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly)
         if ( aSimplePolyPoly[ i ].HasFlags() )
         {
             Polygon aSimplePoly;
-            aSimplePolyPoly[ i ].GetSimple( aSimplePoly );
+            aSimplePolyPoly[ i ].AdaptiveSubdivide( aSimplePoly );
             aSimplePolyPoly[ i ] = aSimplePoly;
         }
     }
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index f97cc21..764553b 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -620,7 +620,15 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo
         {
             const Polygon&	rPoly = rPolyPoly[ i ];
             const USHORT	nSize = rPoly.GetSize();
-            Polygon			aMappedPoly( nSize );
+
+            // #i102224# congratulations, this throws away the curve flags
+            // and makes ANY curved polygon look bad. The Flags HAVE to be
+            // copied, too. It's NOT enough to copy the mapped points. Just
+            // copy the original polygon completely and REPLACE the points
+
+            // old: Polygon			aMappedPoly( nSize );
+            // new:
+            Polygon aMappedPoly(rPoly);
 
             for( USHORT n = 0; n < nSize; n++ )
                 aMappedPoly[ n ] = ImplMap( rPoly[ n ] );