From cb3b577dd0b8e2d02d78ac040c24866a4dd82caa Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 28 Feb 2006 09:48:34 +0000 Subject: [PATCH] INTEGRATION: CWS cairocanvas (1.14.4); FILE MERGED 2005/12/12 19:06:03 thb 1.14.4.2: RESYNC: (1.14-1.15); FILE MERGED 2005/11/24 17:47:24 thb 1.14.4.1: #i58018# applied pjanik's patch - 0L and sal_Int32 have differing types on x86_64 --- cppcanvas/source/mtfrenderer/implrenderer.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 7b9c0c8a01cf..e221b9270f31 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: implrenderer.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: obo $ $Date: 2005-11-17 16:14:06 $ + * last change: $Author: kz $ $Date: 2006-02-28 10:48:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2655,7 +2655,7 @@ namespace cppcanvas { // only a single action. Setup subset, and call functor Action::Subset aSubset; - aSubset.mnSubsetBegin = ::std::max( 0L, + aSubset.mnSubsetBegin = ::std::max( sal_Int32( 0 ), nStartIndex - aRangeBegin->mnOrigIndex ); aSubset.mnSubsetEnd = ::std::min( aRangeBegin->mpAction->getActionCount(), nEndIndex - aRangeBegin->mnOrigIndex ); @@ -2672,7 +2672,7 @@ namespace cppcanvas // render partial first, full intermediate, and // partial last action Action::Subset aSubset; - aSubset.mnSubsetBegin = ::std::max( 0L, + aSubset.mnSubsetBegin = ::std::max( sal_Int32( 0 ), nStartIndex - aRangeBegin->mnOrigIndex ); aSubset.mnSubsetEnd = aRangeBegin->mpAction->getActionCount();