[Libreoffice-commits] .: avmedia/source

[Libreoffice Gerrit user]

 avmedia/source/win/manager.cxx |    2 +-
 avmedia/source/win/player.cxx  |    8 ++++----
 avmedia/source/win/player.hxx  |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 988948cb8f94ca791baaa6374493b93b789ba3e9
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Tue Sep 18 11:03:32 2012 +0200

    avmedia: problematic sal_Bool -> bool conversion when interacting with UNO
    
    Change-Id: If6c52ed167a418f88d96b5d5a7319cd9a7bca11d

diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index ec6d083..877c6e2 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -77,7 +77,7 @@ OUString SAL_CALL Manager::getImplementationName(  )
 
 // ------------------------------------------------------------------------------
 
-bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
     throw (uno::RuntimeException)
 {
     return ServiceName == AVMEDIA_WIN_MANAGER_SERVICENAME;
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 5180471..b5e52d6 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -249,7 +249,7 @@ void SAL_CALL Player::stop(  )
 
 // ------------------------------------------------------------------------------
 
-bool SAL_CALL Player::isPlaying()
+sal_Bool SAL_CALL Player::isPlaying()
     throw (uno::RuntimeException)
 {
     OAFilterState   eFilterState;
@@ -326,7 +326,7 @@ void SAL_CALL Player::setPlaybackLoop( bool bSet )
 
 // ------------------------------------------------------------------------------
 
-bool SAL_CALL Player::isPlaybackLoop(  )
+sal_Bool SAL_CALL Player::isPlaybackLoop(  )
     throw (uno::RuntimeException)
 {
     return mbLooping;
@@ -346,7 +346,7 @@ void SAL_CALL Player::setMute( bool bSet )
 
 // ------------------------------------------------------------------------------
 
-bool SAL_CALL Player::isMute(  )
+sal_Bool SAL_CALL Player::isMute(  )
     throw (uno::RuntimeException)
 {
     return mbMuted;
@@ -441,7 +441,7 @@ OUString SAL_CALL Player::getImplementationName(  )
 
 // ------------------------------------------------------------------------------
 
-bool SAL_CALL Player::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
     throw (uno::RuntimeException)
 {
     return ServiceName == AVMEDIA_WIN_PLAYER_SERVICENAME;
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index dbf8506..21a9693 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -71,15 +71,15 @@ public:
     // XPlayer
     virtual void SAL_CALL start(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL stop(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual bool SAL_CALL isPlaying(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaying(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual double SAL_CALL getDuration(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
     virtual double SAL_CALL getMediaTime(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual double SAL_CALL getRate(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPlaybackLoop( bool bSet ) throw (::com::sun::star::uno::RuntimeException);
-    virtual bool SAL_CALL isPlaybackLoop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setMute( bool bSet ) throw (::com::sun::star::uno::RuntimeException);
-    virtual bool SAL_CALL isMute(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isMute(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Int16 SAL_CALL getVolumeDB(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -88,7 +88,7 @@ public:
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
 private: