[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/impressmedia-features.diff |   36 +-----------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

New commits:
commit 2e7aee7dbbdbedd48019519baa1f05b622658980
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Oct 27 14:48:23 2010 +0300

    Make impressmedia-features.diff apply again

diff --git a/patches/dev300/impressmedia-features.diff b/patches/dev300/impressmedia-features.diff
index 71c5b51..af1a90e 100644
--- a/patches/dev300/impressmedia-features.diff
+++ b/patches/dev300/impressmedia-features.diff
@@ -396,31 +396,7 @@ index 1e2a1f9..1349443 100644
  {
      m_aUpdateTimer.SetTimeoutHdl(LINK(this, SoundHandler, implts_PlayerNotify));
  }
-@@ -333,7 +141,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&
-                                                      const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException)
- {
-     // SAFE {
--    const ::vos::OGuard aLock( m_aLock );
-+    ::osl::MutexGuard aGuard( m_aMutex );
- 
-     { 
-     //close streams otherwise on windows we can't reopen the file in the
-@@ -452,7 +260,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
- IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
- {
-     // SAFE {
--    ::vos::OClearableGuard aLock( m_aLock );
-+    ::osl::ClearableMutexGuard aGuard( m_aMutex );
- 
-     if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime() < m_xPlayer->getDuration())
-     {
-@@ -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
--    aLock.clear();
-+    aGuard.clear();
-     return 0;
+@@ -482,79 +290,5 @@ IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
  }
  
  } // namespace framework
@@ -542,7 +518,7 @@ index 4a707c5..46fd812 100644
 -struct ThreadHelpBase
 -{
 -    public:
--        mutable ::vos::OMutex m_aLock;
+-        mutable ::osl::Mutex m_aLock;
 -};
 -
  /*-************************************************************************************************************//**
@@ -2753,14 +2729,6 @@ diff --git svx/inc/svx/svdmodel.hxx svx/inc/svx/svdmodel.hxx
 index 39411ea..6d96d08 100644
 --- svx/inc/svx/svdmodel.hxx
 +++ svx/inc/svx/svdmodel.hxx
-@@ -52,6 +52,7 @@ class OutputDevice;
- #include "svx/svxdllapi.h"
- 
- #include <vos/ref.hxx>
-+#include <rtl/ref.hxx>
- 
- #if defined(UNX) || defined(WIN) || defined(WNT)
- #define DEGREE_CHAR ((sal_Unicode)176)   /* 0xB0 = Ansi */
 @@ -104,6 +105,11 @@ namespace comphelper{
  namespace sfx2{
      class LinkManager;