INTEGRATION: CWS presfixes03 (1.5.2); FILE MERGED

2005/04/01 16:09:46 thb 1.5.2.1: #i36190#, #i39245# Changed uno::Sequence::operator[] for nonconst sequences to use naked ptr; added support for true bezier polygons (and removed subdivision, where it was added because of that canvas deficiency); overhauled mtf renderer to provide faithful bounds also for subsetted meta files

2 files changed, 10 insertions, 10 deletions

diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx
index 59f598c7f06f..759401c75ebd 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implbitmap.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-03-30 08:33:06 $
+ *  last change: $Author: obo $ $Date: 2005-04-18 10:01:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,6 +66,8 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #endif
 
+#include <canvas/canvastools.hxx>
+
 
 using namespace ::com::sun::star;
 
@@ -132,11 +134,8 @@ namespace cppcanvas
             }
 
             rendering::RenderState aLocalState( maRenderState );
-            aLocalState.DeviceColor.realloc( 4 );
-            aLocalState.DeviceColor[0] = 1.0;
-            aLocalState.DeviceColor[1] = 1.0;
-            aLocalState.DeviceColor[2] = 1.0;
-            aLocalState.DeviceColor[3] = nAlphaModulation;
+            ::canvas::tools::setDeviceColor( aLocalState,
+                                             1.0, 1.0, 1.0, nAlphaModulation );
 
             // TODO(P1): implement caching
             pCanvas->getUNOCanvas()->drawBitmapModulated( mxBitmap,
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index 79b3c7b56fbb..01f5e6335de4 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: vclfactory.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-03-30 08:35:49 $
+ *  last change: $Author: obo $ $Date: 2005-04-18 10:01:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -344,6 +344,7 @@ namespace cppcanvas
 
         const USHORT nBitmaps( rAnim.Count() );
         uno::Sequence< uno::Reference< rendering::XBitmap > > aBitmapSequence( nBitmaps );
+        uno::Reference< rendering::XBitmap >* pBitmaps = aBitmapSequence.getArray();
 
         unsigned int i;
         BitmapEx aBmpEx;
@@ -391,7 +392,7 @@ namespace cppcanvas
             if( rAnimBmp.eDisposal == DISPOSE_NOT )
                 aRestoreBuffer = aBmpEx;
 
-            aBitmapSequence[i] = ::vcl::unotools::xBitmapFromBitmapEx(
+            pBitmaps[i] = ::vcl::unotools::xBitmapFromBitmapEx(
                 xCanvas->getDevice(),
                 aBmpEx);
         }