From 331c50a08423390b5a8d3ca2148eb766584e61dd Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Fri, 25 Jul 2008 06:12:26 +0000 Subject: [PATCH] INTEGRATION: CWS impress148 (1.3.6); FILE MERGED 2008/07/23 15:54:01 cl 1.3.6.2: RESYNC: (1.3-1.4); FILE MERGED 2008/07/16 12:47:57 af 1.3.6.1: #i91701# Use only 4 component colors. --- sdext/source/presenter/PresenterButton.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index d441f394f44a..5d1ccad945ff 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -8,7 +8,7 @@ * * $RCSfile: PresenterButton.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -331,7 +331,7 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent) rendering::RenderState aRenderState( geometry::AffineMatrix2D(1,0,0, 0,1,0), PresenterGeometryHelper::CreatePolygon(rEvent.UpdateRect, mxCanvas->getDevice()), - Sequence(3), + Sequence(4), rendering::CompositeOperation::SOURCE); mxCanvas->drawBitmap(xBitmap, aViewState, aRenderState); @@ -489,7 +489,7 @@ void PresenterButton::RenderButton ( const geometry::RealRectangle2D aTextBBox (xLayout->queryTextBounds()); rendering::RenderState aRenderState (geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL, - Sequence(3), rendering::CompositeOperation::SOURCE); + Sequence(4), rendering::CompositeOperation::SOURCE); PresenterCanvasHelper::SetDeviceColor(aRenderState, rpFont->mnColor); aRenderState.AffineTransform.m02 = (rSize.Width - aTextBBox.X2 + aTextBBox.X1)/2; aRenderState.AffineTransform.m12 = rSize.Height - aTextBBox.Y2 - gnVerticalBorder - nBottomOffset;