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

4 files changed, 173 insertions, 37 deletions

diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 396d9f68ce6b..e192198f2cdf 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -88,11 +88,18 @@ class CanvasFactory
 
     mutable ::osl::Mutex              m_mutex;
     Reference<XComponentContext>      m_xContext;
-    Reference<container::XNameAccess> m_xForceFlagNameAccess;
+    Reference<container::XNameAccess> m_xCanvasConfigNameAccess;
     AvailVector                       m_aAvailableImplementations;
+    AvailVector                       m_aAcceleratedImplementations;
+    AvailVector                       m_aAAImplementations;
     mutable CacheVector               m_aCachedImplementations;
     mutable bool                      m_bCacheHasForcedLastImpl;
+    mutable bool                      m_bCacheHasUseAcceleratedEntry;
+    mutable bool                      m_bCacheHasUseAAEntry;
 
+    void checkConfigFlag( bool& r_bFlag,
+                          bool& r_CacheFlag,
+                          const OUString& nodeName ) const;
     Reference<XInterface> use(
         OUString const & serviceName,
         Sequence<Any> const & args,
@@ -136,10 +143,14 @@ public:
 CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
     m_mutex(),
     m_xContext(xContext),
-    m_xForceFlagNameAccess(),
+    m_xCanvasConfigNameAccess(),
     m_aAvailableImplementations(),
+    m_aAcceleratedImplementations(),
+    m_aAAImplementations(),
     m_aCachedImplementations(),
-    m_bCacheHasForcedLastImpl()
+    m_bCacheHasForcedLastImpl(),
+    m_bCacheHasUseAcceleratedEntry(),
+    m_bCacheHasUseAAEntry()
 {
     try
     {
@@ -155,7 +166,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
                          makeAny( OUSTR("/org.openoffice.Office.Canvas") ),
                          beans::PropertyState_DIRECT_VALUE ) ) );
 
-        m_xForceFlagNameAccess.set(
+        m_xCanvasConfigNameAccess.set(
             xConfigProvider->createInstanceWithArguments(
                 OUSTR("com.sun.star.configuration.ConfigurationAccess"),
                 Sequence<Any>( &propValue, 1 ) ),
@@ -185,9 +196,13 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
 
             if( xEntryNameAccess.is() )
             {
-                Sequence<OUString> preferredImplementations;
-                if( (xEntryNameAccess->getByName( OUSTR("PreferredImplementations") ) >>= preferredImplementations) )
-                    m_aAvailableImplementations.push_back( std::make_pair(*pCurr,preferredImplementations) );
+                Sequence<OUString> implementationList;
+                if( (xEntryNameAccess->getByName( OUSTR("PreferredImplementations") ) >>= implementationList) )
+                    m_aAvailableImplementations.push_back( std::make_pair(*pCurr,implementationList) );
+                if( (xEntryNameAccess->getByName( OUSTR("AcceleratedImplementations") ) >>= implementationList) )
+                    m_aAcceleratedImplementations.push_back( std::make_pair(*pCurr,implementationList) );
+                if( (xEntryNameAccess->getByName( OUSTR("AntialiasingImplementations") ) >>= implementationList) )
+                    m_aAAImplementations.push_back( std::make_pair(*pCurr,implementationList) );
             }
 
             ++pCurr;
@@ -291,26 +306,48 @@ Reference<XInterface> CanvasFactory::use(
 }
 
 //______________________________________________________________________________
-Reference<XInterface> CanvasFactory::lookupAndUse(
-    OUString const & serviceName, Sequence<Any> const & args,
-    Reference<XComponentContext> const & xContext ) const
+void CanvasFactory::checkConfigFlag( bool& r_bFlag,
+                                     bool& r_CacheFlag,
+                                     const OUString& nodeName ) const
 {
-    ::osl::MutexGuard guard(m_mutex);
-
-    // forcing last entry from impl list, if config flag set
-    bool bForceLastEntry(false);
-    if( m_xForceFlagNameAccess.is() )
+    if( m_xCanvasConfigNameAccess.is() )
     {
-        m_xForceFlagNameAccess->getByName( OUSTR("ForceSafeServiceImpl") ) >>= bForceLastEntry;
+        m_xCanvasConfigNameAccess->getByName( nodeName ) >>= r_bFlag;
 
-        if( m_bCacheHasForcedLastImpl != bForceLastEntry )
+        if( r_CacheFlag != r_bFlag )
         {
             // cache is invalid, because of different order of
             // elements
-            m_bCacheHasForcedLastImpl = bForceLastEntry;
+            r_CacheFlag = r_bFlag;
             m_aCachedImplementations.clear();
         }
     }
+}
+
+//______________________________________________________________________________
+Reference<XInterface> CanvasFactory::lookupAndUse(
+    OUString const & serviceName, Sequence<Any> const & args,
+    Reference<XComponentContext> const & xContext ) const
+{
+    ::osl::MutexGuard guard(m_mutex);
+
+    // forcing last entry from impl list, if config flag set
+    bool bForceLastEntry(false);
+    checkConfigFlag( bForceLastEntry,
+                     m_bCacheHasForcedLastImpl,
+                     OUSTR("ForceSafeServiceImpl") );
+
+    // use anti-aliasing canvas, if config flag set (or not existing)
+    bool bUseAAEntry(true);
+    checkConfigFlag( bUseAAEntry,
+                     m_bCacheHasUseAAEntry,
+                     OUSTR("UseAntialiasingCanvas") );
+
+    // use accelerated canvas, if config flag set (or not existing)
+    bool bUseAcceleratedEntry(true);
+    checkConfigFlag( bUseAcceleratedEntry,
+                     m_bCacheHasUseAcceleratedEntry,
+                     OUSTR("UseAcceleratedCanvas") );
 
     // try to reuse last working implementation for given service name
     const CacheVector::iterator aEnd(m_aCachedImplementations.end());
@@ -330,27 +367,97 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
 
     // lookup in available service list
     const AvailVector::const_iterator aAvailEnd(m_aAvailableImplementations.end());
-    AvailVector::const_iterator aAvailMatch;
-    if( (aAvailMatch=std::find_if(m_aAvailableImplementations.begin(),
-                                  aAvailEnd,
-                                  boost::bind(&OUString::equals,
-                                              boost::cref(serviceName),
-                                              boost::bind(
-                                                  std::select1st<AvailPair>(),
-                                                  _1)))) != aAvailEnd )
+    AvailVector::const_iterator aAvailImplsMatch;
+    if( (aAvailImplsMatch=std::find_if(m_aAvailableImplementations.begin(),
+                                       aAvailEnd,
+                                       boost::bind(&OUString::equals,
+                                                   boost::cref(serviceName),
+                                                   boost::bind(
+                                                       std::select1st<AvailPair>(),
+                                                       _1)))) == aAvailEnd )
     {
-        const Sequence<OUString> aPreferredImpls( aAvailMatch->second );
-        const OUString* pCurrImpl = aPreferredImpls.getConstArray();
-        const OUString* const pEndImpl = pCurrImpl + aPreferredImpls.getLength();
+        return Reference<XInterface>();
+    }
 
-        // force last entry from impl list, if config flag set
-        if( bForceLastEntry )
-            pCurrImpl = pEndImpl-1;
+    const AvailVector::const_iterator aAAEnd(m_aAAImplementations.end());
+    AvailVector::const_iterator aAAImplsMatch;
+    if( (aAAImplsMatch=std::find_if(m_aAAImplementations.begin(),
+                                    aAAEnd,
+                                    boost::bind(&OUString::equals,
+                                                boost::cref(serviceName),
+                                                boost::bind(
+                                                    std::select1st<AvailPair>(),
+                                                    _1)))) == aAAEnd )
+    {
+        return Reference<XInterface>();
+    }
+
+    const AvailVector::const_iterator aAccelEnd(m_aAcceleratedImplementations.end());
+    AvailVector::const_iterator aAccelImplsMatch;
+    if( (aAccelImplsMatch=std::find_if(m_aAcceleratedImplementations.begin(),
+                                       aAccelEnd,
+                                       boost::bind(&OUString::equals,
+                                                   boost::cref(serviceName),
+                                                   boost::bind(
+                                                       std::select1st<AvailPair>(),
+                                                       _1)))) == aAccelEnd )
+    {
+        return Reference<XInterface>();
+    }
 
-        while( pCurrImpl != pEndImpl )
+    const Sequence<OUString> aPreferredImpls( aAvailImplsMatch->second );
+    const OUString* pCurrImpl = aPreferredImpls.getConstArray();
+    const OUString* const pEndImpl = pCurrImpl + aPreferredImpls.getLength();
+
+    const Sequence<OUString> aAAImpls( aAAImplsMatch->second );
+    const OUString* const pFirstAAImpl = aAAImpls.getConstArray();
+    const OUString* const pEndAAImpl = pFirstAAImpl + aAAImpls.getLength();
+
+    const Sequence<OUString> aAccelImpls( aAccelImplsMatch->second );
+    const OUString* const pFirstAccelImpl = aAccelImpls.getConstArray();
+    const OUString* const pEndAccelImpl = pFirstAccelImpl + aAccelImpls.getLength();
+
+    // force last entry from impl list, if config flag set
+    if( bForceLastEntry )
+        pCurrImpl = pEndImpl-1;
+
+    while( pCurrImpl != pEndImpl )
+    {
+        const OUString aCurrName(pCurrImpl->trim());
+
+        // check whether given canvas service is listed in the
+        // sequence of "accelerated canvas implementations"
+        const bool bIsAcceleratedImpl(
+            std::find_if(pFirstAccelImpl,
+                         pEndAccelImpl,
+                         boost::bind(&OUString::equals,
+                                     boost::cref(aCurrName),
+                                     boost::bind(
+                                         &OUString::trim,
+                                         _1))) != pEndAccelImpl );
+
+        // check whether given canvas service is listed in the
+        // sequence of "antialiasing canvas implementations"
+        const bool bIsAAImpl(
+            std::find_if(pFirstAAImpl,
+                         pEndAAImpl,
+                         boost::bind(&OUString::equals,
+                                     boost::cref(aCurrName),
+                                     boost::bind(
+                                         &OUString::trim,
+                                         _1))) != pEndAAImpl );
+
+        // try to instantiate canvas *only* if either accel and AA
+        // property match preference, *or*, if there's a mismatch, only
+        // go for a less capable canvas (that effectively let those
+        // pour canvas impls still work as fallbacks, should an
+        // accelerated/AA one fail). Property implies configuration:
+        // http://en.wikipedia.org/wiki/Truth_table#Logical_implication
+        if( (!bIsAAImpl || bUseAAEntry) && (!bIsAcceleratedImpl || bUseAcceleratedEntry) )
         {
             Reference<XInterface> xCanvas(
                 use( pCurrImpl->trim(), args, xContext ) );
+
             if(xCanvas.is())
             {
                 if( aMatch != aEnd )
@@ -368,9 +475,9 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
 
                 return xCanvas;
             }
-
-            ++pCurrImpl;
         }
+
+        ++pCurrImpl;
     }
 
     return Reference<XInterface>();
diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 29731514af65..5e08204681d3 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -42,7 +42,18 @@ namespace vclcanvas
                                    bMonochromeBuffer ) )
     {
         if( !bMonochromeBuffer )
+        {
+            // #i95645#
+#if defined( QUARTZ )
+            // use AA on VCLCanvas for Mac
             maVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | maVDev->GetAntialiasing() );
+#else
+            // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
+            // is not required to do AA. It would need to be adapted to use it correctly
+            // (especially gradient painting). This will need extra work.
+            maVDev->SetAntialiasing( maVDev->GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
+#endif
+        }
     }
 
     OutputDevice& BackBuffer::getOutDev()
diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx
index 2426a70bacca..a7895f1034dd 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.cxx
@@ -119,7 +119,17 @@ namespace vclcanvas
                         "BitmapBackBuffer::createVDev(): Unable to create VirtualDevice" );
 
             mpVDev->SetOutputSizePixel( maBitmap->GetSizePixel() );
+
+            // #i95645#
+#if defined( QUARTZ )
+            // use AA on VCLCanvas for Mac
             mpVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | mpVDev->GetAntialiasing() );
+#else
+            // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
+            // is not required to do AA. It would need to be adapted to use it correctly
+            // (especially gradient painting). This will need extra work.
+            mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
+#endif
         }
     }
 
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 2446053c2d21..755f1ce9cfdc 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -62,8 +62,16 @@ namespace vclcanvas
         mpBackBuffer.reset( new BackBuffer( rOutDev ));
         mpBackBuffer->setSize( rOutDev.GetOutputSizePixel() );
 
-        mpBackBuffer->getOutDev().SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW |
-                                                   mpBackBuffer->getOutDev().GetAntialiasing() );
+        // #i95645#
+#if defined( QUARTZ )
+        // use AA on VCLCanvas for Mac
+        mpBackBuffer->getOutDev().SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | mpBackBuffer->getOutDev().GetAntialiasing() );
+#else
+        // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
+        // is not required to do AA. It would need to be adapted to use it correctly
+        // (especially gradient painting). This will need extra work.
+        mpBackBuffer->getOutDev().SetAntialiasing(mpBackBuffer->getOutDev().GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
+#endif
     }
 
     ::sal_Int32 SpriteDeviceHelper::createBuffers( ::sal_Int32 nBuffers )