CWS-TOOLING: integrate CWS aw073

2009-07-16 11:21:19 +0200 aw  r274036 : corrections after resync
2009-07-15 13:34:18 +0200 aw  r274009 : CWS-TOOLING: rebase CWS aw073 to trunk@273858 (milestone: DEV300:m52)
2009-07-01 20:04:27 +0200 aw  r273613 : CWS-TOOLING: rebase CWS aw073 to trunk@273468 (milestone: DEV300:m51)
2009-06-24 11:51:03 +0200 aw  r273324 : #i102062# added using statement for solaris compiler
2009-06-23 12:53:50 +0200 aw  r273278 : #i100158# force filled polygons to closed state
2009-06-23 12:28:33 +0200 aw  r273276 : #i100158#, #i102371# corrected all (mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) shortcuts to support line/fill and to be not used when FillMode is not overpaint
2009-06-23 12:15:14 +0200 aw  r273274 : #i100158# added PolyPolygon support for snapPointsOfHorizontalOrVerticalEdges helper
2009-06-22 17:28:33 +0200 aw  r273244 : #i101508# added taking care of cell's distance-to-border values for cell text primitive creation
2009-06-22 12:59:10 +0200 aw  r273218 : #i102253# applied patch from OD (see task)
2009-06-18 17:00:52 +0200 aw  r273125 : #i102251# added EE_CNTRL_ONLINESPELLING switch off at DrawOutliner during GraphicExporter::GetGraphic
2009-06-18 14:35:57 +0200 aw  r273120 : #i102241# added mergeToSinglePolyPolygon usage to SdrObject::ImpConvertToContourObj
2009-06-18 14:35:20 +0200 aw  r273119 : #i102241# improved PolygonStrokePrimitive2D::createLocalDecomposition
2009-06-18 14:34:49 +0200 aw  r273118 : #i102241# Made B2DCubicBezier::testAndSolveTrivialBezier() numerically more stable
2009-06-17 16:11:21 +0200 aw  r273078 : #i102062# added compare support for OutlireParaObject's WrongList in an extra method; using in primitive comparators
2009-06-16 19:10:18 +0200 aw  r273037 : #i101957# corrected: offset needs to be added before rotation and shear
2009-06-16 18:58:43 +0200 aw  r273035 : #i101957# added needed offset by object width to SdrTextObj::impDecomposeStretchTextPrimitive for vertical texts
2009-06-16 18:35:55 +0200 aw  r273034 : #i101941# corrected object initialisation for 3D Scenes on Clone operator
2009-06-16 16:07:30 +0200 aw  r273024 : #i101811# extended renderChartPrimitive2D to create a correct embedding in a new MapMode
2009-06-12 19:38:07 +0200 aw  r272940 : #i101734# added test code to experiment on demand with more complex transformations for virtual objects than only translations
2009-06-12 19:37:07 +0200 aw  r272939 : #i101734# corrected SvtGraphicStroke preparation in MetaFile renderer (AFAP)
2009-06-12 16:31:55 +0200 aw  r272931 : #i101648# re-enabled object creation with objecttype OBJ_NONE for SW Frame creation
2009-06-12 13:59:05 +0200 aw  r272917 : #i101598# supported AAed single line paint in VCL
2009-06-12 11:34:25 +0200 aw  r272907 : #i101598# adapted Graphic::GetBitmap() usage
2009-06-10 16:34:19 +0200 aw  r272830 : #i101598# added VCL_DLLPUBLIC to parameter class
2009-06-10 16:30:27 +0200 aw  r272829 : #i101598# extended calls to Graphic::GetBitmap/Ex where conversions to Bitmap objects is needed to user defined parameters like AntiAlisasing
2009-06-10 16:28:44 +0200 aw  r272828 : #i101598# extended Graphic::GetBitmap/Ex interfaces to transport raster conversion parameters since these calls potentially need to rasterconvert a contained MetaFile
2009-06-09 16:26:40 +0200 aw  r272781 : #i100945# checked in proposed patch for now
2009-06-08 18:01:42 +0200 aw  r272742 : #i101239# teached BinTextObject to register at EditEngineItemPool sub-pool, not on given pool directly

1 files changed, 67 insertions, 3 deletions

diff --git a/drawinglayer/source/processor2d/helperchartrenderer.cxx b/drawinglayer/source/processor2d/helperchartrenderer.cxx
index c2d99604469b..ffa8917ddec8 100644
--- a/drawinglayer/source/processor2d/helperchartrenderer.cxx
+++ b/drawinglayer/source/processor2d/helperchartrenderer.cxx
@@ -41,6 +41,7 @@
 #include <svtools/chartprettypainter.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -50,7 +51,10 @@ using namespace com::sun::star;
 
 namespace drawinglayer
 {
-    bool renderChartPrimitive2D(const primitive2d::ChartPrimitive2D& rChartCandidate, OutputDevice& rOutputDevice)
+    bool renderChartPrimitive2D(
+        const primitive2d::ChartPrimitive2D& rChartCandidate,
+        OutputDevice& rOutputDevice,
+        const geometry::ViewInformation2D& rViewInformation2D)
     {
         bool bChartRendered(false);
 
@@ -73,14 +77,74 @@ namespace drawinglayer
 
                     if( pPrettyPainter )
                     {
-                        // create logic object range
+                        // create logic object range; do NOT use ObjectTransformation for this
+                        // (rViewInformation2D.getObjectTransformation()), only the logic object
+                        // size is wanted
                         basegfx::B2DRange aObjectRange(0.0, 0.0, 1.0, 1.0);
                         aObjectRange.transform(rChartCandidate.getTransformation());
                         const Rectangle aRectangle(
                                 (sal_Int32)aObjectRange.getMinX(), (sal_Int32)aObjectRange.getMinY(),
                                 (sal_Int32)aObjectRange.getMaxX(), (sal_Int32)aObjectRange.getMaxY());
 
-                        bChartRendered = pPrettyPainter->DoPaint(&rOutputDevice, aRectangle);
+                        // #i101811#
+                        if(rViewInformation2D.getObjectTransformation().isIdentity())
+                        {
+                            // no embedding in another transfromation, just paint with existing
+                            // MapMode. This is just a shortcut; using the below code will also
+                            // work; it has just a neutral ObjectTransformation
+                            bChartRendered = pPrettyPainter->DoPaint(&rOutputDevice, aRectangle);
+                        }
+                        else
+                        {
+                            // rViewInformation2D.getObjectTransformation() is used and
+                            // needs to be expressed in the MapMode for the PrettyPainter;
+                            // else it would call ChartModelHelper::setPageSize(...) with the
+                            // changed size what really will change the chart model and leads
+                            // to re-layouts and re-formattings
+                            const MapMode aOldMapMode(rOutputDevice.GetMapMode());
+                            basegfx::B2DVector aVTScale, aScale, aTranslate;
+                            double fRotate, fShearX;
+
+                            // get basic scaling with current MapMode (aVTScale), containing
+                            // mapping for set MapUnit (e.g. for 100th mm, the basic scale is
+                            // not 1.0, 1.0). This is needed since this scale is included in
+                            // the ObjectToView Transformation and needs to be removed (see
+                            // correction below) to re-create a MapMode
+                            rOutputDevice.SetMapMode(aOldMapMode.GetMapUnit());
+                            rOutputDevice.GetViewTransformation().decompose(aVTScale, aTranslate, fRotate, fShearX);
+
+                            // get complete ObjectToView Transformation scale and translate from current
+                            // transformation chain (combined view and object transform)
+                            rViewInformation2D.getObjectToViewTransformation().decompose(aScale, aTranslate, fRotate, fShearX);
+
+                            // assert when shear and/or rotation is used
+                            OSL_ENSURE(basegfx::fTools::equalZero(fRotate), "Chart PrettyPrinting with unsupportable rotation (!)");
+                            OSL_ENSURE(basegfx::fTools::equalZero(fShearX), "Chart PrettyPrinting with unsupportable shear (!)");
+
+                            // clean scale and translate from basic scaling (DPI, etc...)
+                            // since this will implicitely be part of the to-be-created MapMode
+                            const basegfx::B2DTuple aBasicCleaner(
+                                basegfx::fTools::equalZero(aVTScale.getX()) ? 1.0 : 1.0 / aVTScale.getX(),
+                                basegfx::fTools::equalZero(aVTScale.getY()) ? 1.0 : 1.0 / aVTScale.getY());
+                            aScale *= aBasicCleaner;
+                            aTranslate *= aBasicCleaner;
+
+                            // for MapMode, take scale out of translation
+                            const basegfx::B2DTuple aScaleRemover(
+                                basegfx::fTools::equalZero(aScale.getX()) ? 1.0 : 1.0 / aScale.getX(),
+                                basegfx::fTools::equalZero(aScale.getY()) ? 1.0 : 1.0 / aScale.getY());
+                            aTranslate *= aScaleRemover;
+
+                            // build new MapMode
+                            const MapMode aNewMapMode(aOldMapMode.GetMapUnit(),
+                                Point(basegfx::fround(aTranslate.getX()), basegfx::fround(aTranslate.getY())),
+                                Fraction(aScale.getX()), Fraction(aScale.getY()));
+
+                            // use, paint, restore
+                            rOutputDevice.SetMapMode(aNewMapMode);
+                            bChartRendered = pPrettyPainter->DoPaint(&rOutputDevice, aRectangle);
+                            rOutputDevice.SetMapMode(aOldMapMode);
+                        }
                     }
                 }
             }