ooo-build r14422 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue Oct 28 18:06:01 2008
New Revision: 14422
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14422&view=rev

Log:
    * patches/dev300/cws-impress162-slideshow.diff: make that actually
    compile



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-impress162-slideshow.diff

Modified: trunk/patches/dev300/cws-impress162-slideshow.diff
==============================================================================
--- trunk/patches/dev300/cws-impress162-slideshow.diff	(original)
+++ trunk/patches/dev300/cws-impress162-slideshow.diff	Tue Oct 28 18:06:01 2008
@@ -116,6 +116,14 @@
 diff -u -p -r1.16 -r1.16.16.2
 --- slideshow/source/engine/animationnodes/animationbasenode.cxx	24 Jun 2008 12:06:45 -0000	1.16
 +++ slideshow/source/engine/animationnodes/animationbasenode.cxx	16 Oct 2008 14:48:04 -0000	1.16.16.2
+@@ -34,6 +34,7 @@
+ // must be first
+ #include <canvas/debug.hxx>
+ #include <canvas/verbosetrace.hxx>
++#include <canvas/canvastools.hxx>
+ #include <cppuhelper/exc_hlp.hxx>
+ #include <comphelper/anytostring.hxx>
+ #include <com/sun/star/presentation/ParagraphTarget.hpp>
 @@ -45,6 +45,7 @@
  #include "doctreenode.hxx"
  #include "animationbasenode.hxx"
@@ -132,7 +140,7 @@
 +
 +    // Calculate the minimum frame count that depends on the duration and
 +    // the minimum frame count.
-+    const sal_Int32 nMinFrameCount (basegfx::clamp<sal_Int32>(
++    const sal_Int32 nMinFrameCount (canvas::tools::clamp<sal_Int32>(
 +        basegfx::fround(nDuration * FrameRate::MinimumFramesPerSecond), 1, 10));
 +
      return ActivitiesFactory::CommonParameters(