diff options
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstplayer.hxx | 2 | ||||
-rw-r--r-- | avmedia/source/macavf/macavfcommon.hxx | 2 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/SymbolLoader.hxx | 1 | ||||
-rw-r--r-- | avmedia/source/win/player.hxx | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 88e62cfb9d1f..111e7aea426d 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -91,7 +91,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : if (pError != NULL) { - // TODO: thow an exception? + // TODO: throw an exception? DBG( "%p Player::Player error '%s'", this, pError->message ); g_error_free (pError); } diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 671251d977f1..f1be5d245cef 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -74,7 +74,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/macavf/macavfcommon.hxx b/avmedia/source/macavf/macavfcommon.hxx index ff4559e823d9..c63df0d2486a 100644 --- a/avmedia/source/macavf/macavfcommon.hxx +++ b/avmedia/source/macavf/macavfcommon.hxx @@ -85,7 +85,7 @@ private: static MacAVObserverObject* mpMacAVObserverObject; public: virtual ~MacAVObserverHandler() {} - MacAVObserverObject* getObserver( void ) const; + MacAVObserverObject* getObserver() const; virtual bool handleObservation( NSString* pKeyPath ) = 0; }; diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index dce28f6230d4..a3c2aa31a0ed 100644 --- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx +++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx @@ -15,6 +15,7 @@ #endif #include <osl/module.h> #include <rtl/ustring.hxx> +#include <sal/log.hxx> #define SYM_MAP(a) { #a, reinterpret_cast<SymbolFunc *>(&a) } diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx index de0d3938dc26..38ff12a659e7 100644 --- a/avmedia/source/win/player.hxx +++ b/avmedia/source/win/player.hxx @@ -87,7 +87,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); private: |