summaryrefslogtreecommitdiff
path: root/sdext/source/presenter/PresenterSlideSorter.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-07-25 06:14:26 +0000
committerOliver Bolte <obo@openoffice.org>2008-07-25 06:14:26 +0000
commit109cfaff84c67a6c52b8b18a3b2560ad8440ead6 (patch)
treeb1c99743f3afa2591d92ce645a973246e47ed582 /sdext/source/presenter/PresenterSlideSorter.cxx
parentd96bca7e6ac480e3657b9b36d02cf9bd042c5736 (diff)
INTEGRATION: CWS impress148 (1.5.10); FILE MERGED
2008/07/23 15:54:04 cl 1.5.10.2: RESYNC: (1.5-1.6); FILE MERGED 2008/07/16 12:47:57 af 1.5.10.1: #i91701# Use only 4 component colors.
Diffstat (limited to 'sdext/source/presenter/PresenterSlideSorter.cxx')
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 2e9003072edb..ed1a06297184 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -8,7 +8,7 @@
*
* $RCSfile: PresenterSlideSorter.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
* This file is part of OpenOffice.org.
*
@@ -1058,7 +1058,7 @@ void PresenterSlideSorter::PaintPreview (
1, 0, aTopLeft.X,
0, 1, aTopLeft.Y),
NULL,
- Sequence<double>(3),
+ Sequence<double>(4),
rendering::CompositeOperation::SOURCE);
@@ -1147,7 +1147,7 @@ void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox)
// Paint the horizontal separator.
rendering::RenderState aRenderState (geometry::AffineMatrix2D(1,0,0, 0,1,0),
- NULL, Sequence<double>(3), rendering::CompositeOperation::SOURCE);
+ NULL, Sequence<double>(4), rendering::CompositeOperation::SOURCE);
PresenterCanvasHelper::SetDeviceColor(aRenderState, maSeparatorColor);
mxCanvas->drawLine(
geometry::RealPoint2D(0, mnSeparatorY),
@@ -1806,7 +1806,7 @@ void PresenterSlideSorter::MouseOverManager::Paint (
rendering::RenderState(
geometry::AffineMatrix2D(1,0,nXOffset, 0,1,nYOffset),
NULL,
- Sequence<double>(3),
+ Sequence<double>(4),
rendering::CompositeOperation::SOURCE));
}
}
@@ -1919,7 +1919,7 @@ Reference<rendering::XBitmap> PresenterSlideSorter::MouseOverManager::CreateBitm
rendering::RenderState aRenderState (
geometry::AffineMatrix2D(1,0,nXOffset, 0,1,nYOffset),
NULL,
- Sequence<double>(3),
+ Sequence<double>(4),
rendering::CompositeOperation::SOURCE);
PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont->mnColor);
@@ -2275,7 +2275,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapOnce(
1, 0, nX,
0, 1, nY),
NULL,
- Sequence<double>(3),
+ Sequence<double>(4),
rendering::CompositeOperation::SOURCE);
rxCanvas->drawBitmap(
@@ -2315,7 +2315,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapTiled(
1, 0, nX0,
0, 1, nY0),
NULL,
- Sequence<double>(3),
+ Sequence<double>(4),
rendering::CompositeOperation::SOURCE);
const double nX1 = nX0 + nWidth;