CWS-TOOLING: integrate CWS aw059

2008-12-16 16:15:40 +0100 aw  r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways
2008-12-15 16:49:58 +0100 wg  r265512 : i97278
2008-12-12 16:02:15 +0100 aw  r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks!
2008-12-12 15:49:06 +0100 aw  r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas
2008-12-12 14:51:26 +0100 aw  r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case
2008-12-12 13:23:00 +0100 aw  r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes.
2008-12-11 19:35:59 +0100 aw  r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly
2008-12-11 16:05:17 +0100 thb  r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed
2008-12-10 13:40:38 +0100 aw  r265180 : #i95645# changed pixel snap to basegfx::fround
2008-12-10 13:25:45 +0100 aw  r265177 : corrected linux warning
2008-12-10 12:28:02 +0100 aw  r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW
2008-12-09 18:44:39 +0100 aw  r265136 : #i95645# corrected filled path construction
2008-12-09 18:12:40 +0100 aw  r265133 : #i95645# added support for non-AAd transparent paints
2008-12-09 18:11:58 +0100 aw  r265132 : #i95645# forced selection without AA
2008-12-09 18:11:29 +0100 aw  r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA
2008-12-09 15:21:39 +0100 aw  r265094 : #i95645# corrected FormControl full drag
2008-12-09 15:11:26 +0100 aw  r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected
2008-12-09 14:30:09 +0100 aw  r265085 : #i95645# added GDIPlus support
2008-12-09 13:41:06 +0100 aw  r265081 : #i95645# added simple AA using GDIPlis to VCL
2008-12-09 13:40:46 +0100 aw  r265080 : #i95645# added simple AA using GDIPlis to VCL
2008-12-09 13:40:29 +0100 aw  r265079 : #i95645# added simple AA using GDIPlis to VCL
2008-12-09 13:33:16 +0100 aw  r265078 : #i95645# changes to requirements, discussed with FPE
2008-12-08 14:11:39 +0100 aw  r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border
2008-12-08 14:11:00 +0100 aw  r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D
2008-12-08 12:15:10 +0100 ufi  r264987 : aw059
2008-12-08 12:14:40 +0100 ufi  r264986 : aw059
2008-12-05 13:16:18 +0100 aw  r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37)
2008-12-04 11:29:48 +0100 aw  r264827 : #i95645# corrected warning
2008-12-03 14:43:39 +0100 aw  r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32
2008-12-03 14:42:43 +0100 aw  r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available
2008-12-03 14:42:13 +0100 aw  r264781 : #i95645# removed unused options for writer selection overlay
2008-12-03 14:41:51 +0100 aw  r264780 : #i95645# removed unused options for calc overlay
2008-12-03 14:41:21 +0100 aw  r264779 : #i95645# small corrections in canvas renderer
2008-12-02 18:32:31 +0100 aw  r264730 : #i95646# merged cairo version from THB's CWS cairosource01
2008-12-02 15:25:45 +0100 aw  r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers
2008-12-02 12:50:01 +0100 aw  r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check.
2008-12-02 12:48:51 +0100 aw  r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA
2008-12-02 12:47:53 +0100 aw  r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive
2008-11-28 17:11:12 +0100 thb  r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities
2008-11-28 17:03:27 +0100 thb  r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities
2008-11-28 17:00:07 +0100 thb  r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities
2008-11-28 16:59:51 +0100 thb  r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities
2008-11-27 19:13:42 +0100 aw  r264519 : #i95646# optimized getLength() a little bit
2008-11-27 19:12:50 +0100 aw  r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM
2008-11-27 18:50:05 +0100 aw  r264516 : #i95646# corrected fit to frame texts for WIN32
2008-11-27 15:32:15 +0100 aw  r264496 : #i95646# helplines corrected
2008-11-27 15:32:05 +0100 aw  r264495 : #i95646# helplines corrected
2008-11-27 15:01:30 +0100 aw  r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output
2008-11-27 14:33:28 +0100 aw  r264489 : #i95646# AA support for wireframe overlays
2008-11-27 13:40:54 +0100 aw  r264485 : #i95646# added full repaint when AA option changes
2008-11-27 13:29:19 +0100 aw  r264482 : #i95646# corrected handling of bSolidDragging config entries
2008-11-27 13:29:08 +0100 aw  r264481 : #i95646# corrected handling of bSolidDragging config entries
2008-11-27 11:30:12 +0100 aw  r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation
2008-11-26 16:33:04 +0100 aw  r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel
2008-11-26 15:49:19 +0100 aw  r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging
2008-11-26 15:48:11 +0100 aw  r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation
2008-11-26 14:11:37 +0100 aw  r264385 : #i88893# added new look for selection in sw
2008-11-26 11:32:33 +0100 aw  r264360 : corrected compiler warning
2008-11-25 18:46:29 +0100 aw  r264328 : #i95646# snapshot with FullDrag clones
2008-11-25 18:46:07 +0100 aw  r264327 : #i95646# snapshot with FullDrag clones
2008-11-25 18:45:43 +0100 aw  r264326 : #i95646# snapshot with FullDrag clones
2008-11-25 18:19:04 +0100 thb  r264324 : #i96585# Added missing inline specifier
2008-11-25 13:16:25 +0100 aw  r264285 : #i95646# next snapshot
2008-11-25 13:15:33 +0100 aw  r264284 : #i95646# next snapshot
2008-11-25 13:15:12 +0100 aw  r264283 : #i95646# next snapshot
2008-11-25 13:14:51 +0100 aw  r264282 : #i95646# next snapshot
2008-11-20 13:40:49 +0100 aw  r264045 : #i95646# stable snapshot
2008-11-20 13:40:29 +0100 aw  r264044 : #i95646# stable snapshot
2008-11-20 13:40:06 +0100 aw  r264043 : #i95646# stable snapshot
2008-11-20 13:39:45 +0100 aw  r264042 : #i95646# stable snapshot
2008-11-18 11:53:39 +0100 aw  r263758 : #i95646# snapshot for linux test build
2008-11-18 11:52:54 +0100 aw  r263757 : #i95646# snapshot for linux test build
2008-11-18 11:52:02 +0100 aw  r263756 : #i95646# snapshot for linux test build
2008-11-14 18:17:49 +0100 aw  r263692 : #i95646# snapshot with most stuff working
2008-11-14 18:14:26 +0100 aw  r263691 : #i95646# snapshot with most stuff working
2008-11-14 18:12:50 +0100 aw  r263690 : #i95646# snapshot with most stuff working
2008-11-14 18:12:16 +0100 aw  r263689 : #i95646# snapshot with most stuff working
2008-11-14 18:11:41 +0100 aw  r263688 : #i95646# snapshot with most stuff working
2008-11-07 18:44:22 +0100 aw  r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing
2008-11-05 17:39:15 +0100 aw  r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment
2008-11-05 17:39:02 +0100 aw  r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment
2008-11-05 12:28:32 +0100 aw  r263350 : #i95644# #i95645# #i95646# in-between state before bigger change
2008-11-05 12:27:51 +0100 aw  r263349 : #i95644# #i95645# #i95646# in-between state before bigger change
2008-11-05 12:26:58 +0100 aw  r263348 : #i95644# #i95645# #i95646# in-between state before bigger change
2008-11-05 12:26:17 +0100 aw  r263347 : #i95644# #i95645# #i95646# in-between state before bigger change
2008-11-05 12:25:55 +0100 aw  r263346 : #i95644# #i95645# #i95646# in-between state before bigger change

5 files changed, 87 insertions, 70 deletions

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 6291c011fee1..a67d6fa7feac 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1504,92 +1504,99 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
         // read Id
         rIStm >> nTmp;
 
-        if( !rIStm.GetError() && NATIVE_FORMAT_50 == nTmp )
+        // if there is no more data, avoid further expensive
+        // reading which will create VDevs and other stuff, just to
+        // read nothing. CAUTION: Eof is only true AFTER reading another
+        // byte, a speciality of SvMemoryStream (!)
+        if(!rIStm.GetError() && !rIStm.IsEof())
         {
-            Graphic         aGraphic;
-            GfxLink         aLink;
-            VersionCompat*  pCompat;
+            if( NATIVE_FORMAT_50 == nTmp )
+            {
+                Graphic         aGraphic;
+                GfxLink         aLink;
+                VersionCompat*  pCompat;
 
-            // read compat info
-            pCompat = new VersionCompat( rIStm, STREAM_READ );
-            delete pCompat;
+                // read compat info
+                pCompat = new VersionCompat( rIStm, STREAM_READ );
+                delete pCompat;
 
-            rIStm >> aLink;
+                rIStm >> aLink;
 
-            // set dummy link to avoid creation of additional link after filtering;
-            // we set a default link to avoid unnecessary swapping of native data
-            aGraphic.SetLink( GfxLink() );
+                // set dummy link to avoid creation of additional link after filtering;
+                // we set a default link to avoid unnecessary swapping of native data
+                aGraphic.SetLink( GfxLink() );
 
-            if( !rIStm.GetError() && aLink.LoadNative( aGraphic ) )
-            {
-                // set link only, if no other link was set
-                const BOOL bSetLink = ( rImpGraphic.mpGfxLink == NULL );
+                if( !rIStm.GetError() && aLink.LoadNative( aGraphic ) )
+                {
+                    // set link only, if no other link was set
+                    const BOOL bSetLink = ( rImpGraphic.mpGfxLink == NULL );
 
-                // assign graphic
-                rImpGraphic = *aGraphic.ImplGetImpGraphic();
+                    // assign graphic
+                    rImpGraphic = *aGraphic.ImplGetImpGraphic();
 
-                if( aLink.IsPrefMapModeValid() )
-                    rImpGraphic.ImplSetPrefMapMode( aLink.GetPrefMapMode() );
+                    if( aLink.IsPrefMapModeValid() )
+                        rImpGraphic.ImplSetPrefMapMode( aLink.GetPrefMapMode() );
 
-                if( aLink.IsPrefSizeValid() )
-                    rImpGraphic.ImplSetPrefSize( aLink.GetPrefSize() );
+                    if( aLink.IsPrefSizeValid() )
+                        rImpGraphic.ImplSetPrefSize( aLink.GetPrefSize() );
 
-                if( bSetLink )
-                    rImpGraphic.ImplSetLink( aLink );
+                    if( bSetLink )
+                        rImpGraphic.ImplSetLink( aLink );
+                }
+                else
+                {
+                    rIStm.Seek( nStmPos1 );
+                    rIStm.SetError( ERRCODE_IO_WRONGFORMAT );
+                }
             }
             else
             {
-                rIStm.Seek( nStmPos1 );
-                rIStm.SetError( ERRCODE_IO_WRONGFORMAT );
-            }
-        }
-        else
-        {
-            BitmapEx        aBmpEx;
-            const USHORT    nOldFormat = rIStm.GetNumberFormatInt();
+                BitmapEx        aBmpEx;
+                const USHORT    nOldFormat = rIStm.GetNumberFormatInt();
 
-            rIStm.SeekRel( -4 );
-            rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-            rIStm >> aBmpEx;
+                rIStm.SeekRel( -4 );
+                rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+                rIStm >> aBmpEx;
 
-            if( !rIStm.GetError() )
-            {
-                UINT32  nMagic1(0), nMagic2(0);
-                ULONG   nActPos = rIStm.Tell();
+                if( !rIStm.GetError() )
+                {
+                    UINT32  nMagic1(0), nMagic2(0);
+                    ULONG   nActPos = rIStm.Tell();
 
-                rIStm >> nMagic1 >> nMagic2;
-                rIStm.Seek( nActPos );
+                    rIStm >> nMagic1 >> nMagic2;
+                    rIStm.Seek( nActPos );
 
-                rImpGraphic = ImpGraphic( aBmpEx );
+                    rImpGraphic = ImpGraphic( aBmpEx );
 
-                if( !rIStm.GetError() && ( 0x5344414e == nMagic1 ) && ( 0x494d4931 == nMagic2 ) )
-                {
-                    delete rImpGraphic.mpAnimation;
-                    rImpGraphic.mpAnimation = new Animation;
-                    rIStm >> *rImpGraphic.mpAnimation;
+                    if( !rIStm.GetError() && ( 0x5344414e == nMagic1 ) && ( 0x494d4931 == nMagic2 ) )
+                    {
+                        delete rImpGraphic.mpAnimation;
+                        rImpGraphic.mpAnimation = new Animation;
+                        rIStm >> *rImpGraphic.mpAnimation;
 
-                    // #108077# manually set loaded BmpEx to Animation
-                    // (which skips loading its BmpEx if already done)
-                    rImpGraphic.mpAnimation->SetBitmapEx(aBmpEx);
+                        // #108077# manually set loaded BmpEx to Animation
+                        // (which skips loading its BmpEx if already done)
+                        rImpGraphic.mpAnimation->SetBitmapEx(aBmpEx);
+                    }
+                    else
+                        rIStm.ResetError();
                 }
                 else
+                {
+                    GDIMetaFile aMtf;
+
+                    rIStm.Seek( nStmPos1 );
                     rIStm.ResetError();
-            }
-            else
-            {
-                GDIMetaFile aMtf;
+                    rIStm >> aMtf;
 
-                rIStm.Seek( nStmPos1 );
-                rIStm.ResetError();
-                rIStm >> aMtf;
+                    if( !rIStm.GetError() )
+                        rImpGraphic = aMtf;
+                    else
+                        rIStm.Seek( nStmPos1 );
+                }
 
-                if( !rIStm.GetError() )
-                    rImpGraphic = aMtf;
-                else
-                    rIStm.Seek( nStmPos1 );
+                rIStm.SetNumberFormatInt( nOldFormat );
             }
-
-            rIStm.SetNumberFormatInt( nOldFormat );
         }
     }
 
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 9c94811e0122..2c33d069b007 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -791,6 +791,7 @@ int OutputDevice::ImplGetGraphics() const
     if ( mpGraphics )
     {
         mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
+        mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW);
         return TRUE;
     }
 
@@ -2735,15 +2736,14 @@ void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly
     if( mbInitFillColor )
         ImplInitFillColor();
 
-    if(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    if( (mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) != 0
+        && mpGraphics->supportsOperation( OutDevSupport_B2DDraw ) )
     {
-#ifdef UNX // b2dpolygon support not implemented yet on non-UNX platforms
         const ::basegfx::B2DHomMatrix aTransform = ImplGetDeviceTransformation();
         ::basegfx::B2DPolyPolygon aB2DPP = rB2DPolyPoly;
         aB2DPP.transform( aTransform );
         if( mpGraphics->DrawPolyPolygon( aB2DPP, 0.0, this ) )
             return;
-#endif
     }
 
     // fallback to old polygon drawing if needed
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 4a682c4cecc9..19a9778ebb04 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5351,6 +5351,11 @@ void OutputDevice::SetAntialiasing( USHORT nMode )
     {
         mnAntialiasing = nMode;
         mbInitFont = TRUE;
+
+        if(mpGraphics)
+        {
+            mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW);
+        }
     }
 
     if( mpAlphaVDev )
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 4e3bba322bc8..d4c24ff44e20 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -186,9 +186,9 @@ fprintf(stderr,"OD::DT( fT=%f, bAA=%d)\n",fTransparency,mnAntialiasing);//######
     if( mbInitFillColor )
         ImplInitFillColor();
 
-    if(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    if( (mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) != 0
+        && mpGraphics->supportsOperation( OutDevSupport_B2DDraw ) )
     {
-#ifdef UNX
         // b2dpolygon support not implemented yet on non-UNX platforms
         const ::basegfx::B2DHomMatrix aTransform = ImplGetDeviceTransformation();
         ::basegfx::B2DPolyPolygon aB2DPP = rB2DPolyPoly;
@@ -209,7 +209,6 @@ fprintf(stderr,"OD::DT( fT=%f, bAA=%d)\n",fTransparency,mnAntialiasing);//######
 #endif
             return;
         }
-#endif
     }
 
     // fallback to old polygon drawing if needed
@@ -265,7 +264,12 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
 
     // try hard to draw it directly, because the emulation layers are slower
     if( !pDisableNative
-    && mpGraphics->supportsOperation( OutDevSupport_B2DDraw ) )
+        && mpGraphics->supportsOperation( OutDevSupport_B2DDraw )
+#ifdef WIN32
+        // workaround bad dithering on remote displaying when using GDI+ with toolbar buttoin hilighting
+        && !rPolyPoly.IsRect()
+#endif
+        )
     {
         // prepare the graphics device
         if( mbInitClipRegion )
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 339cc875256f..509ad4f725ce 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -81,7 +81,8 @@ SalFrameGeometry SalFrame::GetGeometry()
 // ----------------------------------------------------------------------------
 
 SalGraphics::SalGraphics()
-        : m_nLayout( 0 )
+:   m_nLayout( 0 ),
+    m_bAntiAliasB2DDraw(false)
 {
     // read global RTL settings
     if( Application::GetSettings().GetLayoutRTL() )