diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:12:08 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:12:08 +0200 |
commit | 49ac1b530b440d4fa3ec0bff9cd3d4e70bef838a (patch) | |
tree | d432fa8e42251e69e95f7d56cca7fc1b03f18f2c /slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx | |
parent | 315eec9e4dbdd27063f4b970c25e9c719e86bcd8 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit a74d3413eb0220f6c35f38a8ce955098b9fb6eb6 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:06 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit 64665cb6c5b6ace06e81d3c98c424b6cf2beb49c
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 16:35:37 2011 +0200
Remove extra bracket to fix build
build breakage added by the previous commit
sd/source/filter/eppt/pptx-epptbase.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 9dd7ef585a463bafa8750e5b30acb38949bbf1ce
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Fri May 20 11:00:26 2011 +0300
Add sanity check before dereference, bnc#694119
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sd/source/filter/eppt/pptx-epptbase.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit d53f1f6ee9f02d3d77c76910023986f7f346fc30
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Mar 18 13:19:59 2011 +0100
Fix fdo#33947 crash in Impress after printing
Fixes lifetime issue with DrawViewShell - solved by not handing
one in to the print preview DocumentRenderer
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
sd/source/ui/view/DocumentRenderer.cxx | 2 +-
sd/source/ui/view/drawview.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: impress_libreoffice-3.3.3.1
split repo tag: impress_libreoffice-3.3.4.1
Diffstat (limited to 'slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx')
-rw-r--r-- | slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index cf7340cd14fc..1fab09442990 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ void SequentialTimeContainer::activate_st() OSL_ENSURE( false, "### resolving child failed!" ); } } - + if (isDurationIndefinite() && (maChildren.empty() || mnFinishedChildren >= maChildren.size())) { @@ -113,20 +113,20 @@ bool SequentialTimeContainer::resolveChild( mpCurrentSkipEvent->dispose(); if (mpCurrentRewindEvent) mpCurrentRewindEvent->dispose(); - + // event that will deactivate the resolved/running child: mpCurrentSkipEvent = makeEvent( - boost::bind( &SequentialTimeContainer::skipEffect, + boost::bind( &SequentialTimeContainer::skipEffect, boost::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ), pChildNode ), "SequentialTimeContainer::skipEffect, resolveChild"); // event that will reresolve the resolved/activated child: mpCurrentRewindEvent = makeEvent( - boost::bind( &SequentialTimeContainer::rewindEffect, + boost::bind( &SequentialTimeContainer::rewindEffect, boost::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ), pChildNode ), "SequentialTimeContainer::rewindEffect, resolveChild"); - + // deactivate child node when skip event occurs: getContext().mrUserEventQueue.registerSkipEffectEvent( mpCurrentSkipEvent, @@ -143,13 +143,13 @@ void SequentialTimeContainer::notifyDeactivating( { if (notifyDeactivatedChild( rNotifier )) return; - + OSL_ASSERT( mnFinishedChildren < maChildren.size() ); AnimationNodeSharedPtr const& pNextChild = maChildren[mnFinishedChildren]; OSL_ASSERT( pNextChild->getState() == UNRESOLVED ); - + if (! resolveChild( pNextChild )) { - // could not resolve child - since we risk to + // could not resolve child - since we risk to // stall the chain of events here, play it safe // and deactivate this node (only if we have // indefinite duration - otherwise, we'll get a |