slideshow1: merge with DEV300 m61

6 files changed, 19 insertions, 14 deletions

diff --git a/slideshow/source/engine/OGLTrans/makefile.mk b/slideshow/source/engine/OGLTrans/makefile.mk
index 2062b8c7d4c5..6353b2da58fb 100644
--- a/slideshow/source/engine/OGLTrans/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/makefile.mk
@@ -61,7 +61,6 @@ SHL1TARGET=$(TARGET).uno
 .IF "$(GUI)"=="UNX"
 .IF "$(GUIBASE)"=="aqua"
     SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB)
-    OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
     CFLAGSCXX+=$(OBJCXXFLAGS)
 .ELSE
     SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) -lGL -lGLU -lX11
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index 66ff0c40ceee..79046f50251a 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -34,11 +34,11 @@
 #include <canvas/debug.hxx>
 #include <canvas/verbosetrace.hxx>
 
+#include "delayevent.hxx"
 #include "eventqueue.hxx"
 #include "usereventqueue.hxx"
 #include "sequentialtimecontainer.hxx"
 #include "tools.hxx"
-#include "delayevent.hxx"
 
 #include <boost/bind.hpp>
 #include <algorithm>
@@ -63,8 +63,9 @@ void SequentialTimeContainer::activate_st()
     {
         // deactivate ASAP:
         scheduleDeactivationEvent(
-            makeEvent( boost::bind( &AnimationNode::deactivate, getSelf() ),
-                       "SequentialTimeContainer::deactivate") );
+            makeEvent(
+                 boost::bind< void >( boost::mem_fn( &AnimationNode::deactivate ), getSelf() ),
+                 "SequentialTimeContainer::deactivate") );
     }
     else // use default
         scheduleDeactivationEvent();
@@ -90,8 +91,9 @@ void SequentialTimeContainer::skipEffect(
         // empty all events ignoring timings => until next effect
         getContext().mrEventQueue.forceEmpty();
         getContext().mrEventQueue.addEvent(
-            makeEvent( boost::bind(&AnimationNode::deactivate, pChildNode),
-                       "SequentialTimeContainer::deactivate, skipEffect with delay") );
+            makeEvent(
+                boost::bind<void>( boost::mem_fn( &AnimationNode::deactivate ), pChildNode ),
+                "SequentialTimeContainer::deactivate, skipEffect with delay") );
     }
     else
         OSL_ENSURE( false, "unknown notifier!" );
diff --git a/slideshow/source/engine/makefile.mk b/slideshow/source/engine/makefile.mk
index 1165ba93467e..84afa7fb657e 100644
--- a/slideshow/source/engine/makefile.mk
+++ b/slideshow/source/engine/makefile.mk
@@ -43,6 +43,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Common ----------------------------------------------------------
 
+ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
+
 .IF "$(OS)"=="SOLARIS"
 .IF "$(CCNUMVER)"=="00050009"
 # SunStudio12: anachronism warning in boost code (smilfunctionparser.cxx)
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index b042014af9c6..9a4878f43d59 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1954,7 +1954,11 @@ void SlideShowImpl::notifySlideAnimationsEnded()
         // schedule a slide end event, with automatic mode's
         // delay
         aNotificationEvents = makeInterruptableDelay(
+<<<<<<< .working
             boost::bind( &SlideShowImpl::notifySlideEnded, this, false ),
+=======
+            boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this ),
+>>>>>>> .merge-right.r276697
             maEventMultiplexer.getAutomaticTimeout() );
     }
     else
@@ -1979,7 +1983,7 @@ void SlideShowImpl::notifySlideAnimationsEnded()
             bHasAutomaticNextSlide )
         {
             aNotificationEvents = makeInterruptableDelay(
-                boost::bind( &SlideShowImpl::notifySlideEnded, this, false ),
+                boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this, false ),
                 nAutomaticNextSlideTimeout);
 
             // TODO(F2): Provide a mechanism to let the user override
@@ -1995,8 +1999,8 @@ void SlideShowImpl::notifySlideAnimationsEnded()
             // generate interruptable event here, there's no
             // timeout involved.
             aNotificationEvents.mpImmediateEvent =
-                makeEvent( boost::bind(
-                    &SlideShowImpl::notifySlideEnded, this, false ),
+                makeEvent( boost::bind<void>(
+                    boost::mem_fn(&SlideShowImpl::notifySlideEnded), this, false ),
                     "SlideShowImpl::notifySlideEnded");
         }
     }
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index 04e0368ff6d7..3ae24d87b9a8 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -55,7 +55,7 @@
 #include <typeinfo>
 #define BOOST_SPIRIT_DEBUG
 #endif
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/classic_core.hpp>
 
 #if OSL_DEBUG_LEVEL > 0
 #include <iostream>
diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index ba06bffa95ec..1c4e09faa7da 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -30,13 +30,11 @@
 #ifndef INCLUDED_SLIDESHOW_DELAYEVENT_HXX
 #define INCLUDED_SLIDESHOW_DELAYEVENT_HXX
 
+#include <boost/function.hpp>
+
 #include "event.hxx"
 #include "debug.hxx"
 #include <boost/noncopyable.hpp>
-#include <boost/function.hpp>
-#if defined(VERBOSE) && defined(DBG_UTIL)
-#include "boost/current_function.hpp"
-#endif
 
 namespace slideshow {
 namespace internal {