[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Wed Nov 3 07:06:27 PDT 2010


 patches/dev300/impressmedia-features.diff |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

New commits:
commit bd1443afa6c6d539d74e3190b682ec07e6611471
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Nov 3 14:35:00 2010 +0100

    better fix impressmedia-features.diff to apply

diff --git a/patches/dev300/impressmedia-features.diff b/patches/dev300/impressmedia-features.diff
index 71c5b51..7270fe4 100644
--- a/patches/dev300/impressmedia-features.diff
+++ b/patches/dev300/impressmedia-features.diff
@@ -400,7 +400,7 @@ index 1e2a1f9..1349443 100644
                                                       const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException)
  {
      // SAFE {
--    const ::vos::OGuard aLock( m_aLock );
+-    const ::osl::MutexGuard aLock( m_aLock );
 +    ::osl::MutexGuard aGuard( m_aMutex );
  
      { 
@@ -409,7 +409,7 @@ index 1e2a1f9..1349443 100644
  IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
  {
      // SAFE {
--    ::vos::OClearableGuard aLock( m_aLock );
+-    ::osl::ClearableMutexGuard aLock( m_aLock );
 +    ::osl::ClearableMutexGuard aGuard( m_aMutex );
  
      if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime() < m_xPlayer->getDuration())
@@ -542,7 +542,7 @@ index 4a707c5..46fd812 100644
 -struct ThreadHelpBase
 -{
 -    public:
--        mutable ::vos::OMutex m_aLock;
+-        mutable ::osl::Mutex m_aLock;
 -};
 -
  /*-************************************************************************************************************//**
@@ -2753,14 +2753,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;
commit a86cf93f5d7b1ed45d2cc7dac521c6a402f870e5
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Nov 3 14:07:15 2010 +0100

    Revert "Make impressmedia-features.diff apply again"
    
    This reverts commit 2e7aee7dbbdbedd48019519baa1f05b622658980.

diff --git a/patches/dev300/impressmedia-features.diff b/patches/dev300/impressmedia-features.diff
index af1a90e..71c5b51 100644
--- a/patches/dev300/impressmedia-features.diff
+++ b/patches/dev300/impressmedia-features.diff
@@ -396,7 +396,31 @@ index 1e2a1f9..1349443 100644
  {
      m_aUpdateTimer.SetTimeoutHdl(LINK(this, SoundHandler, implts_PlayerNotify));
  }
-@@ -482,79 +290,5 @@ IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
+@@ -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;
  }
  
  } // namespace framework
@@ -518,7 +542,7 @@ index 4a707c5..46fd812 100644
 -struct ThreadHelpBase
 -{
 -    public:
--        mutable ::osl::Mutex m_aLock;
+-        mutable ::vos::OMutex m_aLock;
 -};
 -
  /*-************************************************************************************************************//**
@@ -2729,6 +2753,14 @@ 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;


More information about the Libreoffice-commits mailing list