[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/impressmedia-features.diff |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit f266ae5288bcb5225d7988c1ac1f842bd19fd352
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 14 17:03:44 2010 +0300

    Make impressmedia-features.diff apply again

diff --git a/patches/dev300/impressmedia-features.diff b/patches/dev300/impressmedia-features.diff
index 679a634..71c5b51 100644
--- a/patches/dev300/impressmedia-features.diff
+++ b/patches/dev300/impressmedia-features.diff
@@ -414,7 +414,7 @@ index 1e2a1f9..1349443 100644
  
      if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime() < m_xPlayer->getDuration())
      {
-@@ -482,82 +290,8 @@ IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
+@@ -482,84 +290,10 @@ IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
  
      // } SAFE
      //release aLock before end of method at which point xOperationHold goes out of scope and pThis dies
@@ -498,6 +498,8 @@ index 1e2a1f9..1349443 100644
 -    /* Return with result of this operation. */
 -    return pReturn;
 -}
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git avmedia/source/framework/soundhandler.hxx avmedia/source/framework/soundhandler.hxx
 index 4a707c5..46fd812 100644
 --- avmedia/source/framework/soundhandler.hxx
@@ -827,7 +829,7 @@ index e9ade6d..52c583a 100644
                          bRet = true;
                  }
              }
-@@ -578,4 +656,61 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUStrin
+@@ -578,6 +656,63 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUStrin
      return xRet;
  }
  
@@ -889,6 +891,8 @@ index e9ade6d..52c583a 100644
 +
 +// The C shared lib entry points
 +COMPHELPER_SERVICEDECL_EXPORTS2(avmedia::serviceDecl1, avmedia::serviceDecl2)
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git cui/source/dialogs/cuigaldlg.cxx cui/source/dialogs/cuigaldlg.cxx
 index 9e07923..46d4202 100644
 --- cui/source/dialogs/cuigaldlg.cxx
@@ -2378,11 +2382,6 @@ diff --git sfx2/source/appl/fileobj.cxx sfx2/source/appl/fileobj.cxx
 index 158fbb3..995dbe9 100644
 --- sfx2/source/appl/fileobj.cxx
 +++ sfx2/source/appl/fileobj.cxx
-@@ -1,3 +1,4 @@
-+
- /*************************************************************************
-  *
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 @@ -44,6 +45,8 @@
  #include <com/sun/star/uno/Sequence.hxx>
  #include <sfx2/docfac.hxx>
@@ -3850,7 +3849,7 @@ index 88651ed..06d5629 100644
      if( AVMEDIA_SETMASK_LOOP & nMaskSet )
          maMediaProperties.setLoop( rNewProperties.isLoop() );
      
-@@ -283,3 +439,106 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper
+@@ -283,5 +439,108 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper
      if( AVMEDIA_SETMASK_ZOOM & nMaskSet )
          maMediaProperties.setZoom( rNewProperties.getZoom() );
  }
@@ -3957,6 +3956,8 @@ index 88651ed..06d5629 100644
 +        mxGraphicLink->disconnect();
 +*/
 +}
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git svx/source/unodraw/unoprov.cxx svx/source/unodraw/unoprov.cxx
 index 91e3b9e..85181d8 100644
 --- svx/source/unodraw/unoprov.cxx