From ee978b0231c702a6c90d52ac6d7d0f6f70586f3d Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Mon, 20 Sep 2004 12:32:31 +0000 Subject: INTEGRATION: CWS impress21ea (1.2.60); FILE MERGED 2004/08/26 11:11:56 af 1.2.60.1: #i32627# Code cleanup. --- sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'sd/source/ui/slidesorter') diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index c20450f53a3e..4506b82dca87 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -2,9 +2,9 @@ * * $RCSfile: SlsGenericPageCache.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-07-13 14:10:17 $ + * last change: $Author: rt $ $Date: 2004-09-20 13:32:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,6 @@ #define SD_SLIDESORTER_GENERIC_PAGE_CACHE_HXX #include "SlsQueueProcessor.hxx" -#include "SlsPreviewBitmapFactory.hxx" #include "view/SlsPageObjectViewObjectContact.hxx" @@ -262,12 +261,12 @@ BitmapEx GenericPageCache< Size aBitmapSize (aPreview.GetSizePixel()); if (aBitmapSize != rSize) { - OSL_ASSERT (rSize.Width() < 1000); - // The bitmap has the wrong size. + DBG_ASSERT (rSize.Width() < 1000, + "GenericPageCache<>::GetPreviewBitmap(): bitmap requested with large width. This may indicate an error."); // Scale the bitmap to the desired size when that is possible, // i.e. the bitmap is not empty. - if (aBitmapSize.Width() != 0 && aBitmapSize.Height()) + if (aBitmapSize.Width()>0 && aBitmapSize.Height()>0) // BMP_SCALE_NONE 0x00000000UL // BMP_SCALE_FAST 0x00000001UL // BMP_SCALE_INTERPOLATE 0x00000002UL -- cgit