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@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

3 files changed, 0 insertions, 72 deletions

diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index a77782bc963c..05092957c48e 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -182,7 +182,6 @@ public:
     void                Clip( const Rectangle& rRect, BOOL bPolygon = TRUE );
     void                Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData = NULL );
 
-    void                GetSimple( Polygon& rResult ) const;
     /** Adaptive subdivision of polygons with curves
 
         This method adaptively subdivides bezier arcs within the
@@ -288,7 +287,6 @@ public:
     void                Clip( const Rectangle& rRect );
     void                Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData = NULL );
 
-    void                GetSimple( PolyPolygon& rResult ) const;
     /** Adaptive subdivision of polygons with curves
 
         This method adaptively subdivides bezier arcs within the
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 5cca29b3066e..7f1eb94b646d 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -957,59 +957,6 @@ void Polygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData )
     }
 }
 
-// -----------------------------------------------------------------------
-
-void Polygon::GetSimple( Polygon& rResult ) const
-{
-    if( !mpImplPolygon->mpFlagAry )
-        rResult = *this;
-    else
-    {
-        ::std::vector< Point > aPointVector;
-
-        for( USHORT i = 0, nCount = GetSize(); i < nCount; )
-        {
-            if( ( ( i + 3 ) < nCount ) &&
-                ( POLY_NORMAL == mpImplPolygon->mpFlagAry[ i ] ) &&
-                ( POLY_CONTROL == mpImplPolygon->mpFlagAry[ i + 1 ] ) &&
-                ( POLY_CONTROL == mpImplPolygon->mpFlagAry[ i + 2 ] ) &&
-                ( POLY_NORMAL == mpImplPolygon->mpFlagAry[ i + 3 ] ) )
-            {
-                const USHORT    nSegmentPoints = 25;
-                const Polygon   aSegmentPoly( mpImplPolygon->mpPointAry[ i ], mpImplPolygon->mpPointAry[ i + 1 ],
-                                              mpImplPolygon->mpPointAry[ i + 3 ], mpImplPolygon->mpPointAry[ i + 2 ],
-                                              nSegmentPoints );
-                const USHORT    nSegmentSize = aSegmentPoly.GetSize();
-
-                if( nSegmentSize )
-                {
-                    const Point*    pPointArray = aSegmentPoly.mpImplPolygon->mpPointAry;
-                    const Point*    pCur = pPointArray;
-                    const Point*    pLast;
-
-                    aPointVector.push_back( *( pLast = pCur ) );
-
-                    for( USHORT j = 1; j < nSegmentSize; j++ )
-                        if( *( pCur = pPointArray + j ) != *pLast )
-                            aPointVector.push_back( *( pLast = pCur ) );
-                }
-
-                i += 3;
-            }
-            else
-                aPointVector.push_back( mpImplPolygon->mpPointAry[ i++ ] );
-        }
-
-        // fill result polygon
-        rResult = Polygon( (USHORT)aPointVector.size() );
-        ::std::vector< Point >::iterator aIter( aPointVector.begin() ), aEnd( aPointVector.end() );
-        Point* pPointArray = rResult.mpImplPolygon->mpPointAry;
-        USHORT nPoints = rResult.mpImplPolygon->mnPoints;
-        while( nPoints-- && aIter != aEnd )
-            *pPointArray++ = *aIter++;
-    }
-}
-
 // =======================================================================
 
 /* Recursively subdivide cubic bezier curve via deCasteljau.
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index ff97e6006a41..692e47a9d1d2 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -346,23 +346,6 @@ void PolyPolygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData
 
 // -----------------------------------------------------------------------
 
-void PolyPolygon::GetSimple( PolyPolygon& rResult ) const
-{
-    DBG_CHKTHIS( PolyPolygon, NULL );
-
-    rResult.Clear();
-
-    Polygon aPolygon;
-
-    for( USHORT i = 0; i < mpImplPolyPolygon->mnCount; i++ )
-    {
-        mpImplPolyPolygon->mpPolyAry[ i ]->GetSimple( aPolygon );
-        rResult.Insert( aPolygon );
-    }
-}
-
-// -----------------------------------------------------------------------
-
 void PolyPolygon::AdaptiveSubdivide( PolyPolygon& rResult, const double d ) const
 {
     DBG_CHKTHIS( PolyPolygon, NULL );