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, 27 insertions, 6 deletions

diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 2dcd3c1a89..956dfcaecb 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -104,6 +104,9 @@ using namespace ::com::sun::star::task;
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 
+// #i102251#
+#include <editstat.hxx>
+
 //////////////////////////////////////////////////////////////////////////////
 
 namespace svx
@@ -225,16 +228,27 @@ namespace svx
         Graphic     aGraphic( rMtf );
         BitmapEx	aBmpEx;
 
+        // #i102089# support user's settings of AA and LineSnap when the MetaFile gets
+        // rasterconverted to a bitmap
+        const SvtOptionsDrawinglayer aDrawinglayerOpt;
+        const GraphicConversionParameters aParameters(
+            pSize ? *pSize : Size(0, 0), 
+            true, // allow unlimited size
+            aDrawinglayerOpt.IsAntiAliasing(),
+            aDrawinglayerOpt.IsSnapHorVerLinesToDiscrete());
+
         if( bTransparent )
         {
-            Graphic aMaskGraphic( rMtf.GetMonochromeMtf( COL_BLACK ) );
-            Bitmap  aMaskBmp( aMaskGraphic.GetUnlimitedBitmap( pSize ) );
+            Graphic aMaskGraphic(rMtf.GetMonochromeMtf(COL_BLACK));
+            Bitmap  aMaskBmp(aMaskGraphic.GetBitmap(aParameters));
 
-            aMaskBmp.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
-            aBmpEx = BitmapEx( aGraphic.GetUnlimitedBitmap( pSize ), aMaskBmp );
+            aMaskBmp.Convert(BMP_CONVERSION_1BIT_THRESHOLD);
+            aBmpEx = BitmapEx(aGraphic.GetBitmap(aParameters), aMaskBmp);
         }
         else
-            aBmpEx = BitmapEx( aGraphic.GetUnlimitedBitmap( pSize ) );
+        {
+            aBmpEx = BitmapEx(aGraphic.GetBitmap(aParameters));
+        }
 
         aBmpEx.SetPrefMapMode( rMtf.GetPrefMapMode() );
         aBmpEx.SetPrefSize( rMtf.GetPrefSize() );
@@ -625,8 +639,12 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
     rOutl.SetCalcFieldValueHdl( LINK(this, GraphicExporter, CalcFieldValueHdl) );
     rOutl.SetBackgroundColor( pPage->GetPageBackgroundColor(pView->GetSdrPageView()) );
 
+    // #i102251#
+    const sal_uInt32 nOldCntrl(rOutl.GetControlWord());
+    sal_uInt32 nCntrl = nOldCntrl & ~EE_CNTRL_ONLINESPELLING;
+    rOutl.SetControlWord(nCntrl);
+
     std::vector< SdrObject* > aShapes;
-    
     bool bRet = true;
 
     // export complete page?
@@ -977,6 +995,9 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
 
     rOutl.SetCalcFieldValueHdl( maOldCalcFieldValueHdl );
 
+    // #i102251#
+    rOutl.SetControlWord(nOldCntrl);
+
     return bRet;
 
 }