[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/slideshow-sound.diff |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2ca25aca3ba52efccbb7eafe812534c2049188d5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Nov 3 08:50:24 2010 +0200

    Make slideshow-sound.diff apply again

diff --git a/patches/dev300/slideshow-sound.diff b/patches/dev300/slideshow-sound.diff
index e5c5308..a5fba17 100644
--- a/patches/dev300/slideshow-sound.diff
+++ b/patches/dev300/slideshow-sound.diff
@@ -160,15 +160,16 @@ diff --git slideshow/source/engine/slideshowimpl.cxx slideshow/source/engine/sli
 index e84f143..533e294 100644
 --- slideshow/source/engine/slideshowimpl.cxx
 +++ slideshow/source/engine/slideshowimpl.cxx
-@@ -344,6 +344,8 @@ private:
+@@ -344,6 +344,9 @@ private:
          uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape )
          throw (uno::RuntimeException);
  
 +    // update persistent media shapes after current slide changes
 +    void updateMediaShapes();
- 
++ 
      // CursorManager
      // -----------------------------------------------------------
+ 
 @@ -468,6 +470,7 @@ private:
      //end changed
      
@@ -186,7 +187,7 @@ index e84f143..533e294 100644
 +    ShapeList maMediaShapes;
  };
  
- 
+ /** Separate event listener for animation, view and hyperlink events.
 @@ -590,6 +596,7 @@ SlideShowImpl::SlideShowImpl(
        maUserPaintColor(),
        maUserPaintStrokeWidth(4.0),