Skip to content

C
core
Kaydet (Commit) ce123a5c authored tarafından Thorsten Behrens's avatar Thorsten Behrens
Dosyalara gözat
Seçenekler

Fix totally busted whitespace in slideshow module.

üst 53ec7e3b
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 63 deletions
slideshow/source/engine/transitions/slidetransitionfactory.cxx
Dosyayı görüntüle @ ce123a5c
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#include <canvas/debug.hxx> #include <canvas/debug.hxx>
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
...@@ -147,54 +146,54 @@ public: ...@@ -147,54 +146,54 @@ public:
rEventMultiplexer ), rEventMultiplexer ),
maTransitions(), maTransitions(),
mbSuccess( false ), mbSuccess( false ),
mnTransitionType( nTransitionType ), mnTransitionType( nTransitionType ),
mnTransitionSubType( nTransitionSubType ), mnTransitionSubType( nTransitionSubType ),
mxFactory( xFactory ) mxFactory( xFactory )
{ {
// create one transition per view // create one transition per view
UnoViewVector::const_iterator aCurrView (rViewContainer.begin()); UnoViewVector::const_iterator aCurrView (rViewContainer.begin());
const UnoViewVector::const_iterator aEnd(rViewContainer.end()); const UnoViewVector::const_iterator aEnd(rViewContainer.end());
while( aCurrView != aEnd ) while( aCurrView != aEnd )
{ {
if(! addTransition( *aCurrView ) ) if(! addTransition( *aCurrView ) )
return; return;
ENSURE_OR_THROW(maTransitions.back() && maTransitions.back()->mxTransition.is(), ENSURE_OR_THROW(maTransitions.back() && maTransitions.back()->mxTransition.is(),
"Failed to create plugin transition"); "Failed to create plugin transition");
++aCurrView; ++aCurrView;
} }
mbSuccess = true; mbSuccess = true;
} }
~PluginSlideChange() ~PluginSlideChange()
{ {
mxFactory.clear(); mxFactory.clear();
::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin()); ::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin());
::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end()); ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
while( aCurrView != aEnd ) while( aCurrView != aEnd )
{ {
delete (*aCurrView); delete (*aCurrView);
++aCurrView; ++aCurrView;
} }
maTransitions.clear(); maTransitions.clear();
} }
bool addTransition( const UnoViewSharedPtr& rView ) bool addTransition( const UnoViewSharedPtr& rView )
{ {
uno::Reference<presentation::XTransition> rTransition = mxFactory->createTransition( uno::Reference<presentation::XTransition> rTransition = mxFactory->createTransition(
mnTransitionType, mnTransitionType,
mnTransitionSubType, mnTransitionSubType,
rView->getUnoView(), rView->getUnoView(),
getLeavingBitmap(ViewEntry(rView))->getXBitmap(), getLeavingBitmap(ViewEntry(rView))->getXBitmap(),
getEnteringBitmap(ViewEntry(rView))->getXBitmap() ); getEnteringBitmap(ViewEntry(rView))->getXBitmap() );
if( rTransition.is() ) if( rTransition.is() )
maTransitions.push_back( new TransitionViewPair( rTransition, rView ) ); maTransitions.push_back( new TransitionViewPair( rTransition, rView ) );
else else
return false; return false;
return true; return true;
} }
virtual bool operator()( double t ) virtual bool operator()( double t )
...@@ -214,83 +213,87 @@ public: ...@@ -214,83 +213,87 @@ public:
// ViewEventHandler // ViewEventHandler
virtual void viewAdded( const UnoViewSharedPtr& rView ) virtual void viewAdded( const UnoViewSharedPtr& rView )
{ {
OSL_TRACE("PluginSlideChange viewAdded"); OSL_TRACE("PluginSlideChange viewAdded");
SlideChangeBase::viewAdded( rView ); SlideChangeBase::viewAdded( rView );
::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin()); ::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin());
::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end()); ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
bool bKnown = false; bool bKnown = false;
while( aCurrView != aEnd ) while( aCurrView != aEnd )
{ {
if( (*aCurrView)->mpView == rView ) { if( (*aCurrView)->mpView == rView )
bKnown = true; {
break; bKnown = true;
} break;
}
++aCurrView; ++aCurrView;
} }
if( !bKnown ) {
OSL_TRACE("need to be added");
addTransition( rView ); if( !bKnown )
} {
OSL_TRACE("need to be added");
addTransition( rView );
}
} }
virtual void viewRemoved( const UnoViewSharedPtr& rView ) virtual void viewRemoved( const UnoViewSharedPtr& rView )
{ {
OSL_TRACE("PluginSlideChange viewRemoved"); OSL_TRACE("PluginSlideChange viewRemoved");
SlideChangeBase::viewRemoved( rView ); SlideChangeBase::viewRemoved( rView );
::std::vector< TransitionViewPair* >::iterator aCurrView (maTransitions.begin()); ::std::vector< TransitionViewPair* >::iterator aCurrView (maTransitions.begin());
::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end()); ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
while( aCurrView != aEnd ) while( aCurrView != aEnd )
{ {
if( (*aCurrView)->mpView == rView ) { if( (*aCurrView)->mpView == rView )
OSL_TRACE( "view removed" ); {
delete (*aCurrView); OSL_TRACE( "view removed" );
maTransitions.erase( aCurrView ); delete (*aCurrView);
break; maTransitions.erase( aCurrView );
} break;
}
++aCurrView; ++aCurrView;
} }
} }
virtual void viewChanged( const UnoViewSharedPtr& rView ) virtual void viewChanged( const UnoViewSharedPtr& rView )
{ {
OSL_TRACE("PluginSlideChange viewChanged"); OSL_TRACE("PluginSlideChange viewChanged");
SlideChangeBase::viewChanged( rView ); SlideChangeBase::viewChanged( rView );
::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin()); ::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin());
::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end()); ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
while( aCurrView != aEnd ) while( aCurrView != aEnd )
{ {
if( (*aCurrView)->mpView == rView ) { if( (*aCurrView)->mpView == rView )
OSL_TRACE( "view changed" ); {
(*aCurrView)->mxTransition->viewChanged( rView->getUnoView(), OSL_TRACE( "view changed" );
getLeavingBitmap(ViewEntry(rView))->getXBitmap(), (*aCurrView)->mxTransition->viewChanged( rView->getUnoView(),
getEnteringBitmap(ViewEntry(rView))->getXBitmap() ); getLeavingBitmap(ViewEntry(rView))->getXBitmap(),
} else getEnteringBitmap(ViewEntry(rView))->getXBitmap() );
OSL_TRACE( "view did not changed" ); }
else
OSL_TRACE( "view did not changed" );
++aCurrView; ++aCurrView;
} }
} }
virtual void viewsChanged() virtual void viewsChanged()
{ {
OSL_TRACE("PluginSlideChange viewsChanged"); OSL_TRACE("PluginSlideChange viewsChanged");
SlideChangeBase::viewsChanged(); SlideChangeBase::viewsChanged();
::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin()); ::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin());
::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end()); ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
while( aCurrView != aEnd ) while( aCurrView != aEnd )
{ {
OSL_TRACE( "view changed" ); OSL_TRACE( "view changed" );
(*aCurrView)->mxTransition->viewChanged( (*aCurrView)->mpView->getUnoView(), (*aCurrView)->mxTransition->viewChanged( (*aCurrView)->mpView->getUnoView(),
getLeavingBitmap(ViewEntry((*aCurrView)->mpView))->getXBitmap(), getLeavingBitmap(ViewEntry((*aCurrView)->mpView))->getXBitmap(),
getEnteringBitmap(ViewEntry((*aCurrView)->mpView))->getXBitmap() ); getEnteringBitmap(ViewEntry((*aCurrView)->mpView))->getXBitmap() );
++aCurrView; ++aCurrView;
} }
} }
private: private:
...@@ -920,7 +923,8 @@ NumberAnimationSharedPtr createPluginTransition( ...@@ -920,7 +923,8 @@ NumberAnimationSharedPtr createPluginTransition(
if( pTransition->Success() ) if( pTransition->Success() )
return NumberAnimationSharedPtr( pTransition ); return NumberAnimationSharedPtr( pTransition );
else { else
{
delete pTransition; delete pTransition;
return NumberAnimationSharedPtr(); return NumberAnimationSharedPtr();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment