[Libreoffice-commits] core.git: 2 commits - forms/source slideshow/source

[Herbert Dürr]

 forms/source/xforms/model.hxx                            |    2 +-
 slideshow/source/engine/activities/activitiesfactory.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 982462ac5c6df0c85ba6a0b3fbdaa80b38a94882
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue Apr 16 11:41:34 2013 +0000

    eliminate type ambiguity for std::accumulate() invocation
    
    else clang/libc++ cannot decide between bool and a reference into a bit-vector
    specialization
    
    (cherry picked from commit 6a88a21257124d953637c4b8ead9c9771e15b899)
    
    Change-Id: I694bbad82b1a05ebe86c5c941f3ac85c71f5fc9e

diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index 2354e51..530a8fe 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/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 ] ) ) );
     }
commit d133d8f0dfaaab53af225d3f667b14ee02aa21fc
Author: Herbert Dürr <hdu at apache.org>
Date:   Fri Apr 26 12:43:44 2013 +0000

    make sure class MIP is complete before it is used
    
    (cherry picked from commit c8ed66993a98faa4730d507903f110dc80c61445)
    
    Conflicts:
    	forms/source/xforms/model.hxx
    
    Change-Id: Iec9e999b1568ad422ea2118c04b770000bdbfd75

diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index a2d83b6..f68522c 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
+#include "mip.hxx"
 #include <map>
 
 
@@ -46,7 +47,6 @@ namespace com { namespace sun { namespace star
 } } }
 namespace xforms
 {
-    class MIP;
     class BindingCollection;
     class SubmissionCollection;
     class InstanceCollection;