diff options
Diffstat (limited to 'slideshow/source/engine/transitions')
52 files changed, 406 insertions, 406 deletions
diff --git a/slideshow/source/engine/transitions/barndoorwipe.cxx b/slideshow/source/engine/transitions/barndoorwipe.cxx index e65e94344854..abae768bef81 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.cxx +++ b/slideshow/source/engine/transitions/barndoorwipe.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 @@ -43,14 +43,14 @@ namespace internal { { if (m_doubled) t /= 2.0; - + basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5)); aTransform.scale( ::basegfx::pruneScaleValue(t), 1.0 ); aTransform.translate( 0.5, 0.5 ); ::basegfx::B2DPolygon poly( m_unitRect ); poly.transform( aTransform ); ::basegfx::B2DPolyPolygon res(poly); - + if (m_doubled) { aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5); aTransform.rotate( M_PI_2 ); @@ -58,7 +58,7 @@ namespace internal { poly.transform( aTransform ); res.append(poly); } - + return res; } diff --git a/slideshow/source/engine/transitions/barndoorwipe.hxx b/slideshow/source/engine/transitions/barndoorwipe.hxx index e7c2d74e7b16..b8683e38f857 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.hxx +++ b/slideshow/source/engine/transitions/barndoorwipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.cxx b/slideshow/source/engine/transitions/barwipepolypolygon.cxx index c9838530f323..c1d263ffa06b 100644 --- a/slideshow/source/engine/transitions/barwipepolypolygon.cxx +++ b/slideshow/source/engine/transitions/barwipepolypolygon.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 diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.hxx b/slideshow/source/engine/transitions/barwipepolypolygon.hxx index 001d1b940ae7..6c7b78959a23 100644 --- a/slideshow/source/engine/transitions/barwipepolypolygon.hxx +++ b/slideshow/source/engine/transitions/barwipepolypolygon.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/boxwipe.cxx b/slideshow/source/engine/transitions/boxwipe.cxx index b4d479de7e43..0ecfe203ecdf 100644 --- a/slideshow/source/engine/transitions/boxwipe.cxx +++ b/slideshow/source/engine/transitions/boxwipe.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 @@ -48,7 +48,7 @@ namespace internal { } else { aTransform.scale( d, d ); } - + ::basegfx::B2DPolyPolygon res( m_unitRect ); res.transform( aTransform ); return res; diff --git a/slideshow/source/engine/transitions/boxwipe.hxx b/slideshow/source/engine/transitions/boxwipe.hxx index 899d56755acc..fe44113d54a1 100644 --- a/slideshow/source/engine/transitions/boxwipe.hxx +++ b/slideshow/source/engine/transitions/boxwipe.hxx @@ -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 @@ -46,7 +46,7 @@ public: virtual ::basegfx::B2DPolyPolygon operator () ( double t ); private: const bool m_topCentered; - const ::basegfx::B2DPolyPolygon m_unitRect; + const ::basegfx::B2DPolyPolygon m_unitRect; }; } diff --git a/slideshow/source/engine/transitions/checkerboardwipe.cxx b/slideshow/source/engine/transitions/checkerboardwipe.cxx index d8b2fbc8cadb..8db1b023c5f9 100644 --- a/slideshow/source/engine/transitions/checkerboardwipe.cxx +++ b/slideshow/source/engine/transitions/checkerboardwipe.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 @@ -41,9 +41,9 @@ namespace internal { { const double d = (1.0 / m_unitsPerEdge); ::basegfx::B2DHomMatrix aTransform; - aTransform.scale( ::basegfx::pruneScaleValue( d * 2.0 * t ), + aTransform.scale( ::basegfx::pruneScaleValue( d * 2.0 * t ), ::basegfx::pruneScaleValue( d ) ); - + ::basegfx::B2DPolyPolygon res; for ( sal_Int32 i = m_unitsPerEdge; i--; ) { diff --git a/slideshow/source/engine/transitions/checkerboardwipe.hxx b/slideshow/source/engine/transitions/checkerboardwipe.hxx index 06c7e28e240d..df83391e20ee 100644 --- a/slideshow/source/engine/transitions/checkerboardwipe.hxx +++ b/slideshow/source/engine/transitions/checkerboardwipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx index b66cd7b11f84..4b4e148bcee3 100644 --- a/slideshow/source/engine/transitions/clippingfunctor.cxx +++ b/slideshow/source/engine/transitions/clippingfunctor.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 @@ -40,9 +40,9 @@ #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -namespace slideshow +namespace slideshow { - namespace internal + namespace internal { ClippingFunctor::ClippingFunctor(const ParametricPolyPolygonSharedPtr& rPolygon, const TransitionInfo& rTransitionInfo, @@ -59,21 +59,21 @@ namespace slideshow { ENSURE_OR_THROW( rPolygon, "ClippingFunctor::ClippingFunctor(): Invalid parametric polygon" ); - + // maBackgroundRect serves as the minuent when // subtracting a given clip polygon from the // background. To speed up the clipper algo, avoid // actual intersections of the generated // poly-polygon with the minuent - i.e. choose the // polygon to subtract from sufficiently large. - + // blow up unit rect to (-1,-1),(2,2) // AW: Not needed, just use range // ::basegfx::B2DHomMatrix aMatrix; // aMatrix.scale(3.0,3.0); // aMatrix.translate(-1.0,-1.0); // maBackgroundRect.transform( aMatrix ); - + // extract modification info from maTransitionInfo // ----------------------------------------------- @@ -115,18 +115,18 @@ namespace slideshow false, "TransitionFactory::TransitionFactory(): Unexpected reverse method" ); break; - + case TransitionInfo::REVERSEMETHOD_IGNORE: - break; - + break; + case TransitionInfo::REVERSEMETHOD_INVERT_SWEEP: mbForwardParameterSweep = !mbForwardParameterSweep; break; - + case TransitionInfo::REVERSEMETHOD_SUBTRACT_POLYGON: mbSubtractPolygon = !mbSubtractPolygon; break; - + case TransitionInfo::REVERSEMETHOD_SUBTRACT_AND_INVERT: mbForwardParameterSweep = !mbForwardParameterSweep; mbSubtractPolygon = !mbSubtractPolygon; @@ -136,13 +136,13 @@ namespace slideshow maStaticTransformation = basegfx::tools::createRotateAroundPoint(0.5, 0.5, M_PI) * maStaticTransformation; break; - + case TransitionInfo::REVERSEMETHOD_FLIP_X: maStaticTransformation = basegfx::tools::createScaleTranslateB2DHomMatrix(-1.0, 1.0, 1.0, 0.0) * maStaticTransformation; mbFlip = true; break; - + case TransitionInfo::REVERSEMETHOD_FLIP_Y: maStaticTransformation = basegfx::tools::createScaleTranslateB2DHomMatrix(1.0, -1.0, 0.0, 1.0) * maStaticTransformation; @@ -150,7 +150,7 @@ namespace slideshow break; } } - + if( !bModeIn ) { // client has requested 'out' mode. Apply @@ -159,18 +159,18 @@ namespace slideshow mbForwardParameterSweep = !mbForwardParameterSweep; else mbSubtractPolygon = !mbSubtractPolygon; - } + } } - ::basegfx::B2DPolyPolygon ClippingFunctor::operator()( double nValue, - const ::basegfx::B2DSize& rTargetSize ) + ::basegfx::B2DPolyPolygon ClippingFunctor::operator()( double nValue, + const ::basegfx::B2DSize& rTargetSize ) { // modify clip polygon according to static // transformation plus current shape size ::basegfx::B2DHomMatrix aMatrix( maStaticTransformation ); - + // retrieve current clip polygon - ::basegfx::B2DPolyPolygon aClipPoly = (*mpParametricPoly)( + ::basegfx::B2DPolyPolygon aClipPoly = (*mpParametricPoly)( mbForwardParameterSweep ? nValue : 1.0 - nValue ); // TODO(Q4): workaround here, better be fixed in cppcanvas @@ -179,17 +179,17 @@ namespace slideshow if (mbFlip) aClipPoly.flip(); - + // currently, clipper cannot cope with curves. Subdivide first // AW: Should be no longer necessary; clipping tools are now bezier-safe // if( aClipPoly.areControlPointsUsed() ) // aClipPoly = ::basegfx::tools::adaptiveSubdivideByAngle(aClipPoly); - + if( mbSubtractPolygon ) { // subtract given polygon from background // rect. Do that before any transformations. - + // calc maBackgroundRect \ aClipPoly // ================================= @@ -213,7 +213,7 @@ namespace slideshow aClipPoly = basegfx::tools::solvePolygonOperationDiff(aBackgroundPolyPoly, aClipPoly); } } - + // scale polygon up to current shape size if( mbScaleIsotrophically ) { @@ -228,10 +228,10 @@ namespace slideshow aMatrix.scale( rTargetSize.getX(), rTargetSize.getY() ); } - + // apply cumulative transformation to clip polygon aClipPoly.transform( aMatrix ); - + return aClipPoly; } diff --git a/slideshow/source/engine/transitions/clippingfunctor.hxx b/slideshow/source/engine/transitions/clippingfunctor.hxx index 97a6ee1b62dc..e02af2d148bc 100644 --- a/slideshow/source/engine/transitions/clippingfunctor.hxx +++ b/slideshow/source/engine/transitions/clippingfunctor.hxx @@ -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 @@ -37,18 +37,18 @@ #include <parametricpolypolygon.hxx> -namespace slideshow +namespace slideshow { - namespace internal + namespace internal { /** Generates the final clipping polygon. This class serves as the functor, which generates the final clipping polygon from a given ParametricPolyPolygon - and a TransitionInfo. + and a TransitionInfo. The ParametricPolyPolygon can be obtained from the - ParametricPolyPolygonFactory, see there. + ParametricPolyPolygonFactory, see there. The TransitionInfo further parameterizes the polygon generated by the ParametricPolyPolygon, with common @@ -65,7 +65,7 @@ namespace slideshow const TransitionInfo& rTransitionInfo, bool bDirectionForward, bool bModeIn ); - + /** Generate clip polygon. @param nValue @@ -76,9 +76,9 @@ namespace slideshow Size the clip polygon should cover. This is typically the size of the object the effect is applied on. */ - ::basegfx::B2DPolyPolygon operator()( double nValue, + ::basegfx::B2DPolyPolygon operator()( double nValue, const ::basegfx::B2DSize& rTargetSize ); - + private: ParametricPolyPolygonSharedPtr mpParametricPoly; ::basegfx::B2DHomMatrix maStaticTransformation; diff --git a/slideshow/source/engine/transitions/clockwipe.cxx b/slideshow/source/engine/transitions/clockwipe.cxx index dbcf59abb1f6..4f9773791901 100644 --- a/slideshow/source/engine/transitions/clockwipe.cxx +++ b/slideshow/source/engine/transitions/clockwipe.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 diff --git a/slideshow/source/engine/transitions/clockwipe.hxx b/slideshow/source/engine/transitions/clockwipe.hxx index 28a5bd8ada10..bfa45cdb9f79 100644 --- a/slideshow/source/engine/transitions/clockwipe.hxx +++ b/slideshow/source/engine/transitions/clockwipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/combtransition.cxx b/slideshow/source/engine/transitions/combtransition.cxx index 76d898538a82..3640c0961e38 100644 --- a/slideshow/source/engine/transitions/combtransition.cxx +++ b/slideshow/source/engine/transitions/combtransition.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,28 +55,28 @@ basegfx::B2DPolyPolygon createClipPolygon( // create clip polygon in standard orientation (will later // be rotated to match direction vector) ::basegfx::B2DPolyPolygon aClipPoly; - + // create nNumStrips/2 vertical strips for( int i=nOffset; i<nNumStrips; i+=2 ) { - aClipPoly.append( - ::basegfx::tools::createPolygonFromRect( + aClipPoly.append( + ::basegfx::tools::createPolygonFromRect( ::basegfx::B2DRectangle( double(i)/nNumStrips, 0.0, double(i+1)/nNumStrips, 1.0) ) ); - + } - + // rotate polygons, such that the strips are parallel to // the given direction vector const ::basegfx::B2DVector aUpVec(0.0, 1.0); basegfx::B2DHomMatrix aMatrix(basegfx::tools::createRotateAroundPoint(0.5, 0.5, aUpVec.angle( rDirection ))); - + // blow up clip polygon to slide size aMatrix.scale( rSlideSize.getX(), rSlideSize.getY() ); - + aClipPoly.transform( aMatrix ); - + return aClipPoly; } @@ -100,7 +100,7 @@ CombTransition::CombTransition( { } -void CombTransition::renderComb( double t, +void CombTransition::renderComb( double t, const ViewEntry& rViewEntry ) const { const SlideBitmapSharedPtr& pEnteringBitmap = getEnteringBitmap(rViewEntry); @@ -108,7 +108,7 @@ void CombTransition::renderComb( double t, if( !pEnteringBitmap || !pCanvas_ ) return; - + // calc bitmap offsets. The enter/leaving bitmaps are only // as large as the actual slides. For scaled-down // presentations, we have to move the left, top edge of @@ -116,20 +116,20 @@ void CombTransition::renderComb( double t, // given view transform. The aBitmapPosPixel local // variable is already in device coordinate space // (i.e. pixel). - + // TODO(F2): Properly respect clip here. Might have to be transformed, too. const basegfx::B2DHomMatrix viewTransform( rViewEntry.mpView->getTransformation() ); const basegfx::B2DPoint pageOrigin( viewTransform * basegfx::B2DPoint() ); - + // change transformation on cloned canvas to be in // device pixel cppcanvas::CanvasSharedPtr pCanvas( pCanvas_->clone() ); basegfx::B2DPoint p; - + // TODO(Q2): Use basegfx bitmaps here // TODO(F1): SlideBitmap is not fully portable between different canvases! - const basegfx::B2DSize enteringSizePixel( + const basegfx::B2DSize enteringSizePixel( getEnteringSlideSizePixel( rViewEntry.mpView) ); const basegfx::B2DVector aPushDirection = basegfx::B2DVector( @@ -142,9 +142,9 @@ void CombTransition::renderComb( double t, createClipPolygon( maPushDirectionUnit, enteringSizePixel, mnNumStripes, 1 ) ); - + SlideBitmapSharedPtr const & pLeavingBitmap = getLeavingBitmap(rViewEntry); - if( pLeavingBitmap ) + if( pLeavingBitmap ) { // render odd strips: pLeavingBitmap->clip( aClipPolygon1 ); @@ -152,7 +152,7 @@ void CombTransition::renderComb( double t, p = basegfx::B2DPoint( pageOrigin + (t * aPushDirection) ); pCanvas->setTransformation(basegfx::tools::createTranslateB2DHomMatrix(p.getX(), p.getY())); pLeavingBitmap->draw( pCanvas ); - + // render even strips: pLeavingBitmap->clip( aClipPolygon2 ); // don't modify bitmap object (no move!): @@ -160,17 +160,17 @@ void CombTransition::renderComb( double t, pCanvas->setTransformation(basegfx::tools::createTranslateB2DHomMatrix(p.getX(), p.getY())); pLeavingBitmap->draw( pCanvas ); } - + // TODO(Q2): Use basegfx bitmaps here // TODO(F1): SlideBitmap is not fully portable between different canvases! - + // render odd strips: pEnteringBitmap->clip( aClipPolygon1 ); // don't modify bitmap object (no move!): p = basegfx::B2DPoint( pageOrigin + ((t - 1.0) * aPushDirection) ); pCanvas->setTransformation(basegfx::tools::createTranslateB2DHomMatrix(p.getX(), p.getY())); pEnteringBitmap->draw( pCanvas ); - + // render even strips: pEnteringBitmap->clip( aClipPolygon2 ); // don't modify bitmap object (no move!): @@ -183,9 +183,9 @@ bool CombTransition::operator()( double t ) { std::for_each( beginViews(), endViews(), - boost::bind( &CombTransition::renderComb, - this, - t, + boost::bind( &CombTransition::renderComb, + this, + t, _1 )); getScreenUpdater().notifyUpdate(); diff --git a/slideshow/source/engine/transitions/combtransition.hxx b/slideshow/source/engine/transitions/combtransition.hxx index 9016824d84da..e3c594763068 100644 --- a/slideshow/source/engine/transitions/combtransition.hxx +++ b/slideshow/source/engine/transitions/combtransition.hxx @@ -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 @@ -36,7 +36,7 @@ namespace slideshow { namespace internal { /** Comb transition class. - + This class provides a SlideChangeAnimation, showing a comb-like effect (stripes of alternating push effects). */ @@ -44,7 +44,7 @@ class CombTransition : public SlideChangeBase { public: /** Create the comb transition effect. - + @param nNumStripes Number of comb-like stripes to show in this effect */ @@ -56,14 +56,14 @@ public: EventMultiplexer& rEventMultiplexer, const ::basegfx::B2DVector& rPushDirection, sal_Int32 nNumStripes ); - + // NumberAnimation virtual bool operator()( double x ); - + private: const ::basegfx::B2DVector maPushDirectionUnit; sal_Int32 mnNumStripes; - + void renderComb( double t, const ViewEntry& rViewEntry ) const; }; diff --git a/slideshow/source/engine/transitions/doublediamondwipe.cxx b/slideshow/source/engine/transitions/doublediamondwipe.cxx index 41b71493c2e3..30ea4cdaf2d5 100644 --- a/slideshow/source/engine/transitions/doublediamondwipe.cxx +++ b/slideshow/source/engine/transitions/doublediamondwipe.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 @@ -59,7 +59,7 @@ namespace internal { poly.append( ::basegfx::B2DPoint( 0.5, 0.5 - b ) ); poly.setClosed(true); res.append(poly); - + return res; } diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx index ca8475130eba..16f1cddd179d 100644 --- a/slideshow/source/engine/transitions/doublediamondwipe.hxx +++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/ellipsewipe.cxx b/slideshow/source/engine/transitions/ellipsewipe.cxx index 8d2a9f4c7885..3723889d494f 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.cxx +++ b/slideshow/source/engine/transitions/ellipsewipe.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 diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx index d1dcd7f3ea20..a4f9701d3e00 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.hxx +++ b/slideshow/source/engine/transitions/ellipsewipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/fanwipe.cxx b/slideshow/source/engine/transitions/fanwipe.cxx index 3e884f918e33..d15a37e90d8d 100644 --- a/slideshow/source/engine/transitions/fanwipe.cxx +++ b/slideshow/source/engine/transitions/fanwipe.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 @@ -46,21 +46,21 @@ namespace internal { ::basegfx::B2DPolygon poly( ClockWipe::calcCenteredClock( t / ((m_center && m_single) ? 2.0 : 4.0) ) ); - + res.append( poly ); // flip on y-axis: poly.transform(basegfx::tools::createScaleB2DHomMatrix(-1.0, 1.0)); poly.flip(); res.append( poly ); - - if (m_center) + + if (m_center) { res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(0.5, 0.5, 0.5, 0.5)); - + if (! m_single) res.append( flipOnXAxis(res) ); } - else + else { OSL_ASSERT( ! m_fanIn ); res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(0.5, 1.0, 0.5, 1.0)); diff --git a/slideshow/source/engine/transitions/fanwipe.hxx b/slideshow/source/engine/transitions/fanwipe.hxx index 946bc5daab68..955cfe9ef4eb 100644 --- a/slideshow/source/engine/transitions/fanwipe.hxx +++ b/slideshow/source/engine/transitions/fanwipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/figurewipe.cxx b/slideshow/source/engine/transitions/figurewipe.cxx index 73ffbbda17fd..a98faa670b18 100644 --- a/slideshow/source/engine/transitions/figurewipe.cxx +++ b/slideshow/source/engine/transitions/figurewipe.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 diff --git a/slideshow/source/engine/transitions/figurewipe.hxx b/slideshow/source/engine/transitions/figurewipe.hxx index d9448e5a59c0..366492b8ebad 100644 --- a/slideshow/source/engine/transitions/figurewipe.hxx +++ b/slideshow/source/engine/transitions/figurewipe.hxx @@ -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 @@ -43,7 +43,7 @@ public: static FigureWipe * createStarWipe( sal_Int32 nPoints ); static FigureWipe * createPentagonWipe(); static FigureWipe * createHexagonWipe(); - + virtual ::basegfx::B2DPolyPolygon operator () ( double t ); private: FigureWipe( ::basegfx::B2DPolygon const & figure ) : m_figure(figure) {} diff --git a/slideshow/source/engine/transitions/fourboxwipe.cxx b/slideshow/source/engine/transitions/fourboxwipe.cxx index aaa7b2823a85..015a0507e069 100644 --- a/slideshow/source/engine/transitions/fourboxwipe.cxx +++ b/slideshow/source/engine/transitions/fourboxwipe.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 @@ -44,17 +44,17 @@ namespace internal { { ::basegfx::B2DHomMatrix aTransform; const double d = ::basegfx::pruneScaleValue( t / 2.0 ); - if (m_cornersOut) + if (m_cornersOut) { aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5); aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(d, d, -0.25, -0.25) * aTransform; - } - else + } + else { aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(d, d, -0.5, -0.5); } - + // top left: ::basegfx::B2DPolygon square( m_unitRect ); square.transform( aTransform ); @@ -76,7 +76,7 @@ namespace internal { square4.transform( aTransform ); square4.flip(); // flip direction res.append( square4 ); - + aTransform = basegfx::tools::createTranslateB2DHomMatrix(0.5, 0.5); res.transform( aTransform ); return res; diff --git a/slideshow/source/engine/transitions/fourboxwipe.hxx b/slideshow/source/engine/transitions/fourboxwipe.hxx index e4095c89ee27..2d0a066a582e 100644 --- a/slideshow/source/engine/transitions/fourboxwipe.hxx +++ b/slideshow/source/engine/transitions/fourboxwipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/iriswipe.cxx b/slideshow/source/engine/transitions/iriswipe.cxx index 59aeff8df674..d554e1f7e68b 100644 --- a/slideshow/source/engine/transitions/iriswipe.cxx +++ b/slideshow/source/engine/transitions/iriswipe.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 diff --git a/slideshow/source/engine/transitions/iriswipe.hxx b/slideshow/source/engine/transitions/iriswipe.hxx index c0d73a52ac16..111c366075b3 100644 --- a/slideshow/source/engine/transitions/iriswipe.hxx +++ b/slideshow/source/engine/transitions/iriswipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/parametricpolypolygon.hxx b/slideshow/source/engine/transitions/parametricpolypolygon.hxx index 8f51de7c6440..5f6091edced9 100644 --- a/slideshow/source/engine/transitions/parametricpolypolygon.hxx +++ b/slideshow/source/engine/transitions/parametricpolypolygon.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx index e67ddb5b477f..8022a012c8f2 100644 --- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx +++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.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 @@ -69,7 +69,7 @@ namespace slideshow { using namespace ::com::sun::star::animations::TransitionType; using namespace ::com::sun::star::animations::TransitionSubType; - + switch (nType) { case BARWIPE: @@ -287,7 +287,7 @@ namespace slideshow return ParametricPolyPolygonSharedPtr( new ZigZagWipe(5) ); case BARNZIGZAGWIPE: return ParametricPolyPolygonSharedPtr( new BarnZigZagWipe(5) ); - + case BOWTIEWIPE: case BARNVEEWIPE: case EYEWIPE: @@ -298,15 +298,15 @@ namespace slideshow // for now, map to barwipe transition return ParametricPolyPolygonSharedPtr( new BarWipePolyPolygon ); - + default: case PUSHWIPE: case SLIDEWIPE: case FADE: - ENSURE_OR_THROW( false, + ENSURE_OR_THROW( false, "createShapeClipPolyPolygonAnimation(): Transition type mismatch" ); } - + return ParametricPolyPolygonSharedPtr(); } } diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx index 0b87b3d4e1e2..979c35bfb6c0 100644 --- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx +++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/pinwheelwipe.cxx b/slideshow/source/engine/transitions/pinwheelwipe.cxx index 847189eb9004..78d67b23a580 100644 --- a/slideshow/source/engine/transitions/pinwheelwipe.cxx +++ b/slideshow/source/engine/transitions/pinwheelwipe.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 diff --git a/slideshow/source/engine/transitions/pinwheelwipe.hxx b/slideshow/source/engine/transitions/pinwheelwipe.hxx index e3347b5298ee..ec60813e5fd2 100644 --- a/slideshow/source/engine/transitions/pinwheelwipe.hxx +++ b/slideshow/source/engine/transitions/pinwheelwipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx index 424d53093d09..4fdf9fdba0db 100644 --- a/slideshow/source/engine/transitions/randomwipe.cxx +++ b/slideshow/source/engine/transitions/randomwipe.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 @@ -67,7 +67,7 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars ) aTransform.scale( pedge, pedge ); } m_rect.transform( aTransform ); - + // mix up: for ( sal_Int32 pos1 = nElements ; pos1-- ; ) { diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx index bb8f11cc5da0..473310e638c9 100644 --- a/slideshow/source/engine/transitions/randomwipe.hxx +++ b/slideshow/source/engine/transitions/randomwipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 6d2a43ae7119..755ef8acbca2 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.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 @@ -74,28 +74,28 @@ public: bool bModeIn ); ~ClippingAnimation(); - + // Animation interface // ------------------- virtual void prefetch( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ); - virtual void start( const AnimatableShapeSharedPtr& rShape, + virtual void start( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ); virtual void end(); - + // NumberAnimation interface // ----------------------- virtual bool operator()( double nValue ); virtual double getUnderlyingValue() const; - + private: void end_(); AnimatableShapeSharedPtr mpShape; ShapeAttributeLayerSharedPtr mpAttrLayer; ShapeManagerSharedPtr mpShapeManager; - ClippingFunctor maClippingFunctor; - bool mbSpriteActive; + ClippingFunctor maClippingFunctor; + bool mbSpriteActive; }; ClippingAnimation::ClippingAnimation( @@ -107,9 +107,9 @@ ClippingAnimation::ClippingAnimation( mpShape(), mpAttrLayer(), mpShapeManager( rShapeManager ), - maClippingFunctor( rPolygon, - rTransitionInfo, - bDirectionForward, + maClippingFunctor( rPolygon, + rTransitionInfo, + bDirectionForward, bModeIn ), mbSpriteActive(false) { @@ -124,7 +124,7 @@ ClippingAnimation::~ClippingAnimation() { end_(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -138,8 +138,8 @@ void ClippingAnimation::prefetch( const AnimatableShapeSharedPtr&, { } -void ClippingAnimation::start( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rAttrLayer ) +void ClippingAnimation::start( const AnimatableShapeSharedPtr& rShape, + const ShapeAttributeLayerSharedPtr& rAttrLayer ) { OSL_ENSURE( !mpShape, "ClippingAnimation::start(): Shape already set" ); @@ -186,14 +186,14 @@ bool ClippingAnimation::operator()( double nValue ) ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape, "ClippingAnimation::operator(): Invalid ShapeAttributeLayer" ); - + // set new clip mpAttrLayer->setClip( maClippingFunctor( nValue, mpShape->getDomBounds().getRange() ) ); - + if( mpShape->isContentChanged() ) mpShapeManager->notifyShapeUpdate( mpShape ); - + return true; } @@ -202,8 +202,8 @@ double ClippingAnimation::getUnderlyingValue() const ENSURE_OR_THROW( mpAttrLayer, "ClippingAnimation::getUnderlyingValue(): Invalid ShapeAttributeLayer" ); - - return 0.0; // though this should be used in concert with + + return 0.0; // though this should be used in concert with // ActivitiesFactory::createSimpleActivity, better // explicitely name our start value. // Permissible range for operator() above is [0,1] @@ -219,30 +219,30 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( const ::basegfx::B2DVector& rSlideSize, uno::Reference< animations::XTransitionFilter > const& xTransition ) { - return createShapeTransition( rParms, - rShape, - rShapeManager, + return createShapeTransition( rParms, + rShape, + rShapeManager, rSlideSize, - xTransition, - xTransition->getTransition(), + xTransition, + xTransition->getTransition(), xTransition->getSubtype() ); } AnimationActivitySharedPtr TransitionFactory::createShapeTransition( - const ActivitiesFactory::CommonParameters& rParms, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + const ActivitiesFactory::CommonParameters& rParms, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > const& xTransition, - sal_Int16 nType, - sal_Int16 nSubType ) + sal_Int16 nType, + sal_Int16 nSubType ) { ENSURE_OR_THROW( xTransition.is(), "TransitionFactory::createShapeTransition(): Invalid XTransition" ); - - const TransitionInfo* pTransitionInfo( + + const TransitionInfo* pTransitionInfo( getTransitionInfo( nType, nSubType ) ); AnimationActivitySharedPtr pGeneratedActivity; @@ -252,24 +252,24 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( { default: case TransitionInfo::TRANSITION_INVALID: - OSL_ENSURE( false, + OSL_ENSURE( false, "TransitionFactory::createShapeTransition(): Invalid transition type. " "Don't ask me for a 0 TransitionType, have no XTransitionFilter node instead!" ); return AnimationActivitySharedPtr(); - + case TransitionInfo::TRANSITION_CLIP_POLYPOLYGON: { // generate parametric poly-polygon - ParametricPolyPolygonSharedPtr pPoly( - ParametricPolyPolygonFactory::createClipPolyPolygon( + ParametricPolyPolygonSharedPtr pPoly( + ParametricPolyPolygonFactory::createClipPolyPolygon( nType, nSubType ) ); - + // create a clip activity from that pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, - NumberAnimationSharedPtr( - new ClippingAnimation( + NumberAnimationSharedPtr( + new ClippingAnimation( pPoly, rShapeManager, *pTransitionInfo, @@ -278,7 +278,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( true ); } break; - + case TransitionInfo::TRANSITION_SPECIAL: { switch( nType ) @@ -289,7 +289,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( // TransitionFactoryTable const TransitionInfo* pRandomTransitionInfo( getRandomTransitionInfo() ); - + ENSURE_OR_THROW( pRandomTransitionInfo != NULL, "TransitionFactory::createShapeTransition(): Got invalid random transition info" ); @@ -306,12 +306,12 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( pRandomTransitionInfo->mnTransitionSubType ); } break; - + // TODO(F3): Implement slidewipe for shape case animations::TransitionType::SLIDEWIPE: { sal_Int16 nBarWipeSubType(0); - bool bDirectionForward(true); + bool bDirectionForward(true); // map slidewipe to BARWIPE, for now switch( nSubType ) @@ -343,19 +343,19 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( } // generate parametric poly-polygon - ParametricPolyPolygonSharedPtr pPoly( - ParametricPolyPolygonFactory::createClipPolyPolygon( - animations::TransitionType::BARWIPE, + ParametricPolyPolygonSharedPtr pPoly( + ParametricPolyPolygonFactory::createClipPolyPolygon( + animations::TransitionType::BARWIPE, nBarWipeSubType ) ); - + // create a clip activity from that pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, - NumberAnimationSharedPtr( - new ClippingAnimation( + NumberAnimationSharedPtr( + new ClippingAnimation( pPoly, rShapeManager, - *getTransitionInfo( animations::TransitionType::BARWIPE, + *getTransitionInfo( animations::TransitionType::BARWIPE, nBarWipeSubType ), bDirectionForward, xTransition->getMode() ) ), @@ -372,10 +372,10 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( // for now, map all to fade effect pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, - AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( + AnimationFactory::createNumberPropertyAnimation( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Opacity") ), - rShape, + rShape, rShapeManager, rSlideSize ), xTransition->getMode() ); @@ -389,7 +389,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( if( !pGeneratedActivity ) { - // No animation generated, maybe no table entry for given + // No animation generated, maybe no table entry for given // transition? OSL_TRACE( "TransitionFactory::createShapeTransition(): Unknown type/subtype (%d/%d) " @@ -401,7 +401,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( "TransitionFactory::createShapeTransition(): Unknown type/subtype " "combination encountered" ); } - + return pGeneratedActivity; } diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index 44a2c73504c6..eeef5d9efbdc 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.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 @@ SlideChangeBase::SlideChangeBase( boost::optional<SlideSharedPtr> const & leavin const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, - bool bCreateLeavingSprites, + bool bCreateLeavingSprites, bool bCreateEnteringSprites ) : mpSoundPlayer( pSoundPlayer ), mrEventMultiplexer(rEventMultiplexer), @@ -78,7 +78,7 @@ SlideChangeBase::SlideChangeBase( boost::optional<SlideSharedPtr> const & leavin SlideBitmapSharedPtr SlideChangeBase::getLeavingBitmap( const ViewEntry& rViewEntry ) const { if( !rViewEntry.mpLeavingBitmap ) - rViewEntry.mpLeavingBitmap = createBitmap(rViewEntry.mpView, + rViewEntry.mpLeavingBitmap = createBitmap(rViewEntry.mpView, maLeavingSlide); return rViewEntry.mpLeavingBitmap; @@ -108,25 +108,25 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr& // sprite to black. // create empty, black-filled bitmap - const basegfx::B2ISize slideSizePixel( + const basegfx::B2ISize slideSizePixel( getSlideSizePixel( mpEnteringSlide->getSlideSize(), - rView )); + rView )); cppcanvas::CanvasSharedPtr pCanvas( rView->getCanvas() ); // create a bitmap of appropriate size - cppcanvas::BitmapSharedPtr pBitmap( - cppcanvas::BaseGfxFactory::getInstance().createBitmap( - pCanvas, + cppcanvas::BitmapSharedPtr pBitmap( + cppcanvas::BaseGfxFactory::getInstance().createBitmap( + pCanvas, slideSizePixel ) ); - + ENSURE_OR_THROW( pBitmap, "SlideChangeBase::createBitmap(): Cannot create page bitmap" ); - + cppcanvas::BitmapCanvasSharedPtr pBitmapCanvas( pBitmap->getBitmapCanvas() ); - + ENSURE_OR_THROW( pBitmapCanvas, "SlideChangeBase::createBitmap(): " "Cannot create page bitmap canvas" ); @@ -140,7 +140,7 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr& slideSizePixel.getX(), slideSizePixel.getY() ), 0x000000FFU ); - + pRet.reset( new SlideBitmap( pBitmap )); } else @@ -153,13 +153,13 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr& ::basegfx::B2ISize SlideChangeBase::getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const { - return getSlideSizePixel( mpEnteringSlide->getSlideSize(), + return getSlideSizePixel( mpEnteringSlide->getSlideSize(), pView ); } ::basegfx::B2ISize SlideChangeBase::getLeavingSlideSizePixel( const UnoViewSharedPtr& pView ) const { - return getSlideSizePixel( (*maLeavingSlide)->getSlideSize(), + return getSlideSizePixel( (*maLeavingSlide)->getSlideSize(), pView ); } @@ -182,7 +182,7 @@ void SlideChangeBase::renderBitmap( // render at output position, don't modify bitmap object (no move!): const basegfx::B2DHomMatrix transform(basegfx::tools::createTranslateB2DHomMatrix( pageOrigin.getX(), pageOrigin.getY())); - + pDevicePixelCanvas->setTransformation( transform ); pSlideBitmap->draw( pDevicePixelCanvas ); } @@ -276,10 +276,10 @@ bool SlideChangeBase::operator()( double nValue ) { if( mbFinished ) return false; - - const std::size_t nEntries( maViewData.size() ); + + const std::size_t nEntries( maViewData.size() ); bool bSpritesVisible( mbSpritesVisible ); - + for( ::std::size_t i=0; i<nEntries; ++i ) { // calc sprite offsets. The enter/leaving bitmaps are only @@ -294,7 +294,7 @@ bool SlideChangeBase::operator()( double nValue ) const ::cppcanvas::CanvasSharedPtr& rCanvas( rViewEntry.mpView->getCanvas() ); ::cppcanvas::CustomSpriteSharedPtr& rInSprite( rViewEntry.mpInSprite ); ::cppcanvas::CustomSpriteSharedPtr& rOutSprite( rViewEntry.mpOutSprite ); - + // TODO(F2): Properly respect clip here. // Might have to be transformed, too. @@ -302,14 +302,14 @@ bool SlideChangeBase::operator()( double nValue ) rViewEntry.mpView->getTransformation() ); const ::basegfx::B2DPoint aSpritePosPixel( aViewTransform * ::basegfx::B2DPoint() ); - - // move sprite to final output position, in + + // move sprite to final output position, in // device coordinates if( rOutSprite ) rOutSprite->movePixel( aSpritePosPixel ); if( rInSprite ) rInSprite->movePixel( aSpritePosPixel ); - + if( !mbSpritesVisible ) { if( rOutSprite ) @@ -324,14 +324,14 @@ bool SlideChangeBase::operator()( double nValue ) // TODO(F1): SlideBitmap is not fully portable // between different canvases! - + // render the content OSL_ASSERT( getLeavingBitmap( rViewEntry ) ); if( getLeavingBitmap( rViewEntry ) ) getLeavingBitmap( rViewEntry )->draw( pOutContentCanvas ); } } - + if( rInSprite ) { // only render once: clipping is done @@ -344,20 +344,20 @@ bool SlideChangeBase::operator()( double nValue ) // TODO(F1): SlideBitmap is not fully portable // between different canvases! - + // render the content getEnteringBitmap( rViewEntry )->draw( pInContentCanvas ); } } } - + if( rOutSprite ) performOut( rOutSprite, rViewEntry, rCanvas, nValue ); if( rInSprite ) performIn( rInSprite, rViewEntry, rCanvas, nValue ); - + // finishing deeds for first run. - if( !mbSpritesVisible) + if( !mbSpritesVisible) { // enable sprites: if( rOutSprite ) @@ -367,10 +367,10 @@ bool SlideChangeBase::operator()( double nValue ) bSpritesVisible = true; } } // for_each( sprite ) - + mbSpritesVisible = bSpritesVisible; mrScreenUpdater.notifyUpdate(); - + return true; } @@ -392,7 +392,7 @@ void SlideChangeBase::performOut( double SlideChangeBase::getUnderlyingValue() const { - return 0.0; // though this should be used in concert with + return 0.0; // though this should be used in concert with // ActivitiesFactory::createSimpleActivity, better // explicitely name our start value. // Permissible range for operator() above is [0,1] @@ -421,7 +421,7 @@ void SlideChangeBase::viewRemoved( const UnoViewSharedPtr& rView ) // erase corresponding entry from maViewData maViewData.erase( std::remove_if( - maViewData.begin(), + maViewData.begin(), maViewData.end(), boost::bind( std::equal_to<UnoViewSharedPtr>(), @@ -440,14 +440,14 @@ void SlideChangeBase::viewChanged( const UnoViewSharedPtr& rView ) // find entry corresponding to modified view ViewsVecT::iterator aModifiedEntry( std::find_if( - maViewData.begin(), + maViewData.begin(), maViewData.end(), boost::bind( std::equal_to<UnoViewSharedPtr>(), rView, // select view: boost::bind( &ViewEntry::getView, _1 ) ))); - + OSL_ASSERT( aModifiedEntry != maViewData.end() ); if( aModifiedEntry == maViewData.end() ) return; @@ -472,13 +472,13 @@ void SlideChangeBase::viewsChanged() // resize) clearViewEntry( *aIter ); addSprites( *aIter ); - + ++aIter; } } cppcanvas::CustomSpriteSharedPtr SlideChangeBase::createSprite( - UnoViewSharedPtr const & pView, + UnoViewSharedPtr const & pView, basegfx::B2DSize const & rSpriteSize, double nPrio ) const { @@ -487,7 +487,7 @@ cppcanvas::CustomSpriteSharedPtr SlideChangeBase::createSprite( pView->createSprite( rSpriteSize, nPrio )); - // alpha default is 0.0, which seems to be + // alpha default is 0.0, which seems to be // a bad idea when viewing content... pSprite->setAlpha( 1.0 ); if (mbSpritesVisible) @@ -504,28 +504,28 @@ void SlideChangeBase::addSprites( ViewEntry& rEntry ) const basegfx::B2ISize leavingSlideSizePixel( getLeavingBitmap( rEntry )->getSize() ); - rEntry.mpOutSprite = createSprite( rEntry.mpView, - leavingSlideSizePixel, + rEntry.mpOutSprite = createSprite( rEntry.mpView, + leavingSlideSizePixel, 100 ); } - - if( mbCreateEnteringSprites ) + + if( mbCreateEnteringSprites ) { // create entering sprite: const basegfx::B2ISize enteringSlideSizePixel( getSlideSizePixel( mpEnteringSlide->getSlideSize(), rEntry.mpView )); - rEntry.mpInSprite = createSprite( rEntry.mpView, - enteringSlideSizePixel, + rEntry.mpInSprite = createSprite( rEntry.mpView, + enteringSlideSizePixel, 101 ); } } void SlideChangeBase::clearViewEntry( ViewEntry& rEntry ) { - // clear stale info (both bitmaps and sprites prolly need a - // resize) + // clear stale info (both bitmaps and sprites prolly need a + // resize) rEntry.mpEnteringBitmap.reset(); rEntry.mpLeavingBitmap.reset(); rEntry.mpInSprite.reset(); diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index 98c437671722..bed8630e5327 100644 --- a/slideshow/source/engine/transitions/slidechangebase.hxx +++ b/slideshow/source/engine/transitions/slidechangebase.hxx @@ -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 @@ -43,8 +43,8 @@ #include <boost/optional.hpp> namespace cppcanvas -{ - class Canvas; +{ + class Canvas; class CustomSprite; } @@ -52,7 +52,7 @@ namespace slideshow { namespace internal { /** Base class for all slide change effects. - + This class provides the basic sprite and view handling functionality. Derived classes should normally only need to implement the perform() method. @@ -66,20 +66,20 @@ public: // NumberAnimation virtual bool operator()( double x ); virtual double getUnderlyingValue() const; - + // Animation virtual void prefetch( const AnimatableShapeSharedPtr&, const ShapeAttributeLayerSharedPtr& ); virtual void start( const AnimatableShapeSharedPtr&, const ShapeAttributeLayerSharedPtr& ); - virtual void end(); + virtual void end(); // ViewEventHandler virtual void viewAdded( const UnoViewSharedPtr& rView ); virtual void viewRemoved( const UnoViewSharedPtr& rView ); virtual void viewChanged( const UnoViewSharedPtr& rView ); virtual void viewsChanged(); - + protected: /** Create a new SlideChanger, for the given leaving and entering slides. @@ -91,7 +91,7 @@ protected: const UnoViewContainer& rViewContainer, ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, - bool bCreateLeavingSprites = true, + bool bCreateLeavingSprites = true, bool bCreateEnteringSprites = true ); /// Info on a per-view basis @@ -99,8 +99,8 @@ protected: { ViewEntry() {} - explicit ViewEntry( const UnoViewSharedPtr& rView ) : - mpView( rView ) + explicit ViewEntry( const UnoViewSharedPtr& rView ) : + mpView( rView ) { } @@ -126,24 +126,24 @@ protected: SlideBitmapSharedPtr getLeavingBitmap( const ViewEntry& rViewEntry ) const; SlideBitmapSharedPtr getEnteringBitmap( const ViewEntry& rViewEntry ) const; - + SlideBitmapSharedPtr createBitmap( const UnoViewSharedPtr& pView, const boost::optional<SlideSharedPtr>& rSlide_ ) const; - + ::basegfx::B2ISize getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const; ::basegfx::B2ISize getLeavingSlideSizePixel( const UnoViewSharedPtr& pView ) const; void renderBitmap( SlideBitmapSharedPtr const& pSlideBitmap, - boost::shared_ptr<cppcanvas::Canvas> const& pCanvas ); - + boost::shared_ptr<cppcanvas::Canvas> const& pCanvas ); + /** Called on derived classes to implement actual slide change. - + This method is called with the sprite of the slide coming 'in' - + @param rSprite Current sprite to operate on. This is the sprite of the 'entering' slide - + @param t Current parameter value */ @@ -152,15 +152,15 @@ protected: const ViewEntry& rViewEntry, const boost::shared_ptr<cppcanvas::Canvas>& rDestinationCanvas, double t ); - + /** Called on derived classes to implement actual slide change. - + This method is called with the sprite of the slide moving 'out' - + @param rSprite Current sprite to operate on. This is the sprite of the 'leaving' slide - + @param t Current parameter value */ @@ -173,7 +173,7 @@ protected: ScreenUpdater& getScreenUpdater() const { return mrScreenUpdater; } private: - + boost::shared_ptr<cppcanvas::CustomSprite> createSprite( UnoViewSharedPtr const & pView, ::basegfx::B2DSize const & rSpriteSize, @@ -186,13 +186,13 @@ private: ViewsVecT::const_iterator lookupView( UnoViewSharedPtr const & pView ) const; SoundPlayerSharedPtr mpSoundPlayer; - + EventMultiplexer& mrEventMultiplexer; ScreenUpdater& mrScreenUpdater; ::boost::optional<SlideSharedPtr> maLeavingSlide; SlideSharedPtr mpEnteringSlide; - + ViewsVecT maViewData; const UnoViewContainer& mrViewContainer; diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 76996a6098c5..0de2f471590a 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.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 @@ -85,7 +85,7 @@ void fillPage( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, const ::cppcanvas::CanvasSharedPtr pDevicePixelCanvas( rDestinationCanvas->clone() ); pDevicePixelCanvas->setTransformation( ::basegfx::B2DHomMatrix() ); - + // TODO(F2): Properly respect clip here. // Might have to be transformed, too. const ::basegfx::B2DHomMatrix aViewTransform( @@ -139,7 +139,7 @@ public: ScreenUpdater& rScreenUpdater, const uno::Reference< presentation::XTransitionFactory>& xFactory, - const SoundPlayerSharedPtr& pSoundPlayer, + const SoundPlayerSharedPtr& pSoundPlayer, EventMultiplexer& rEventMultiplexer) : SlideChangeBase( leavingSlide_, pEnteringSlide, @@ -185,7 +185,7 @@ public: bool addTransition( const UnoViewSharedPtr& rView ) { uno::Reference<presentation::XTransition> rTransition = mxFactory->createTransition( - mnTransitionType, + mnTransitionType, mnTransitionSubType, rView->getUnoView(), getLeavingBitmap(ViewEntry(rView))->getXBitmap(), @@ -198,7 +198,7 @@ public: return true; } - + virtual bool operator()( double t ) { std::for_each(maTransitions.begin(), @@ -295,7 +295,7 @@ public: } } -private: +private: // One transition object per view std::vector< TransitionViewPair* > maTransitions; @@ -338,19 +338,19 @@ public: bDirectionForward, true ) {} - + virtual void performIn( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ); - + virtual void performOut( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ); - + private: ClippingFunctor maClippingFunctor; }; @@ -366,8 +366,8 @@ void ClippedSlideChange::performIn( // that, getEnteringSizePixel() _guarantees_ to cover the whole // slide bitmap. There's a catch, though: this removes any effect // of the view transformation (e.g. rotation) from the transition. - rSprite->setClipPixel( - maClippingFunctor( t, + rSprite->setClipPixel( + maClippingFunctor( t, getEnteringSlideSizePixel(rViewEntry.mpView) ) ); } @@ -404,19 +404,19 @@ public: maFadeColor( rFadeColor ), mbFirstTurn( true ) {} - + virtual void performIn( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ); - + virtual void performOut( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ); - + private: const boost::optional< RGBColor > maFadeColor; bool mbFirstTurn; @@ -431,7 +431,7 @@ void FadingSlideChange::performIn( ENSURE_OR_THROW( rSprite, "FadingSlideChange::performIn(): Invalid sprite" ); - + if( maFadeColor ) // After half of the active time, fade in new slide rSprite->setAlpha( t > 0.5 ? 2.0*(t-0.5) : 0.0 ); @@ -452,21 +452,21 @@ void FadingSlideChange::performOut( ENSURE_OR_THROW( rDestinationCanvas, "FadingSlideChange::performOut(): Invalid dest canvas" ); - + // only needed for color fades if( maFadeColor ) { if( mbFirstTurn ) { mbFirstTurn = false; - + // clear page to given fade color. 'Leaving' slide is // painted atop of that, but slowly fading out. fillPage( rDestinationCanvas, getEnteringSlideSizePixel( rViewEntry.mpView ), *maFadeColor ); } - + // Until half of the active time, fade out old // slide. After half of the active time, old slide // will be invisible. @@ -561,23 +561,23 @@ class MovingSlideChange : public SlideChangeBase { /// Direction vector for leaving slide, const ::basegfx::B2DVector maLeavingDirection; - + /// Direction vector for entering slide, const ::basegfx::B2DVector maEnteringDirection; - + bool mbFirstPerformCall; - + public: /** Create a new SlideChanger, for the given entering slide bitmaps, which performes a moving slide change effect - + @param rLeavingDirection Direction vector. The move is performed along this direction vector, starting at a position where the leaving slide is fully visible, and ending at a position where the leaving slide is just not visible. The vector must have unit length. - + @param rEnteringDirection Direction vector. The move is performed along this direction vector, starting at a position where the @@ -611,13 +611,13 @@ public: maEnteringDirection( rEnteringDirection ), mbFirstPerformCall( true ) {} - + virtual void performIn( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, double t ); - + virtual void performOut( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, @@ -632,20 +632,20 @@ void MovingSlideChange::performIn( double t ) { // intro sprite moves: - + ENSURE_OR_THROW( rSprite, "MovingSlideChange::performIn(): Invalid sprite" ); ENSURE_OR_THROW( rDestinationCanvas, "MovingSlideChange::performIn(): Invalid dest canvas" ); - - if (mbFirstPerformCall && maLeavingDirection.equalZero()) + + if (mbFirstPerformCall && maLeavingDirection.equalZero()) { mbFirstPerformCall = false; renderBitmap( getLeavingBitmap(rViewEntry), rDestinationCanvas ); } - + // TODO(F1): This does not account for non-translational // transformations! If the canvas is rotated, we still // move the sprite unrotated (which might or might not @@ -654,12 +654,12 @@ void MovingSlideChange::performIn( rDestinationCanvas->getTransformation() ); const basegfx::B2DPoint aPageOrigin( aViewTransform * basegfx::B2DPoint() ); - + // move sprite rSprite->movePixel( aPageOrigin + - ((t - 1.0) * - ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) * + ((t - 1.0) * + ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) * maEnteringDirection) ); } @@ -670,20 +670,20 @@ void MovingSlideChange::performOut( double t ) { // outro sprite moves: - + ENSURE_OR_THROW( rSprite, "MovingSlideChange::performOut(): Invalid sprite" ); ENSURE_OR_THROW( rDestinationCanvas, "MovingSlideChange::performOut(): Invalid dest canvas" ); - - if (mbFirstPerformCall && maEnteringDirection.equalZero()) + + if (mbFirstPerformCall && maEnteringDirection.equalZero()) { mbFirstPerformCall = false; renderBitmap( getEnteringBitmap(rViewEntry), rDestinationCanvas ); } - + // TODO(F1): This does not account for non-translational // transformations! If the canvas is rotated, we still // move the sprite unrotated (which might or might not @@ -692,11 +692,11 @@ void MovingSlideChange::performOut( rDestinationCanvas->getTransformation() ); const basegfx::B2DPoint aPageOrigin( aViewTransform * basegfx::B2DPoint() ); - + // move sprite rSprite->movePixel( - aPageOrigin + (t * - ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) * + aPageOrigin + (t * + ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) * maLeavingDirection) ); } @@ -722,7 +722,7 @@ NumberAnimationSharedPtr createPushWipeTransition( // wipes. leavingSlide = leavingSlide_; } - + // setup direction vector bool bComb( false ); ::basegfx::B2DVector aDirection; @@ -730,55 +730,55 @@ NumberAnimationSharedPtr createPushWipeTransition( { default: OSL_ENSURE( - false, + false, "createPushWipeTransition(): Unexpected transition " "subtype for animations::TransitionType::PUSHWIPE " "transitions" ); return NumberAnimationSharedPtr(); - + case animations::TransitionSubType::FROMTOP: aDirection = ::basegfx::B2DVector( 0.0, 1.0 ); break; - + case animations::TransitionSubType::FROMBOTTOM: aDirection = ::basegfx::B2DVector( 0.0, -1.0 ); break; - + case animations::TransitionSubType::FROMLEFT: aDirection = ::basegfx::B2DVector( 1.0, 0.0 ); break; - + case animations::TransitionSubType::FROMRIGHT: aDirection = ::basegfx::B2DVector( -1.0, 0.0 ); break; - + case animations::TransitionSubType::FROMBOTTOMRIGHT: aDirection = ::basegfx::B2DVector( -1.0, -1.0 ); break; - + case animations::TransitionSubType::FROMBOTTOMLEFT: aDirection = ::basegfx::B2DVector( 1.0, -1.0 ); break; - + case animations::TransitionSubType::FROMTOPRIGHT: aDirection = ::basegfx::B2DVector( -1.0, 1.0 ); break; - + case animations::TransitionSubType::FROMTOPLEFT: aDirection = ::basegfx::B2DVector( 1.0, 1.0 ); break; - + case animations::TransitionSubType::COMBHORIZONTAL: aDirection = ::basegfx::B2DVector( 1.0, 0.0 ); bComb = true; break; - + case animations::TransitionSubType::COMBVERTICAL: aDirection = ::basegfx::B2DVector( 0.0, 1.0 ); bComb = true; break; } - + if( bComb ) { return NumberAnimationSharedPtr( @@ -788,19 +788,19 @@ NumberAnimationSharedPtr createPushWipeTransition( rViewContainer, rScreenUpdater, rEventMultiplexer, - aDirection, + aDirection, 24 /* comb with 12 stripes */ )); } else { - return NumberAnimationSharedPtr( + return NumberAnimationSharedPtr( new MovingSlideChange( leavingSlide, pEnteringSlide, pSoundPlayer, rViewContainer, rScreenUpdater, rEventMultiplexer, - aDirection, + aDirection, aDirection )); } } @@ -822,53 +822,53 @@ NumberAnimationSharedPtr createSlideWipeTransition( { default: OSL_ENSURE( - false, + false, "createSlideWipeTransition(): Unexpected transition " "subtype for animations::TransitionType::SLIDEWIPE " "transitions" ); return NumberAnimationSharedPtr(); - + case animations::TransitionSubType::FROMTOP: aInDirection = ::basegfx::B2DVector( 0.0, 1.0 ); break; - + case animations::TransitionSubType::FROMRIGHT: aInDirection = ::basegfx::B2DVector( -1.0, 0.0 ); break; - + case animations::TransitionSubType::FROMLEFT: aInDirection = ::basegfx::B2DVector( 1.0, 0.0 ); break; - + case animations::TransitionSubType::FROMBOTTOM: aInDirection = ::basegfx::B2DVector( 0.0, -1.0 ); break; - + case animations::TransitionSubType::FROMBOTTOMRIGHT: aInDirection = ::basegfx::B2DVector( -1.0, -1.0 ); break; - + case animations::TransitionSubType::FROMBOTTOMLEFT: aInDirection = ::basegfx::B2DVector( 1.0, -1.0 ); break; - + case animations::TransitionSubType::FROMTOPRIGHT: aInDirection = ::basegfx::B2DVector( -1.0, 1.0 ); break; - + case animations::TransitionSubType::FROMTOPLEFT: aInDirection = ::basegfx::B2DVector( 1.0, 1.0 ); break; } - + if( bTransitionDirection ) { // normal, 'forward' slide wipe effect. Since the old // content is still on screen (and does not move), we omit // the 'leaving' slide. // ======================================================= - - return NumberAnimationSharedPtr( + + return NumberAnimationSharedPtr( new MovingSlideChange( boost::optional<SlideSharedPtr>() /* no slide */, pEnteringSlide, @@ -885,8 +885,8 @@ NumberAnimationSharedPtr createSlideWipeTransition( // means, that the new slide is in the back, statically, // and the old one is moving off in the foreground. // ======================================================= - - return NumberAnimationSharedPtr( + + return NumberAnimationSharedPtr( new MovingSlideChange( leavingSlide, pEnteringSlide, pSoundPlayer, @@ -907,10 +907,10 @@ NumberAnimationSharedPtr createPluginTransition( ScreenUpdater& rScreenUpdater, const uno::Reference< presentation::XTransitionFactory>& xFactory, - const SoundPlayerSharedPtr& pSoundPlayer, + const SoundPlayerSharedPtr& pSoundPlayer, EventMultiplexer& rEventMultiplexer) { - PluginSlideChange* pTransition = + PluginSlideChange* pTransition = new PluginSlideChange( nTransitionType, nTransitionSubType, @@ -956,12 +956,12 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( } return NumberAnimationSharedPtr(); } - + ENSURE_OR_THROW( pEnteringSlide, "TransitionFactory::createSlideTransition(): Invalid entering slide" ); - - if( xOptionalFactory.is() && + + if( xOptionalFactory.is() && xOptionalFactory->hasTransition(nTransitionType, nTransitionSubType) ) { // #i82460# - optional plugin factory claims this transition. delegate. @@ -981,7 +981,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( return pTransition; } - const TransitionInfo* pTransitionInfo( + const TransitionInfo* pTransitionInfo( getTransitionInfo( nTransitionType, nTransitionSubType ) ); if( pTransitionInfo != NULL ) @@ -997,12 +997,12 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( nTransitionSubType ); return NumberAnimationSharedPtr(); - + case TransitionInfo::TRANSITION_CLIP_POLYPOLYGON: { // generate parametric poly-polygon - ParametricPolyPolygonSharedPtr pPoly( - ParametricPolyPolygonFactory::createClipPolyPolygon( + ParametricPolyPolygonSharedPtr pPoly( + ParametricPolyPolygonFactory::createClipPolyPolygon( nTransitionType, nTransitionSubType ) ); // create a clip transition from that @@ -1016,14 +1016,14 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( bTransitionDirection, pSoundPlayer )); } - + case TransitionInfo::TRANSITION_SPECIAL: { switch( nTransitionType ) { default: OSL_ENSURE( - false, + false, "TransitionFactory::createSlideTransition(): " "Unexpected transition type for " "TRANSITION_SPECIAL transitions" ); @@ -1036,7 +1036,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( const TransitionInfo* pRandomTransitionInfo( getRandomTransitionInfo() ); - + ENSURE_OR_THROW( pRandomTransitionInfo != NULL, "TransitionFactory::createSlideTransition(): " @@ -1150,8 +1150,8 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( break; } } - - // No animation generated, maybe no table entry for given + + // No animation generated, maybe no table entry for given // transition? OSL_TRACE( "TransitionFactory::createSlideTransition(): " @@ -1162,7 +1162,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( false, "TransitionFactory::createSlideTransition(): " "Unknown type/subtype combination encountered" ); - + return NumberAnimationSharedPtr(); } diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx index a93e80430af8..86572f7f9abe 100644 --- a/slideshow/source/engine/transitions/snakewipe.cxx +++ b/slideshow/source/engine/transitions/snakewipe.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 @@ -59,7 +59,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) static_cast<double>(line_) / m_sqrtElements ); const double col = ::basegfx::pruneScaleValue( (area - (line_ * m_sqrtElements)) / m_sqrtElements ); - + if (! ::basegfx::fTools::equalZero( line )) { ::basegfx::B2DPolygon poly; poly.append( ::basegfx::B2DPoint( 0.0, 0.0 ) ); @@ -86,7 +86,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.setClosed(true); res.append(poly); } - + return res; } @@ -94,13 +94,13 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) double t, bool in ) const { ::basegfx::B2DPolyPolygon res; - + if (in) { const double sqrtArea2 = sqrt( t * m_sqrtElements * m_sqrtElements ); const double edge = ::basegfx::pruneScaleValue( static_cast<double>( static_cast<sal_Int32>(sqrtArea2) ) / m_sqrtElements ); - + ::basegfx::B2DPolygon poly; if (! ::basegfx::fTools::equalZero( edge )) { poly.append( ::basegfx::B2DPoint( 0.0, 0.0 ) ); @@ -120,20 +120,20 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.append( ::basegfx::B2DPoint( len + a, 0.0 ) ); poly.setClosed(true); ::basegfx::B2DHomMatrix aTransform; - - if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1) + + if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1) { // odd line aTransform = basegfx::tools::createRotateB2DHomMatrix(M_PI_2 + M_PI_4); aTransform.translate(edge + m_elementEdge, 0.0); } - else + else { aTransform = basegfx::tools::createTranslateB2DHomMatrix(-a, 0.0); aTransform.rotate( -M_PI_4 ); aTransform.translate( 0.0, edge ); } - + poly.transform( aTransform ); res.append(poly); } @@ -143,7 +143,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) const double edge = ::basegfx::pruneScaleValue( static_cast<double>( static_cast<sal_Int32>(sqrtArea2) ) / m_sqrtElements ); - + ::basegfx::B2DPolygon poly; if (! ::basegfx::fTools::equalZero( edge )) { poly.append( ::basegfx::B2DPoint( 0.0, 1.0 ) ); @@ -164,15 +164,15 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.append( ::basegfx::B2DPoint( len + a, 0.0 ) ); poly.setClosed(true); ::basegfx::B2DHomMatrix aTransform; - - if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1) + + if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1) { // odd line aTransform = basegfx::tools::createTranslateB2DHomMatrix(0.0, -height); aTransform.rotate( M_PI_2 + M_PI_4 ); aTransform.translate( 1.0, edge ); } - else + else { aTransform = basegfx::tools::createRotateB2DHomMatrix(-M_PI_4); aTransform.translate( edge, 1.0 ); @@ -180,7 +180,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.transform( aTransform ); res.append(poly); } - + return res; } @@ -237,7 +237,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) res.append( flipOnYAxis(half) ); res.append( m_opposite ? flipOnXAxis(half) : half ); } - + return m_flipOnYAxis ? flipOnYAxis(res) : res; } diff --git a/slideshow/source/engine/transitions/snakewipe.hxx b/slideshow/source/engine/transitions/snakewipe.hxx index 7f282aa0557c..3b14944d7d68 100644 --- a/slideshow/source/engine/transitions/snakewipe.hxx +++ b/slideshow/source/engine/transitions/snakewipe.hxx @@ -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 @@ -50,7 +50,7 @@ protected: ::basegfx::B2DPolyPolygon calcSnake( double t ) const; // topLeftDiagonal: ::basegfx::B2DPolyPolygon calcHalfDiagonalSnake( double t, bool in ) const; - + const sal_Int32 m_sqrtElements; const double m_elementEdge; const bool m_diagonal; diff --git a/slideshow/source/engine/transitions/spiralwipe.cxx b/slideshow/source/engine/transitions/spiralwipe.cxx index d7cbd6c7cf32..2ddee7226e91 100644 --- a/slideshow/source/engine/transitions/spiralwipe.cxx +++ b/slideshow/source/engine/transitions/spiralwipe.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 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) const double area = (t * m_elements); const double e = (sqrt(area) / 2.0); const sal_Int32 edge = (static_cast<sal_Int32>(e) * 2); - + basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5)); const double edge_ = ::basegfx::pruneScaleValue( static_cast<double>(edge) / m_sqrtElements ); @@ -64,7 +64,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) ::basegfx::B2DPolygon poly( createUnitRect() ); poly.transform( aTransform ); ::basegfx::B2DPolyPolygon res(poly); - + if (! ::basegfx::fTools::equalZero( 1.0 - t )) { const sal_Int32 edge1 = (edge + 1); sal_Int32 len = static_cast<sal_Int32>( (e - (edge /2)) * edge1 * 4 ); @@ -88,7 +88,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) res.append(poly); } } - + return res; } @@ -106,7 +106,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) ::basegfx::B2DPolyPolygon res( createUnitRect() ); ::basegfx::B2DPolyPolygon innerSpiral( calcNegSpiral( 1.0 - t ) ); innerSpiral.flip(); - + if (m_fourBox) { ::basegfx::B2DHomMatrix aTransform; aTransform.scale( 0.5, 0.5 ); @@ -124,7 +124,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) res.append(innerSpiral); res.append( flipOnXAxis(innerSpiral) ); } - + return m_flipOnYAxis ? flipOnYAxis(res) : res; } diff --git a/slideshow/source/engine/transitions/spiralwipe.hxx b/slideshow/source/engine/transitions/spiralwipe.hxx index d515a28e5c79..4e11e2df9ed1 100644 --- a/slideshow/source/engine/transitions/spiralwipe.hxx +++ b/slideshow/source/engine/transitions/spiralwipe.hxx @@ -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 @@ -46,7 +46,7 @@ public: virtual ::basegfx::B2DPolyPolygon operator () ( double t ); protected: ::basegfx::B2DPolyPolygon calcNegSpiral( double t ) const; - + const sal_Int32 m_elements; const sal_Int32 m_sqrtElements; const bool m_flipOnYAxis; diff --git a/slideshow/source/engine/transitions/sweepwipe.cxx b/slideshow/source/engine/transitions/sweepwipe.cxx index a5e25ac5a5e5..ae743ec23944 100644 --- a/slideshow/source/engine/transitions/sweepwipe.cxx +++ b/slideshow/source/engine/transitions/sweepwipe.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 @@ -48,27 +48,27 @@ namespace internal { t /= 2.0; if (!m_single && !m_oppositeVertical) t /= 2.0; - + ::basegfx::B2DPolygon poly( ClockWipe::calcCenteredClock( 0.25 + t ) ); ::basegfx::B2DHomMatrix aTransform; - - if (m_center) + + if (m_center) { aTransform = basegfx::tools::createTranslateB2DHomMatrix(0.5, 0.0); poly.transform( aTransform ); } ::basegfx::B2DPolyPolygon res(poly); - - if (! m_single) + + if (! m_single) { - if (m_oppositeVertical) + if (m_oppositeVertical) { aTransform = basegfx::tools::createScaleB2DHomMatrix(1.0, -1.0); aTransform.translate( 0.0, 1.0 ); poly.transform( aTransform ); poly.flip(); } - else + else { aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5); aTransform.rotate( M_PI ); @@ -77,7 +77,7 @@ namespace internal { } res.append(poly); } - + return m_flipOnYAxis ? flipOnYAxis(res) : res; } diff --git a/slideshow/source/engine/transitions/sweepwipe.hxx b/slideshow/source/engine/transitions/sweepwipe.hxx index 953ed7b9e862..c1e9fc3327b1 100644 --- a/slideshow/source/engine/transitions/sweepwipe.hxx +++ b/slideshow/source/engine/transitions/sweepwipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx index a59c6051aa5e..052c0ab045ee 100644 --- a/slideshow/source/engine/transitions/transitionfactorytab.cxx +++ b/slideshow/source/engine/transitions/transitionfactorytab.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 @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_slideshow.hxx" -#include <boost/current_function.hpp> +#include <boost/current_function.hpp> #include <basegfx/numeric/ftools.hxx> #include <com/sun/star/animations/TransitionType.hpp> #include <com/sun/star/animations/TransitionSubType.hpp> @@ -47,7 +47,7 @@ namespace internal { namespace { static const TransitionInfo lcl_transitionInfo[] = -{ +{ { 0, 0, @@ -108,7 +108,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to BoxWipe: animations::TransitionType::BOXWIPE, @@ -205,7 +205,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FourBoxWipe: animations::TransitionType::FOURBOXWIPE, @@ -230,7 +230,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to BarnDoorWipe: animations::TransitionType::BARNDOORWIPE, @@ -279,7 +279,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to BarWipePolyPolygon: animations::TransitionType::DIAGONALWIPE, @@ -305,7 +305,7 @@ static const TransitionInfo lcl_transitionInfo[] = false // scale isotrophically to target size }, - + { animations::TransitionType::BOWTIEWIPE, animations::TransitionSubType::VERTICAL, @@ -330,7 +330,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to BarnDoorWipe (doubled=true): animations::TransitionType::MISCDIAGONALWIPE, @@ -355,7 +355,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to VeeWipe: animations::TransitionType::VEEWIPE, @@ -403,7 +403,7 @@ static const TransitionInfo lcl_transitionInfo[] = false // scale isotrophically to target size }, - + { animations::TransitionType::BARNVEEWIPE, animations::TransitionSubType::TOP, @@ -452,7 +452,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to ZigZagWipe: animations::TransitionType::ZIGZAGWIPE, @@ -501,7 +501,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to IrisWipe: animations::TransitionType::IRISWIPE, @@ -527,7 +527,7 @@ static const TransitionInfo lcl_transitionInfo[] = false // scale isotrophically to target size }, - + { // mapped to FigureWipe(triangle): animations::TransitionType::TRIANGLEWIPE, @@ -576,7 +576,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FigureWipe(arrowHead): animations::TransitionType::ARROWHEADWIPE, @@ -625,7 +625,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FigureWipe(pentagon): animations::TransitionType::PENTAGONWIPE, @@ -650,7 +650,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FigureWipe(hexagon): animations::TransitionType::HEXAGONWIPE, @@ -675,7 +675,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to EllipseWipe: animations::TransitionType::ELLIPSEWIPE, @@ -713,7 +713,7 @@ static const TransitionInfo lcl_transitionInfo[] = false // scale isotrophically to target size }, - + { animations::TransitionType::EYEWIPE, animations::TransitionSubType::HORIZONTAL, @@ -762,7 +762,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FigureWipe(star, points=4): animations::TransitionType::STARWIPE, @@ -799,7 +799,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { animations::TransitionType::MISCSHAPEWIPE, animations::TransitionSubType::HEART, @@ -824,7 +824,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to ClockWipe: animations::TransitionType::CLOCKWIPE, @@ -873,7 +873,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to PinWheelWipe: animations::TransitionType::PINWHEELWIPE, @@ -946,7 +946,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion true // scale isotrophically to target size, like ppt }, - + { // mapped to SweepWipe (center=true, single=true): animations::TransitionType::SINGLESWEEPWIPE, @@ -1043,7 +1043,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FanWipe(center=true): animations::TransitionType::FANWIPE, @@ -1116,7 +1116,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to FanWipe(center=true, single=false, fanIn=false): animations::TransitionType::DOUBLEFANWIPE, @@ -1165,7 +1165,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to SweepWipe (center=true, single=false): animations::TransitionType::DOUBLESWEEPWIPE, @@ -1240,7 +1240,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { animations::TransitionType::SALOONDOORWIPE, animations::TransitionSubType::TOP, // (251) @@ -1337,7 +1337,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to SnakeWipe: animations::TransitionType::SNAKEWIPE, @@ -1410,7 +1410,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to SpiralWipe: animations::TransitionType::SPIRALWIPE, @@ -1507,7 +1507,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to ParallelSnakesWipe: animations::TransitionType::PARALLELSNAKESWIPE, @@ -1629,7 +1629,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to BoxSnakesWipe: animations::TransitionType::BOXSNAKESWIPE, @@ -1702,7 +1702,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to WaterfallWipe: animations::TransitionType::WATERFALLWIPE, @@ -1751,7 +1751,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { animations::TransitionType::PUSHWIPE, animations::TransitionSubType::FROMLEFT, @@ -2030,7 +2030,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to RandomWipe: animations::TransitionType::RANDOMBARWIPE, @@ -2055,7 +2055,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion false // scale isotrophically to target size }, - + { // mapped to CheckerBoard: animations::TransitionType::CHECKERBOARDWIPE, @@ -2093,7 +2093,7 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion true // scale isotrophically to target size }, - + ///////////////////////////////////////////////////////// // NOTE: This entry MUST be the last, to keep // createSlideTransition() from infinite recursion. Because @@ -2125,7 +2125,7 @@ const TransitionInfo* TransitionFactory::getTransitionInfo( static const ::std::size_t lcl_tableSize( sizeof(lcl_transitionInfo)/sizeof(TransitionInfo) ); static const TransitionInfo* pTableEnd = lcl_transitionInfo+lcl_tableSize; - + const TransitionInfo* pRes = ::std::find_if( lcl_transitionInfo, pTableEnd, TransitionInfo::Comparator( nTransitionType, diff --git a/slideshow/source/engine/transitions/transitiontools.cxx b/slideshow/source/engine/transitions/transitiontools.cxx index c497c91bee68..c2cc7c50bd27 100644 --- a/slideshow/source/engine/transitions/transitiontools.cxx +++ b/slideshow/source/engine/transitions/transitiontools.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 @@ -46,7 +46,7 @@ namespace internal { return ::basegfx::tools::createPolygonFromRect( ::basegfx::B2DRectangle(0.0,0.0, 1.0,1.0 ) ); -} +} ::basegfx::B2DPolyPolygon flipOnYAxis( ::basegfx::B2DPolyPolygon const & polypoly ) diff --git a/slideshow/source/engine/transitions/transitiontools.hxx b/slideshow/source/engine/transitions/transitiontools.hxx index 6e1acaa525ee..c8c95ad7e48d 100644 --- a/slideshow/source/engine/transitions/transitiontools.hxx +++ b/slideshow/source/engine/transitions/transitiontools.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/veewipe.cxx b/slideshow/source/engine/transitions/veewipe.cxx index 7e1484cd93b6..47bc901019c4 100644 --- a/slideshow/source/engine/transitions/veewipe.cxx +++ b/slideshow/source/engine/transitions/veewipe.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 diff --git a/slideshow/source/engine/transitions/veewipe.hxx b/slideshow/source/engine/transitions/veewipe.hxx index 9106c4d625c6..b25816f6b1dc 100644 --- a/slideshow/source/engine/transitions/veewipe.hxx +++ b/slideshow/source/engine/transitions/veewipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/waterfallwipe.cxx b/slideshow/source/engine/transitions/waterfallwipe.cxx index 2e2349c48979..7ea4539c7227 100644 --- a/slideshow/source/engine/transitions/waterfallwipe.cxx +++ b/slideshow/source/engine/transitions/waterfallwipe.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 diff --git a/slideshow/source/engine/transitions/waterfallwipe.hxx b/slideshow/source/engine/transitions/waterfallwipe.hxx index 2f373bd3728e..58cf278e2916 100644 --- a/slideshow/source/engine/transitions/waterfallwipe.hxx +++ b/slideshow/source/engine/transitions/waterfallwipe.hxx @@ -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 diff --git a/slideshow/source/engine/transitions/zigzagwipe.cxx b/slideshow/source/engine/transitions/zigzagwipe.cxx index f884be30776b..a0c57db35223 100644 --- a/slideshow/source/engine/transitions/zigzagwipe.cxx +++ b/slideshow/source/engine/transitions/zigzagwipe.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 diff --git a/slideshow/source/engine/transitions/zigzagwipe.hxx b/slideshow/source/engine/transitions/zigzagwipe.hxx index f6a24fa127ce..8126890119fb 100644 --- a/slideshow/source/engine/transitions/zigzagwipe.hxx +++ b/slideshow/source/engine/transitions/zigzagwipe.hxx @@ -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 |