ooo-build r13612 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Aug 18 15:39:39 2008
New Revision: 13612
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13612&view=rev

Log:
    * patches/dev300/slideshow-cutblack.diff:
    * patches/dev300/transogl-transitions-newsflash.diff:
    Added UI entries for the two new transitions.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/slideshow-cutblack.diff
   trunk/patches/dev300/transogl-transitions-newsflash.diff

Modified: trunk/patches/dev300/slideshow-cutblack.diff
==============================================================================
--- trunk/patches/dev300/slideshow-cutblack.diff	(original)
+++ trunk/patches/dev300/slideshow-cutblack.diff	Mon Aug 18 15:39:39 2008
@@ -13,7 +13,7 @@
  											else if ( nDirection == 1 )
 -												pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE );				// Direkt ueber Schwarz
 +                                            {
-+                                                pPage->setTransitionType( 0 );
++                                                pPage->setTransitionType( animations::TransitionType::BARWIPE );
 +                                                pPage->setTransitionSubtype( animations::TransitionSubType::FADEOVERCOLOR );
 +                                                pPage->setTransitionFadeColor( 0 );
 +                                            }
@@ -118,7 +118,7 @@
                              pSoundPlayer );
                      }
  
-+                    case 0:
++                    case animations::TransitionType::BARWIPE:
                      case animations::TransitionType::FADE:
                      {
                          // black page:
@@ -136,7 +136,7 @@
 -                                rViewContainer,
 -                                rScreenUpdater,
 -                                rEventMultiplexer ));
-+                        if( nTransitionType )
++                        if( nTransitionType == animations::TransitionType::FADE )
 +                            return NumberAnimationSharedPtr( 
 +                                new FadingSlideChange(
 +                                    leavingSlide,
@@ -164,14 +164,14 @@
 index d5be3d2..ed3f7dd 100644
 --- slideshow/source/engine/transitions/transitionfactorytab.cxx
 +++ slideshow/source/engine/transitions/transitionfactorytab.cxx
-@@ -2018,6 +2018,20 @@ static const TransitionInfo lcl_transitionInfo[] =
+@@ -2018,6 +2018,21 @@ static const TransitionInfo lcl_transitionInfo[] =
          true,                   // 'out' by parameter sweep inversion
          false                   // scale isotrophically to target size
      },
 +    // this is the cut through black fade (does not fade, but does a
 +    // hard cut)
 +    {
-+        0,
++        animations::TransitionType::BARWIPE,
 +        animations::TransitionSubType::FADEOVERCOLOR,
 +        TransitionInfo::TRANSITION_SPECIAL,
 +        // TODO(F2): Setup parameters
@@ -185,3 +185,14 @@
      
      {
          // mapped to RandomWipe:
++++ sd/xml/transitions.xml	2008-08-18 16:23:48.000000000 +0200
+@@ -111,6 +111,9 @@
+  <anim:par pres:preset-id="fade-through-black">
+   <anim:transitionFilter smil:type="fade" smil:subtype="fadeOverColor" smil:fadeColor="#000000"/>
+  </anim:par>
++ <anim:par pres:preset-id="cut-through-black">
++  <anim:transitionFilter smil:type="barWipe" smil:subtype="fadeOverColor" smil:fadeColor="#000000"/>
++ </anim:par>
+  <anim:par pres:preset-id="cover-down">
+   <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromTop"/>
+  </anim:par>

Modified: trunk/patches/dev300/transogl-transitions-newsflash.diff
==============================================================================
--- trunk/patches/dev300/transogl-transitions-newsflash.diff	(original)
+++ trunk/patches/dev300/transogl-transitions-newsflash.diff	Mon Aug 18 15:39:39 2008
@@ -97,3 +97,17 @@
          }
  
          rtl::Reference<OGLTransitionerImpl> xRes(
+--- sd/xml/transitions.orig	2008-08-18 15:59:32.000000000 +0200
++++ sd/xml/transitions.xml	2008-08-18 16:23:48.000000000 +0200
+@@ -141,9 +144,9 @@
+  <anim:par pres:preset-id="random-transition">
+   <anim:transitionFilter smil:type="random"/>
+  </anim:par>
+- <!--anim:par pres:preset-id="zoom-rotate-in">
++ <anim:par pres:preset-id="zoom-rotate-in">
+   <anim:transitionFilter smil:type="zoom" smil:subtype="rotateIn"/>
+- </anim:par-->
++ </anim:par>
+  <anim:par pres:preset-id="clock-wipe-twelve">
+   <anim:transitionFilter smil:type="clockWipe" smil:subtype="clockwiseTwelve"/>
+  </anim:par>