diff options
Diffstat (limited to 'slideshow')
-rw-r--r-- | slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx | 8 | ||||
-rw-r--r-- | slideshow/source/engine/OGLTrans/makefile.mk | 6 | ||||
-rw-r--r-- | slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx | 6 | ||||
-rw-r--r-- | slideshow/source/engine/makefile.mk | 2 | ||||
-rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 8 | ||||
-rw-r--r-- | slideshow/source/engine/smilfunctionparser.cxx | 2 | ||||
-rw-r--r-- | slideshow/source/inc/delayevent.hxx | 6 | ||||
-rw-r--r-- | slideshow/util/makefile.mk | 4 | ||||
-rw-r--r-- | slideshow/util/makefile.pmk | 4 |
9 files changed, 29 insertions, 17 deletions
diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx index 6c07065e2904..94ba2acb5682 100644 --- a/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx @@ -55,7 +55,6 @@ #include <tools/gen.hxx> #include <vcl/window.hxx> #include <vcl/syschild.hxx> -#include <vcl/sysdata.hxx> #include <boost/noncopyable.hpp> @@ -64,10 +63,16 @@ #if defined( WNT ) + #include <tools/prewin.h> + #include <windows.h> + #include <tools/postwin.h> #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF #elif defined( OS2 ) #elif defined( QUARTZ ) + #include "premac.h" + #include <Cocoa/Cocoa.h> + #include "postmac.h" #elif defined( UNX ) namespace unx { @@ -77,6 +82,7 @@ namespace unx #include <GL/glxext.h> } #endif +#include <vcl/sysdata.hxx> #ifdef DEBUG #include <boost/date_time/posix_time/posix_time.hpp> diff --git a/slideshow/source/engine/OGLTrans/makefile.mk b/slideshow/source/engine/OGLTrans/makefile.mk index 3e5f818923dc..6353b2da58fb 100644 --- a/slideshow/source/engine/OGLTrans/makefile.mk +++ b/slideshow/source/engine/OGLTrans/makefile.mk @@ -33,6 +33,7 @@ PRJ=..$/..$/.. PRJNAME=slideshow TARGET=OGLTrans +TARGETTYPE=GUI ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------------- @@ -58,7 +59,12 @@ DLLPRE= SHL1TARGET=$(TARGET).uno .IF "$(GUI)"=="UNX" +.IF "$(GUIBASE)"=="aqua" + SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) + CFLAGSCXX+=$(OBJCXXFLAGS) +.ELSE SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) -lGL -lGLU -lX11 +.ENDIF .ELSE SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) opengl32.lib glu32.lib gdi32.lib .ENDIF diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index cced9fa3f83f..683fe7bd9707 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,7 +63,7 @@ void SequentialTimeContainer::activate_st() { // deactivate ASAP: scheduleDeactivationEvent( - makeEvent( boost::bind( &AnimationNode::deactivate, getSelf() ) ) ); + makeEvent( boost::bind< void >( boost::mem_fn( &AnimationNode::deactivate ), getSelf() ) ) ); } else // use default scheduleDeactivationEvent(); @@ -89,7 +89,7 @@ void SequentialTimeContainer::skipEffect( // empty all events ignoring timings => until next effect getContext().mrEventQueue.forceEmpty(); getContext().mrEventQueue.addEventForNextRound( - makeEvent( boost::bind(&AnimationNode::deactivate, pChildNode) ) ); + makeEvent( boost::bind<void>( boost::mem_fn( &AnimationNode::deactivate ), pChildNode ) ) ); } else OSL_ENSURE( false, "unknown notifier!" ); diff --git a/slideshow/source/engine/makefile.mk b/slideshow/source/engine/makefile.mk index ba00e028b9ff..b064ad7b94cb 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 ac0f256324d7..d8dc7931add1 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -1668,7 +1668,7 @@ void SlideShowImpl::notifySlideAnimationsEnded() // schedule a slide end event, with automatic mode's // delay aNotificationEvents = makeInterruptableDelay( - boost::bind( &SlideShowImpl::notifySlideEnded, this ), + boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this ), maEventMultiplexer.getAutomaticTimeout() ); } else @@ -1693,7 +1693,7 @@ void SlideShowImpl::notifySlideAnimationsEnded() bHasAutomaticNextSlide ) { aNotificationEvents = makeInterruptableDelay( - boost::bind( &SlideShowImpl::notifySlideEnded, this ), + boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this ), nAutomaticNextSlideTimeout); // TODO(F2): Provide a mechanism to let the user override @@ -1709,8 +1709,8 @@ void SlideShowImpl::notifySlideAnimationsEnded() // generate interruptable event here, there's no // timeout involved. aNotificationEvents.mpImmediateEvent = - makeEvent( boost::bind( - &SlideShowImpl::notifySlideEnded, this ) ); + makeEvent( boost::bind<void>( + boost::mem_fn(&SlideShowImpl::notifySlideEnded), this ) ); } } 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 29ef713f6550..10960e395feb 100644 --- a/slideshow/source/inc/delayevent.hxx +++ b/slideshow/source/inc/delayevent.hxx @@ -30,12 +30,10 @@ #ifndef INCLUDED_SLIDESHOW_DELAYEVENT_HXX #define INCLUDED_SLIDESHOW_DELAYEVENT_HXX +#include <boost/function.hpp> + #include "event.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 { diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk index 4b4008624c1e..aba4094b242f 100644 --- a/slideshow/util/makefile.mk +++ b/slideshow/util/makefile.mk @@ -41,8 +41,8 @@ ENABLE_EXCEPTIONS=TRUE # --- Common ---------------------------------------------------------- -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE +.IF "$(VERBOSE)"=="TRUE" +CDEFS+=-DVERBOSE .ENDIF SHL1DLLPRE= diff --git a/slideshow/util/makefile.pmk b/slideshow/util/makefile.pmk index 5aef116cd677..362e7f862a71 100644 --- a/slideshow/util/makefile.pmk +++ b/slideshow/util/makefile.pmk @@ -29,8 +29,8 @@ # #************************************************************************* -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE +.IF "$(VERBOSE)"=="TRUE" +CDEFS+=-DVERBOSE .ENDIF .IF "$(debug)"!="" || "$(DEBUG)"!="" |