head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2014.02.02.07.43.40;	author ryoon;	state dead;
branches;
next	1.1;
commitid	SCRPn9tBPxRmXunx;

1.1
date	2014.01.20.19.27.51;	author joerg;	state Exp;
branches;
next	;
commitid	mZR31TNIY8KOgTlx;


desc
@@


1.2
log
@Update to 4.2.0.4

Changelog:
* Many bugfixes
* Many new features
See https://wiki.documentfoundation.org/ReleaseNotes/4.2
and https://www.libreoffice.org/download/4-2-new-features-and-fixes/
@
text
@$NetBSD: patch-slideshow_source_engine_activities_activitiesfactory.cxx,v 1.1 2014/01/20 19:27:51 joerg Exp $

--- slideshow/source/engine/activities/activitiesfactory.cxx.orig	2013-10-22 17:49:23.000000000 +0000
+++ slideshow/source/engine/activities/activitiesfactory.cxx
@@@@ -557,7 +557,7 @@@@ public:
         // interpolate between nIndex and nIndex+1 values
         (*mpAnim)(
             getPresentationValue(
-                accumulate( maValues.back(),
+                accumulate<ValueType>( maValues.back(),
                             mbCumulative ? nRepeatCount : 0,
                             maInterpolator( maValues[ nIndex ],
                                             maValues[ nIndex+1 ],
@@@@ -577,7 +577,7 @@@@ public:
         // this is discrete, thus no lerp here.
         (*mpAnim)(
             getPresentationValue(
-                accumulate( maValues.back(),
+                accumulate<ValueType>( maValues.back(),
                             mbCumulative ? nRepeatCount : 0,
                             maValues[ nFrame ] ) ) );
     }
@


1.1
log
@Fix build with Clang. Patches mostly from FreeBSD.
@
text
@d1 1
a1 1
$NetBSD$
@