diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-05-03 13:11:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-05-03 13:11:22 +0000 |
| commit | 51ccb70432e62fb4092f2614e09da1e0ddb0f787 (patch) | |
| tree | 92afe7830fbadf0eeced98ca1b72850b23cd20e2 /cppcanvas | |
| parent | 742fb07c1173b381afe87eb8f5fee102bf48503b (diff) | |
INTEGRATION: CWS presfixes05 (1.9.2); FILE MERGED
2005/04/26 22:52:44 thb 1.9.2.1: #i47876# ::std::for_each takes functor by value, and returns the result. Correctly using that value now (otherwise, bounds easily become too small)
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index ce07f266c628..f6066c71c5dd 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: implrenderer.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2005-04-18 09:59:07 $ + * last change: $Author: obo $ $Date: 2005-05-03 14:11:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2516,8 +2516,8 @@ namespace cppcanvas } private: - const ::basegfx::B2DHomMatrix maTransformation; - bool mbRet; + ::basegfx::B2DHomMatrix maTransformation; + bool mbRet; }; class AreaQuery @@ -2552,8 +2552,8 @@ namespace cppcanvas } private: - const ::basegfx::B2DHomMatrix maTransformation; - ::basegfx::B2DRange maBounds; + ::basegfx::B2DHomMatrix maTransformation; + ::basegfx::B2DRange maBounds; }; // Doing that via inline class. Compilers tend to not inline free @@ -2631,12 +2631,11 @@ namespace cppcanvas ++aRangeBegin; // render full middle actions - if( !::std::for_each( aRangeBegin, - aRangeEnd, - rFunctor ).result() ) - { + rFunctor = ::std::for_each( aRangeBegin, + aRangeEnd, + rFunctor ); + if( !rFunctor.result() ) return false; - } if( aRangeEnd == rEnd || aRangeEnd->mnOrigIndex > nEndIndex ) |