INTEGRATION: CWS impress148 (1.4.34); FILE MERGED

2008/07/16 12:47:57 af 1.4.34.1: #i91701# Use only 4 component colors.

7 files changed, 25 insertions, 32 deletions

diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index f6078f706202..3d3748fd62d2 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: PresenterHelpView.cxx,v $
  *
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -331,7 +331,7 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox)
     rendering::RenderState aRenderState (
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL,
-        Sequence<double>(3),
+        Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
     PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont->mnColor);
 
diff --git a/sdext/source/presenter/PresenterPaneAnimator.cxx b/sdext/source/presenter/PresenterPaneAnimator.cxx
index 2012c43d2202..e8cc6f4130a5 100644
--- a/sdext/source/presenter/PresenterPaneAnimator.cxx
+++ b/sdext/source/presenter/PresenterPaneAnimator.cxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: PresenterPaneAnimator.cxx,v $
  *
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,6 +33,7 @@
 
 #include "PresenterAnimation.hxx"
 #include "PresenterAnimator.hxx"
+#include "PresenterCanvasHelper.hxx"
 #include "PresenterController.hxx"
 #include "PresenterGeometryHelper.hxx"
 #include "PresenterPaintManager.hxx"
@@ -625,7 +626,7 @@ void UnfoldInCenterAnimator::HidePane (void)
     const rendering::RenderState aRenderState (
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL,
-        Sequence<double>(3),
+        Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
 
     // Animate the uppder and lower window bitmaps.
@@ -1037,11 +1038,7 @@ void TransparentOverlayAnimator::CreateBackgroundSprite (void)
                 NULL,
                 Sequence<double>(4),
                 rendering::CompositeOperation::SOURCE);
-
-            aRenderState.DeviceColor[0] = 0.5;
-            aRenderState.DeviceColor[1] = 0.5;
-            aRenderState.DeviceColor[2] = 0.5;
-            aRenderState.DeviceColor[3] = 0.5;
+            PresenterCanvasHelper::SetDeviceColor(aRenderState, util::Color(0x80808080));
 
             Reference<rendering::XPolyPolygon2D> xPolygon (
                 PresenterGeometryHelper::CreatePolygon(aWindowBox, xCanvas->getDevice()));
@@ -1114,7 +1111,7 @@ void PaneGroup::CreateSubstitution (const Reference<rendering::XSpriteCanvas>& r
     const rendering::RenderState aRenderState (
         geometry::AffineMatrix2D(1,0,-maOriginalBoundingBox.X, 0,1,-maOriginalBoundingBox.Y),
         NULL,
-        Sequence<double>(3),
+        Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
 
     Reference<rendering::XCanvas> xSpriteCanvas (mpSubstitution->GetCanvas());
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 598578b4851a..af7baf025345 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: PresenterPaneBorderPainter.cxx,v $
  *
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -652,14 +652,12 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
     rendering::RenderState aRenderState(
         geometry::AffineMatrix2D(1,0,nX, 0,1,nY),
         NULL,
-        Sequence<double>(3),
+        Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
 
     if (bPaintBackground)
     {
-        aRenderState.DeviceColor[0] = 1;
-        aRenderState.DeviceColor[1] = 1;
-        aRenderState.DeviceColor[2] = 1;
+        PresenterCanvasHelper::SetDeviceColor(aRenderState, util::Color(0x00ffffff));
         Sequence<Sequence<geometry::RealPoint2D> > aPolygons(1);
         aPolygons[0] = Sequence<geometry::RealPoint2D>(4);
         aPolygons[0][0] = geometry::RealPoint2D(0, -nTextHeight);
@@ -842,7 +840,7 @@ void PresenterPaneBorderPainter::Renderer::PaintBitmap(
             double(nW)/rpBitmap->mnWidth, 0, nX,
             0, double(nH)/rpBitmap->mnHeight, nY),
         NULL,
-        Sequence<double>(3),
+        Sequence<double>(4),
         rendering::CompositeOperation::OVER);
 
     if (xBitmap.is())
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index a375b4dfb8cd..30c7c08b4cdd 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: PresenterSlidePreview.cxx,v $
  *
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -357,15 +357,13 @@ void PresenterSlidePreview::Paint (const awt::Rectangle& rBoundingBox)
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL);
 
-    Sequence<double> aBackgroundColor(3);
-    aBackgroundColor[0] = 0;
-    aBackgroundColor[1] = 0;
-    aBackgroundColor[2] = 0;
+    Sequence<double> aBackgroundColor(4);
     rendering::RenderState aRenderState (
         geometry::AffineMatrix2D(1, 0, aPreviewBox.X, 0, 1, aPreviewBox.Y),
         NULL,
         aBackgroundColor,
         rendering::CompositeOperation::SOURCE);
+    PresenterCanvasHelper::SetDeviceColor(aRenderState, 0x00000000);
     if (mxPreview.is())
     {
         mxCanvas->drawBitmap(mxPreview, aViewState, aRenderState);
diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx
index 1466c5ea6879..6498fac85c6e 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: PresenterSprite.cxx,v $
  *
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -179,7 +179,7 @@ void PresenterSprite::MoveTo (const css::geometry::RealPoint2D& rLocation)
             rendering::RenderState(
                 geometry::AffineMatrix2D(1,0,0, 0,1,0),
                 NULL,
-                uno::Sequence<double>(3),
+                uno::Sequence<double>(4),
                 rendering::CompositeOperation::SOURCE)
             );
 }
@@ -258,7 +258,7 @@ void PresenterSprite::ProvideSprite (void)
             rendering::RenderState(
                 geometry::AffineMatrix2D(1,0,0, 0,1,0),
                 NULL,
-                uno::Sequence<double>(3),
+                uno::Sequence<double>(4),
                 rendering::CompositeOperation::SOURCE)
                 );
             mxSprite->setAlpha(mnAlpha);
@@ -301,7 +301,7 @@ void PresenterSprite::SetToBitmap (const Reference<rendering::XBitmap>& rxBitmap
             rendering::RenderState(
                 geometry::AffineMatrix2D(1,0,0, 0,1,0),
                 NULL,
-                uno::Sequence<double>(3),
+                uno::Sequence<double>(4),
                 rendering::CompositeOperation::SOURCE));
 
     }
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 5156b4b230f7..ee50a5477097 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: PresenterToolBar.cxx,v $
  *
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1825,7 +1825,7 @@ void Button::PaintIcon (
         const rendering::RenderState aRenderState(
             geometry::AffineMatrix2D(1,0,nX, 0,1,nY),
             NULL,
-            Sequence<double>(3),
+            Sequence<double>(4),
             rendering::CompositeOperation::OVER);
         rxCanvas->drawBitmap(xBitmap, rViewState, aRenderState);
     }
@@ -2032,7 +2032,7 @@ void Text::Paint (
     rendering::RenderState aRenderState(
         geometry::AffineMatrix2D(1,0,nX, 0,1,nY),
         NULL,
-        Sequence<double>(3),
+        Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
     PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont->mnColor);
 
@@ -2349,7 +2349,7 @@ void VerticalSeparator::Paint (
     rendering::RenderState aRenderState(
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL,
-        Sequence<double>(3),
+        Sequence<double>(4),
         rendering::CompositeOperation::OVER);
     if (mpMode.get() != NULL)
     {
@@ -2412,7 +2412,7 @@ void HorizontalSeparator::Paint (
     rendering::RenderState aRenderState(
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL,
-        Sequence<double>(3),
+        Sequence<double>(4),
         rendering::CompositeOperation::OVER);
     if (mpMode.get() != NULL)
     {
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 370f2a443067..955087e96fbb 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: PresenterWindowManager.cxx,v $
  *
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1460,7 +1460,7 @@ ModeChangeAnimationStarter::ModeChangeAnimationStarter (
     const rendering::RenderState aRenderState (
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL,
-        Sequence<double>(3),
+        Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
     Reference<rendering::XCanvas> xSpriteCanvas (mpSprite->GetCanvas());
     if (xSpriteCanvas.is())