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.
This commit is contained in:
Oliver Bolte 2008-07-25 06:12:26 +00:00
parent 037cbf863f
commit 331c50a084

View file

@ -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<double>(3),
Sequence<double>(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<double>(3), rendering::CompositeOperation::SOURCE);
Sequence<double>(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;