From 3660c4324cf2da169d24e8cc1e1662faedee935e Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Wed, 2 Jun 2010 14:02:07 +0200 Subject: [PATCH] renaissance1: #i107215# Small fixes. --- sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx | 4 +++- sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx index 347ce09603c8..289fb1f5f072 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx @@ -53,7 +53,9 @@ public: Representative (const Representative& rOther) : maBitmap(rOther.maBitmap), mbIsExcluded(rOther.mbIsExcluded) {} Representative operator= (Representative& rOther) - { maBitmap = rOther.maBitmap; mbIsExcluded = rOther.mbIsExcluded; } + { if (&rOther != this) {maBitmap = rOther.maBitmap; mbIsExcluded = rOther.mbIsExcluded; } + return *this; + } Bitmap maBitmap; bool mbIsExcluded; diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index 02251afb3f89..9b878b1ddcb0 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -110,7 +110,7 @@ void FramePainter::AdaptColor ( BitmapReadAccess* pReadAccess = maCenter.maBitmap.GetBitmap().AcquireReadAccess(); if (pReadAccess == NULL) return; - const Color aSourceColor (pReadAccess->GetColor(0,0)); + const Color aSourceColor = pReadAccess->GetColor(0,0); maCenter.maBitmap.GetBitmap().ReleaseAccess(pReadAccess); // Erase the center bitmap.