Formatting changes across all modules

+ Removed comment cruft
+ Tab formatting in number of files
+ Some commented out code removed
+ Tab characters replaced with spaces
+ Newline cleanup in quite a few files
+ Tweak header guard #endifs

Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc
Reviewed-on: https://gerrit.libreoffice.org/22221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

36 files changed, 130 insertions, 354 deletions

diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index da17bc8e451c..1139f985209f 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -37,9 +37,6 @@ namespace avmedia
 {
 
 
-// - MediaControlStyle -
-
-
 enum MediaControlStyle
 {
     MEDIACONTROLSTYLE_SINGLELINE = 0,
@@ -47,9 +44,6 @@ enum MediaControlStyle
 };
 
 
-// - MediaControl -
-
-
 class MediaItem;
 
 class MediaControl : public Control
@@ -103,6 +97,6 @@ private:
 
 }
 
-#endif
+#endif // INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 8d542290fb13..8728fdff8b42 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -57,10 +57,6 @@
 namespace avmedia
 {
 
-
-// - MediaControl -
-
-
 MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle ) :
     Control( pParent ),
     maImageList( SvtMiscOptions().AreCurrentSymbolsLarge() ? AVMEDIA_RESID( AVMEDIA_IMGLST_L ) : AVMEDIA_RESID( AVMEDIA_IMGLST ) ),
@@ -192,12 +188,12 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
 }
 
 
-
 MediaControl::~MediaControl()
 {
     disposeOnce();
 }
 
+
 void MediaControl::dispose()
 {
     maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, nullptr );
@@ -212,14 +208,12 @@ void MediaControl::dispose()
 }
 
 
-
 const Size& MediaControl::getMinSizePixel() const
 {
     return maMinSize;
 }
 
 
-
 void MediaControl::Resize()
 {
     Point           aPos( 0, 0 );
@@ -277,7 +271,6 @@ void MediaControl::Resize()
 }
 
 
-
 void MediaControl::setState( const MediaItem& rItem )
 {
     if( !mbLocked )
@@ -292,7 +285,6 @@ void MediaControl::setState( const MediaItem& rItem )
 }
 
 
-
 void MediaControl::implUpdateToolboxes()
 {
     const bool bValidURL = !maItem.getURL().isEmpty();
@@ -367,7 +359,6 @@ void MediaControl::implUpdateToolboxes()
 }
 
 
-
 void MediaControl::implUpdateTimeSlider()
 {
     if( maItem.getURL().isEmpty() || !IsEnabled() )
@@ -394,7 +385,6 @@ void MediaControl::implUpdateTimeSlider()
 }
 
 
-
 void MediaControl::implUpdateVolumeSlider()
 {
     if( maItem.getURL().isEmpty() || !IsEnabled() )
@@ -411,7 +401,6 @@ void MediaControl::implUpdateVolumeSlider()
 }
 
 
-
 void MediaControl::implUpdateTimeField( double fCurTime )
 {
     if( !maItem.getURL().isEmpty() )
@@ -431,14 +420,12 @@ void MediaControl::implUpdateTimeField( double fCurTime )
 }
 
 
-
 Image MediaControl::implGetImage( sal_Int32 nImageId ) const
 {
     return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
 }
 
 
-
 IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void )
 {
     mbLocked = true;
@@ -447,7 +434,6 @@ IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void )
 }
 
 
-
 IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void )
 {
     MediaItem aExecItem;
@@ -460,7 +446,6 @@ IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void )
 }
 
 
-
 IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
 {
     MediaItem aExecItem;
@@ -471,7 +456,6 @@ IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
 }
 
 
-
 IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
 {
     if( p )
@@ -559,7 +543,6 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
 }
 
 
-
 IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
 {
     MediaItem aExecItem;
@@ -582,12 +565,11 @@ IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(MediaControl, implTimeoutHdl, Idle *, void)
 {
     update();
 }
 
-}
+} // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 7a8b9a6c4ccb..ed413f23a363 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star;
 namespace avmedia
 {
 
-// - MediaItem -
 SfxPoolItem* MediaItem::CreateDefault() { return new MediaItem; }
 
 struct MediaItem::Impl
@@ -89,22 +88,26 @@ struct MediaItem::Impl
     }
 };
 
+
 MediaItem::MediaItem( sal_uInt16 i_nWhich, AVMediaSetMask nMaskSet )
     : SfxPoolItem( i_nWhich )
     , m_pImpl( new Impl(nMaskSet) )
 {
 }
 
+
 MediaItem::MediaItem( const MediaItem& rItem )
     : SfxPoolItem( rItem )
     , m_pImpl( new Impl(*rItem.m_pImpl) )
 {
 }
 
+
 MediaItem::~MediaItem()
 {
 }
 
+
 bool MediaItem::operator==( const SfxPoolItem& rItem ) const
 {
     assert( SfxPoolItem::operator==(rItem));
@@ -122,11 +125,13 @@ bool MediaItem::operator==( const SfxPoolItem& rItem ) const
         && m_pImpl->m_eZoom == rOther.m_pImpl->m_eZoom;
 }
 
+
 SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const
 {
     return new MediaItem( *this );
 }
 
+
 bool MediaItem::GetPresentation( SfxItemPresentation,
                                                   SfxMapUnit,
                                                   SfxMapUnit,
@@ -137,6 +142,7 @@ bool MediaItem::GetPresentation( SfxItemPresentation,
     return false;
 }
 
+
 bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
 {
     uno::Sequence< uno::Any > aSeq( 10 );
@@ -157,6 +163,7 @@ bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
     return true;
 }
 
+
 bool MediaItem::PutValue( const css::uno::Any& rVal, sal_uInt8 )
 {
     uno::Sequence< uno::Any >   aSeq;
@@ -185,6 +192,7 @@ bool MediaItem::PutValue( const css::uno::Any& rVal, sal_uInt8 )
     return bRet;
 }
 
+
 void MediaItem::merge( const MediaItem& rMediaItem )
 {
     const AVMediaSetMask nMaskSet = rMediaItem.getMaskSet();
@@ -217,11 +225,13 @@ void MediaItem::merge( const MediaItem& rMediaItem )
         setZoom( rMediaItem.getZoom() );
 }
 
+
 AVMediaSetMask MediaItem::getMaskSet() const
 {
     return m_pImpl->m_nMaskSet;
 }
 
+
 void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OUString& rReferer )
 {
     m_pImpl->m_nMaskSet |= AVMediaSetMask::URL;
@@ -230,109 +240,129 @@ void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL, const OU
     m_pImpl->m_Referer = rReferer;
 }
 
+
 const OUString& MediaItem::getURL() const
 {
     return m_pImpl->m_URL;
 }
 
+
 const OUString& MediaItem::getTempURL() const
 {
     return m_pImpl->m_TempFileURL;
 }
 
+
 const OUString& MediaItem::getReferer() const
 {
     return m_pImpl->m_Referer;
 }
 
+
 void MediaItem::setMimeType( const OUString& rMimeType )
 {
     m_pImpl->m_nMaskSet |= AVMediaSetMask::MIME_TYPE;
     m_pImpl->m_sMimeType = rMimeType;
 }
 
+
 OUString MediaItem::getMimeType() const
 {
     return !m_pImpl->m_sMimeType.isEmpty() ? m_pImpl->m_sMimeType : AVMEDIA_MIMETYPE_COMMON;
 }
 
+
 void MediaItem::setState( MediaState eState )
 {
     m_pImpl->m_eState = eState;
     m_pImpl->m_nMaskSet |= AVMediaSetMask::STATE;
 }
 
+
 MediaState MediaItem::getState() const
 {
     return m_pImpl->m_eState;
 }
 
+
 void MediaItem::setDuration( double fDuration )
 {
     m_pImpl->m_fDuration = fDuration;
     m_pImpl->m_nMaskSet |= AVMediaSetMask::DURATION;
 }
 
+
 double MediaItem::getDuration() const
 {
     return m_pImpl->m_fDuration;
 }
 
+
 void MediaItem::setTime( double fTime )
 {
     m_pImpl->m_fTime = fTime;
     m_pImpl->m_nMaskSet |= AVMediaSetMask::TIME;
 }
 
+
 double MediaItem::getTime() const
 {
     return m_pImpl->m_fTime;
 }
 
+
 void MediaItem::setLoop( bool bLoop )
 {
     m_pImpl->m_bLoop = bLoop;
     m_pImpl->m_nMaskSet |= AVMediaSetMask::LOOP;
 }
 
+
 bool MediaItem::isLoop() const
 {
     return m_pImpl->m_bLoop;
 }
 
+
 void MediaItem::setMute( bool bMute )
 {
     m_pImpl->m_bMute = bMute;
     m_pImpl->m_nMaskSet |= AVMediaSetMask::MUTE;
 }
 
+
 bool MediaItem::isMute() const
 {
     return m_pImpl->m_bMute;
 }
 
+
 void MediaItem::setVolumeDB( sal_Int16 nDB )
 {
     m_pImpl->m_nVolumeDB = nDB;
     m_pImpl->m_nMaskSet |= AVMediaSetMask::VOLUMEDB;
 }
 
+
 sal_Int16 MediaItem::getVolumeDB() const
 {
     return m_pImpl->m_nVolumeDB;
 }
 
+
 void MediaItem::setZoom( css::media::ZoomLevel eZoom )
 {
     m_pImpl->m_eZoom = eZoom;
     m_pImpl->m_nMaskSet |= AVMediaSetMask::ZOOM;
 }
 
+
 css::media::ZoomLevel MediaItem::getZoom() const
 {
     return m_pImpl->m_eZoom;
 }
 
+
 OUString GetFilename(OUString const& rSourceURL)
 {
     uno::Reference<uri::XUriReferenceFactory> const xUriFactory(
@@ -357,6 +387,7 @@ OUString GetFilename(OUString const& rSourceURL)
     return filename;
 }
 
+
 uno::Reference<io::XStream>
 CreateStream(uno::Reference<embed::XStorage> const& xStorage,
         OUString const& rFilename)
@@ -399,6 +430,7 @@ CreateStream(uno::Reference<embed::XStorage> const& xStorage,
     return xStream;
 }
 
+
 bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
         OUString const& rSourceURL, OUString & o_rEmbeddedURL)
 {
@@ -451,6 +483,8 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
     }
     return false;
 }
-}
+
+
+} // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 6733313ed318..af9ce1b48b4e 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -38,6 +38,6 @@ ResMgr* GetResMgr()
     return pResMgr;
 }
 
-} // namespace avemdia
+} // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index c39af428e92e..489ff5e05f0a 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -33,10 +33,6 @@
 namespace avmedia
 {
 
-
-// - MediaPlayer -
-
-
 MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
 {
@@ -45,19 +41,14 @@ MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _p
 };
 
 
-
 MediaPlayer::~MediaPlayer()
 {
 }
 
 
-
 SFX_IMPL_DOCKINGWINDOW_WITHID( MediaPlayer, SID_AVMEDIA_PLAYER )
 
 
-// - MediaFloater -
-
-
 MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::Window* pParent ) :
     SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ),
     mpMediaWindow( new MediaWindow( this, true ) )
@@ -71,12 +62,12 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::W
 }
 
 
-
 MediaFloater::~MediaFloater()
 {
     disposeOnce();
 }
 
+
 void MediaFloater::dispose()
 {
     delete mpMediaWindow;
@@ -85,7 +76,6 @@ void MediaFloater::dispose()
 }
 
 
-
 void MediaFloater::Resize()
 {
     SfxDockingWindow::Resize();
@@ -95,7 +85,6 @@ void MediaFloater::Resize()
 }
 
 
-
 void MediaFloater::ToggleFloatingMode()
 {
     ::avmedia::MediaItem aRestoreItem;
@@ -124,7 +113,6 @@ void MediaFloater::ToggleFloatingMode()
 }
 
 
-
 void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately )
 {
     if( mpMediaWindow )
@@ -137,7 +125,6 @@ void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool
 }
 
 
-
 void MediaFloater::dispatchCurrentURL()
 {
     SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
@@ -153,6 +140,6 @@ void MediaFloater::dispatchCurrentURL()
     }
 }
 
-}
+} // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 14d6befd7c8a..08d1f9fa7e43 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -33,10 +33,6 @@ using namespace ::com::sun::star;
 namespace avmedia
 {
 
-
-// - MediaToolboxControl -
-
-
 class MediaToolBoxControl_Impl : public MediaControl
 {
 public:
@@ -52,7 +48,6 @@ private:
 };
 
 
-
 MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( vcl::Window& rParent, MediaToolBoxControl& rControl ) :
     MediaControl( &rParent, MEDIACONTROLSTYLE_SINGLELINE ),
     mpToolBoxControl( &rControl )
@@ -61,27 +56,21 @@ MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( vcl::Window& rParent, MediaT
 }
 
 
-
 void MediaToolBoxControl_Impl::update()
 {
     mpToolBoxControl->implUpdateMediaControl();
 }
 
 
-
 void MediaToolBoxControl_Impl::execute( const MediaItem& rItem )
 {
     mpToolBoxControl->implExecuteMediaControl( rItem );
 }
 
 
-// - MediaToolBoxControl -
-
-
 SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem );
 
 
-
 MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
@@ -89,15 +78,12 @@ MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, To
 }
 
 
-
 MediaToolBoxControl::~MediaToolBoxControl()
 {
 }
 
 
-
-void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
-
+void MediaToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
     MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
 
@@ -123,21 +109,18 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eSta
 }
 
 
-
 VclPtr<vcl::Window> MediaToolBoxControl::CreateItemWindow( vcl::Window *pParent )
 {
     return ( pParent ? VclPtr<MediaToolBoxControl_Impl>::Create( *pParent, *this ) : nullptr );
 }
 
 
-
 void MediaToolBoxControl::implUpdateMediaControl()
 {
     updateStatus( ".uno:AVMediaToolBox" );
 }
 
 
-
 void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
 {
     MediaItem                               aExecItem( SID_AVMEDIA_TOOLBOX );
@@ -152,6 +135,6 @@ void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
     Dispatch( ".uno:AVMediaToolBox" , aArgs );
 }
 
-}
+} // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index 4d348c343ac0..74669af81258 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -66,6 +66,7 @@ static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFold
     }
 }
 
+
 bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
 {
     o_rOutput.clear();
@@ -133,7 +134,8 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
     o_rOutput = sOutput + "/" + GetFilename(sOutput) + ".json";
     return true;
 }
-#endif
+#endif // HAVE_FEATURE_COLLADA
+
 
 static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed::XStorage> xSubStorage, ::ucbhelper::Content& rContent)
 {
@@ -237,6 +239,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed:
     }
 }
 
+
 bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
         const OUString& rSourceURL, OUString& o_rEmbeddedURL)
 {
@@ -311,11 +314,12 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
     return false;
 }
 
+
 bool IsModel(const OUString& rMimeType)
 {
     return rMimeType == AVMEDIA_MIMETYPE_JSON;
 }
 
-} // namespace avemdia
+} // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 4939d4ed1863..af181385ece7 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -27,13 +27,10 @@
 
 namespace avmedia { namespace gstreamer {
 
-
-// - FrameGrabber -
-
-
 typedef ::cppu::WeakImplHelper< css::media::XFrameGrabber,
                                 css::lang::XServiceInfo > FrameGrabber_BASE;
 
+
 class FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable
 {
     GstElement *mpPipeline;
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 8dc1a954ccac..48a07f645f90 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -24,10 +24,6 @@
 #include <cppuhelper/implbase.hxx>
 #include "com/sun/star/media/XManager.hpp"
 
-
-// - Manager -
-
-
 namespace avmedia { namespace gstreamer {
 
 class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index fef123fd2553..d77944e98dfa 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -83,6 +83,7 @@ private:
     void execute() override;
 };
 
+
 class MissingPluginInstaller {
     friend class MissingPluginInstallerThread;
 
@@ -113,12 +114,14 @@ private:
     bool inCleanUp_;
 };
 
+
 MissingPluginInstaller::~MissingPluginInstaller() {
     osl::MutexGuard g(mutex_);
     SAL_WARN_IF(currentThread_.is(), "avmedia.gstreamer", "unjoined thread");
     inCleanUp_ = true;
 }
 
+
 void MissingPluginInstaller::report(
     rtl::Reference<Player> const & source, GstMessage * message)
 {
@@ -169,6 +172,7 @@ void MissingPluginInstaller::report(
         LINK(this, MissingPluginInstaller, launchUi), launch.get());
 }
 
+
 void eraseSource(std::set<rtl::Reference<Player>> & set, Player const * source)
 {
     auto i = std::find_if(
@@ -181,6 +185,7 @@ void eraseSource(std::set<rtl::Reference<Player>> & set, Player const * source)
     }
 }
 
+
 void MissingPluginInstaller::detach(Player const * source) {
     rtl::Reference<MissingPluginInstallerThread> join;
     {
@@ -217,6 +222,7 @@ void MissingPluginInstaller::detach(Player const * source) {
     }
 }
 
+
 void MissingPluginInstaller::processQueue() {
     assert(!queued_.empty());
     assert(currentDetails_.empty());
@@ -228,6 +234,7 @@ void MissingPluginInstaller::processQueue() {
     queued_.clear();
 }
 
+
 IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void)
 {
     MissingPluginInstallerThread* thread = static_cast<MissingPluginInstallerThread*>(p);
@@ -243,10 +250,12 @@ IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void)
     ref->launch();
 }
 
+
 struct TheMissingPluginInstaller:
     public rtl::Static<MissingPluginInstaller, TheMissingPluginInstaller>
 {};
 
+
 void MissingPluginInstallerThread::execute() {
     MissingPluginInstaller & inst = TheMissingPluginInstaller::get();
     for (;;) {
@@ -273,9 +282,7 @@ void MissingPluginInstallerThread::execute() {
     }
 }
 
-}
-
-// - Player -
+} // end anonymous namespace
 
 
 Player::Player() :
@@ -315,7 +322,6 @@ Player::Player() :
 }
 
 
-
 Player::~Player()
 {
     SAL_INFO( "avmedia.gstreamer", AVVERSION << this << " Player::~Player" );
@@ -323,6 +329,7 @@ Player::~Player()
         disposing();
 }
 
+
 void SAL_CALL Player::disposing()
 {
     TheMissingPluginInstaller::get().detach(this);
@@ -357,6 +364,7 @@ void SAL_CALL Player::disposing()
     }
 }
 
+
 static gboolean pipeline_bus_callback( GstBus *, GstMessage *message, gpointer data )
 {
     Player* pPlayer = static_cast<Player*>(data);
@@ -366,6 +374,7 @@ static gboolean pipeline_bus_callback( GstBus *, GstMessage *message, gpointer d
     return TRUE;
 }
 
+
 static GstBusSyncReply pipeline_bus_sync_handler( GstBus *, GstMessage * message, gpointer data )
 {
     Player* pPlayer = static_cast<Player*>(data);
@@ -373,6 +382,7 @@ static GstBusSyncReply pipeline_bus_sync_handler( GstBus *, GstMessage * message
     return pPlayer->processSyncMessage( message );
 }
 
+
 void Player::processMessage( GstMessage *message )
 {
     switch( GST_MESSAGE_TYPE( message ) ) {
@@ -401,6 +411,7 @@ void Player::processMessage( GstMessage *message )
     }
 }
 
+
 static gboolean wrap_element_query_position (GstElement *element, GstFormat format, gint64 *cur)
 {
 #ifdef AVMEDIA_GST_0_10
@@ -411,6 +422,7 @@ static gboolean wrap_element_query_position (GstElement *element, GstFormat form
 #endif
 }
 
+
 static gboolean wrap_element_query_duration (GstElement *element, GstFormat format, gint64 *duration)
 {
 #ifdef AVMEDIA_GST_0_10
@@ -421,6 +433,7 @@ static gboolean wrap_element_query_duration (GstElement *element, GstFormat form
 #endif
 }
 
+
 GstBusSyncReply Player::processSyncMessage( GstMessage *message )
 {
 #if OSL_DEBUG_LEVEL > 0
@@ -543,7 +556,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
                 g_object_unref( pad );
             }
         }
-#endif
+#endif // AVMEDIA_GST_0_10
     } else if (gst_is_missing_plugin_message(message)) {
         TheMissingPluginInstaller::get().report(this, message);
         if( mnWidth == 0 ) {
@@ -560,6 +573,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
     return GST_BUS_PASS;
 }
 
+
 void Player::preparePlaybin( const OUString& rURL, GstElement *pSink )
 {
         GstBus *pBus;
@@ -599,6 +613,7 @@ void Player::preparePlaybin( const OUString& rURL, GstElement *pSink )
         g_object_unref( pBus );
 }
 
+
 bool Player::create( const OUString& rURL )
 {
     bool    bRet = false;
@@ -627,7 +642,6 @@ bool Player::create( const OUString& rURL )
 }
 
 
-
 void SAL_CALL Player::start()
     throw (uno::RuntimeException, std::exception)
 {
@@ -642,7 +656,6 @@ void SAL_CALL Player::start()
 }
 
 
-
 void SAL_CALL Player::stop()
     throw (uno::RuntimeException, std::exception)
 {
@@ -657,7 +670,6 @@ void SAL_CALL Player::stop()
 }
 
 
-
 sal_Bool SAL_CALL Player::isPlaying()
     throw (uno::RuntimeException, std::exception)
 {
@@ -677,7 +689,6 @@ sal_Bool SAL_CALL Player::isPlaying()
 }
 
 
-
 double SAL_CALL Player::getDuration()
     throw (uno::RuntimeException, std::exception)
 {
@@ -694,7 +705,6 @@ double SAL_CALL Player::getDuration()
 }
 
 
-
 void SAL_CALL Player::setMediaTime( double fTime )
     throw (uno::RuntimeException, std::exception)
 {
@@ -716,7 +726,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
 }
 
 
-
 double SAL_CALL Player::getMediaTime()
     throw (uno::RuntimeException, std::exception)
 {
@@ -734,6 +743,7 @@ double SAL_CALL Player::getMediaTime()
     return position;
 }
 
+
 void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
     throw (uno::RuntimeException, std::exception)
 {
@@ -743,7 +753,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
 }
 
 
-
 sal_Bool SAL_CALL Player::isPlaybackLoop()
     throw (uno::RuntimeException, std::exception)
 {
@@ -753,7 +762,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop()
 }
 
 
-
 void SAL_CALL Player::setMute( sal_Bool bSet )
     throw (uno::RuntimeException, std::exception)
 {
@@ -777,7 +785,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
 }
 
 
-
 sal_Bool SAL_CALL Player::isMute()
     throw (uno::RuntimeException, std::exception)
 {
@@ -787,7 +794,6 @@ sal_Bool SAL_CALL Player::isMute()
 }
 
 
-
 void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
     throw (uno::RuntimeException, std::exception)
 {
@@ -805,7 +811,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
 }
 
 
-
 sal_Int16 SAL_CALL Player::getVolumeDB()
     throw (uno::RuntimeException, std::exception)
 {
@@ -825,7 +830,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
 }
 
 
-
 awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
     throw (uno::RuntimeException, std::exception)
 {
@@ -854,7 +858,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
 }
 
 
-
 uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments )
     throw (uno::RuntimeException, std::exception)
 {
@@ -896,7 +899,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
 }
 
 
-
 uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
     throw (uno::RuntimeException, std::exception)
 {
@@ -912,7 +914,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
 }
 
 
-
 OUString SAL_CALL Player::getImplementationName()
     throw (uno::RuntimeException, std::exception)
 {
@@ -920,7 +921,6 @@ OUString SAL_CALL Player::getImplementationName()
 }
 
 
-
 sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
     throw (uno::RuntimeException, std::exception)
 {
@@ -928,7 +928,6 @@ sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
 }
 
 
-
 uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames()
     throw (uno::RuntimeException, std::exception)
 {
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 3f95a88b9599..b6c51fa4768f 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -32,9 +32,6 @@ typedef struct _GstVideoOverlay GstVideoOverlay;
 namespace avmedia { namespace gstreamer {
 
 
-// - Player -
-
-
 typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
                                          css::lang::XServiceInfo > GstPlayer_BASE;
 
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 2c9af23d46e2..9246a4497165 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -28,10 +28,6 @@
 
 namespace avmedia { namespace gstreamer {
 
-
-// - Window -
-
-
 class Player;
 
 class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx
index cb67176c3fc0..f8ce9d65a1e3 100644
--- a/avmedia/source/macavf/framegrabber.hxx
+++ b/avmedia/source/macavf/framegrabber.hxx
@@ -27,10 +27,6 @@
 
 namespace avmedia { namespace macavf {
 
-// ----------------
-// - FrameGrabber -
-// ----------------
-
 class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
                                                     css::lang::XServiceInfo >
 {
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index bf54b01e042b..2cbe8cb5593b 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -29,15 +29,10 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace macavf {
 
-// ----------------
-// - FrameGrabber -
-// ----------------
-
 FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& /*rxMgr*/ )
 :   mpImageGen( nullptr )
 {}
 
-// ------------------------------------------------------------------------------
 
 FrameGrabber::~FrameGrabber()
 {
@@ -45,7 +40,6 @@ FrameGrabber::~FrameGrabber()
         CFRelease( mpImageGen );
 }
 
-// ------------------------------------------------------------------------------
 
 bool FrameGrabber::create( const ::rtl::OUString& rURL )
 {
@@ -64,7 +58,6 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
     return create( pMovie );
 }
 
-// ------------------------------------------------------------------------------
 
 bool FrameGrabber::create( AVAsset* pMovie )
 {
@@ -79,7 +72,6 @@ bool FrameGrabber::create( AVAsset* pMovie )
     return true;
 }
 
-// ------------------------------------------------------------------------------
 
 uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
     throw (uno::RuntimeException)
@@ -112,7 +104,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
 
 ::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
     throw (uno::RuntimeException)
@@ -120,7 +111,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
 }
 
-// ------------------------------------------------------------------------------
 
 sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
     throw (uno::RuntimeException)
@@ -128,7 +118,6 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceN
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME ) );
 }
 
-// ------------------------------------------------------------------------------
 
 uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx
index 87db73174a33..6e93d7e5c19c 100644
--- a/avmedia/source/macavf/manager.hxx
+++ b/avmedia/source/macavf/manager.hxx
@@ -25,9 +25,6 @@
 
 #include "com/sun/star/media/XManager.hdl"
 
-// -----------
-// - Manager -
-// -----------
 
 namespace avmedia { namespace macavf {
 
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 0bc5abda1119..3e413a36232e 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -26,22 +26,16 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace macavf {
 
-// ----------------
-// - Manager -
-// ----------------
-
 Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     mxMgr( rxMgr )
 {
     OSL_TRACE( "Constructing avmedia::macavf::Manager" );
 }
 
-// ------------------------------------------------------------------------------
 
 Manager::~Manager()
 {}
 
-// ------------------------------------------------------------------------------
 
 uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
     throw (uno::RuntimeException)
@@ -58,7 +52,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
 
 ::rtl::OUString SAL_CALL Manager::getImplementationName(  )
     throw (uno::RuntimeException)
@@ -66,7 +59,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ) );
 }
 
-// ------------------------------------------------------------------------------
 
 sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
     throw (uno::RuntimeException)
@@ -74,7 +66,6 @@ sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_MANAGER_SERVICENAME ) );
 }
 
-// ------------------------------------------------------------------------------
 
 uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx
index 9f26b47b1455..e1c644bab010 100644
--- a/avmedia/source/macavf/player.hxx
+++ b/avmedia/source/macavf/player.hxx
@@ -28,12 +28,6 @@
 
 namespace avmedia { namespace macavf {
 
-/*
-// ----------
-// - Player -
-// ----------
-*/
-
 class Player
 :   public MacAVObserverHandler
 ,   public ::cppu::WeakImplHelper< css::media::XPlayer,
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index cb366c0bb12c..4f753c3f0441 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -73,10 +73,6 @@ MacAVObserverObject* MacAVObserverHandler::getObserver()
 }
 
 
-// ----------------
-// - Player -
-// ----------------
-
 Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr )
 :   mxMgr( rxMgr )
 ,   mpPlayer( nullptr )
@@ -86,7 +82,6 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr )
 ,   mbLooping( false )
 {}
 
-// ------------------------------------------------------------------------------
 
 Player::~Player()
 {
@@ -103,7 +98,6 @@ Player::~Player()
     CFRelease( mpPlayer );
 }
 
-// ------------------------------------------------------------------------------
 
 bool Player::handleObservation( NSString* pKeyPath )
 {
@@ -117,7 +111,6 @@ bool Player::handleObservation( NSString* pKeyPath )
     return true;
 }
 
-// ------------------------------------------------------------------------------
 
 bool Player::create( const ::rtl::OUString& rURL )
 {
@@ -163,7 +156,6 @@ bool Player::create( const ::rtl::OUString& rURL )
     return true;
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Player::start()
     throw (uno::RuntimeException)
@@ -181,7 +173,6 @@ void SAL_CALL Player::start()
     // else // TODO: delay until it becomes ready
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Player::stop()
     throw (uno::RuntimeException)
@@ -194,7 +185,6 @@ void SAL_CALL Player::stop()
         [mpPlayer pause];
 }
 
-// ------------------------------------------------------------------------------
 
 sal_Bool SAL_CALL Player::isPlaying()
     throw (uno::RuntimeException)
@@ -205,7 +195,6 @@ sal_Bool SAL_CALL Player::isPlaying()
     return (fRate != 0.0);
 }
 
-// ------------------------------------------------------------------------------
 
 double SAL_CALL Player::getDuration()
     throw (uno::RuntimeException)
@@ -225,7 +214,6 @@ double SAL_CALL Player::getDuration()
     return duration;
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Player::setMediaTime( double fTime )
     throw (uno::RuntimeException)
@@ -235,7 +223,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
         [mpPlayer seekToTime: CMTimeMakeWithSeconds(fTime,1000) ];
 }
 
-// ------------------------------------------------------------------------------
 
 double SAL_CALL Player::getMediaTime()
     throw (uno::RuntimeException)
@@ -252,7 +239,6 @@ double SAL_CALL Player::getMediaTime()
     return position;
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Player::setStopTime( double fTime )
     throw (uno::RuntimeException)
@@ -261,7 +247,6 @@ void SAL_CALL Player::setStopTime( double fTime )
     mfStopTime = fTime;
 }
 
-// ------------------------------------------------------------------------------
 
 double SAL_CALL Player::getStopTime()
     throw (uno::RuntimeException)
@@ -269,7 +254,6 @@ double SAL_CALL Player::getStopTime()
     return mfStopTime;
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
     throw (uno::RuntimeException)
@@ -278,7 +262,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
     mbLooping = bSet;
 }
 
-// ------------------------------------------------------------------------------
 
 sal_Bool SAL_CALL Player::isPlaybackLoop()
     throw (uno::RuntimeException)
@@ -288,7 +271,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop()
     return bRet;
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Player::setMute( sal_Bool bSet )
     throw (uno::RuntimeException)
@@ -302,7 +284,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
     [mpPlayer setMuted:mbMuted];
 }
 
-// ------------------------------------------------------------------------------
 
 sal_Bool SAL_CALL Player::isMute()
     throw (uno::RuntimeException)
@@ -311,7 +292,6 @@ sal_Bool SAL_CALL Player::isMute()
     return mbMuted;
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
     throw (uno::RuntimeException)
@@ -326,7 +306,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
         [mpPlayer setVolume:mfUnmutedVolume];
 }
 
-// ------------------------------------------------------------------------------
 
 sal_Int16 SAL_CALL Player::getVolumeDB()
     throw (uno::RuntimeException)
@@ -345,7 +324,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
     return (sal_Int16)nVolumeDB;
 }
 
-// ------------------------------------------------------------------------------
 
 awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
     throw (uno::RuntimeException)
@@ -364,7 +342,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
     return aSize;
 }
 
-// ------------------------------------------------------------------------------
 
 uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
     throw (uno::RuntimeException)
@@ -389,7 +366,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
 
 uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
     throw (uno::RuntimeException)
@@ -405,7 +381,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
 
 ::rtl::OUString SAL_CALL Player::getImplementationName(  )
     throw (uno::RuntimeException)
@@ -413,7 +388,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME ) );
 }
 
-// ------------------------------------------------------------------------------
 
 sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
     throw (uno::RuntimeException)
@@ -421,7 +395,6 @@ sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_PLAYER_SERVICENAME ) );
 }
 
-// ------------------------------------------------------------------------------
 
 uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index 63f77ab0f872..396f75a9b24b 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -26,9 +26,6 @@
 
 #include "com/sun/star/media/XPlayerWindow.hdl"
 
-// ---------------
-// - MyMediaView -
-// ---------------
 
 @interface MyMediaView : NSView
 @property (nonatomic, readonly, strong) AVPlayer* player;
@@ -39,10 +36,6 @@
 
 namespace avmedia { namespace macavf {
 
-// ---------------
-// - Window -
-// ---------------
-
 class Player;
 
 class Window
diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index a5465017c896..0ddee7fe120d 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -28,10 +28,6 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace macavf {
 
-// ---------------
-// - Window -
-// ---------------
-
 Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Player& i_rPlayer, NSView* i_pParentView )
 :   mxMgr( i_rxMgr )
 ,   maListeners( maMutex )
@@ -71,7 +67,6 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Pla
     [mpView.layer addSublayer:mpPlayerLayer];
 }
 
-// ------------------------------------------------------------------------------
 
 Window::~Window()
 {
@@ -79,7 +74,6 @@ Window::~Window()
     [mpPlayerLayer release];
 }
 
-// ------------------------------------------------------------------------------
 
 bool Window::handleObservation( NSString* pKeyPath )
 {
@@ -90,13 +84,11 @@ bool Window::handleObservation( NSString* pKeyPath )
 }
 
 // XPlayerWindow
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::update()
     throw (uno::RuntimeException)
 {}
 
-// ------------------------------------------------------------------------------
 
 sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel /* eZoomLevel */ )
     throw (uno::RuntimeException)
@@ -104,7 +96,6 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel /* eZoomLevel */ )
     return false;
 }
 
-// ------------------------------------------------------------------------------
 
 media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
     throw (uno::RuntimeException)
@@ -112,7 +103,6 @@ media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
     return meZoomLevel;
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
     throw (uno::RuntimeException)
@@ -121,7 +111,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
 }
 
 // XWindow
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 /* Flags */ )
     throw (uno::RuntimeException)
@@ -140,7 +129,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal
     [mpPlayerLayer setFrame:CGRectMake(viewFrame.origin.x, viewFrame.origin.y, viewFrame.size.width, viewFrame.size.height)];
 }
 
-// ------------------------------------------------------------------------------
 
 awt::Rectangle SAL_CALL Window::getPosSize()
     throw (uno::RuntimeException)
@@ -155,7 +143,6 @@ awt::Rectangle SAL_CALL Window::getPosSize()
     return aRet;
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::setVisible( sal_Bool bVisible )
     throw (uno::RuntimeException)
@@ -163,7 +150,6 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible )
     OSL_TRACE ("Window::setVisible(%d)", bVisible);
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::setEnable( sal_Bool bEnable )
     throw (uno::RuntimeException)
@@ -171,7 +157,6 @@ void SAL_CALL Window::setEnable( sal_Bool bEnable )
     OSL_TRACE ("Window::setEnable(%d)", bEnable);
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::setFocus()
     throw (uno::RuntimeException)
@@ -179,7 +164,6 @@ void SAL_CALL Window::setFocus()
     OSL_TRACE ("Window::setFocus");
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
     throw (uno::RuntimeException)
@@ -187,7 +171,6 @@ void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListe
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
     throw (uno::RuntimeException)
@@ -195,7 +178,6 @@ void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowLi
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
     throw (uno::RuntimeException)
@@ -203,7 +185,6 @@ void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListene
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
     throw (uno::RuntimeException)
@@ -211,7 +192,6 @@ void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusList
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
     throw (uno::RuntimeException)
@@ -219,7 +199,6 @@ void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >&
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
     throw (uno::RuntimeException)
@@ -227,7 +206,6 @@ void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
     throw (uno::RuntimeException)
@@ -235,7 +213,6 @@ void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListene
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
     throw (uno::RuntimeException)
@@ -243,7 +220,6 @@ void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseList
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
     throw (uno::RuntimeException)
@@ -251,7 +227,6 @@ void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseM
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
     throw (uno::RuntimeException)
@@ -259,7 +234,6 @@ void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMou
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
     throw (uno::RuntimeException)
@@ -267,7 +241,6 @@ void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListene
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
     throw (uno::RuntimeException)
@@ -277,14 +250,12 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
 
 
 // XComponent
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::dispose(  )
     throw (uno::RuntimeException)
 {
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw (uno::RuntimeException)
@@ -292,7 +263,6 @@ void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListen
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
-// ------------------------------------------------------------------------------
 
 void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw (uno::RuntimeException)
@@ -301,7 +271,6 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
 }
 
 // XServiceInfo
-// ------------------------------------------------------------------------------
 
 ::rtl::OUString SAL_CALL Window::getImplementationName(  )
     throw (uno::RuntimeException)
@@ -309,7 +278,6 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME ) );
 }
 
-// ------------------------------------------------------------------------------
 
 sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
     throw (uno::RuntimeException)
@@ -317,7 +285,6 @@ sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_WINDOW_SERVICENAME ) );
 }
 
-// ------------------------------------------------------------------------------
 
 uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 0a697c1aed43..7d2a8df902c7 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -27,10 +27,6 @@
 
 namespace avmedia { namespace quicktime {
 
-
-// - FrameGrabber -
-
-
 class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
                                                     css::lang::XServiceInfo >
 {
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index e3cc4809bccb..2fd457bbf092 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -35,9 +35,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
 namespace avmedia { namespace quicktime {
 
 
-// - FrameGrabber -
-
-
 FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     mxMgr( rxMgr )
 {
@@ -49,7 +46,6 @@ FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >&
 }
 
 
-
 FrameGrabber::~FrameGrabber()
 {
     if( mbInitialized )
@@ -63,7 +59,6 @@ FrameGrabber::~FrameGrabber()
 }
 
 
-
 bool FrameGrabber::create( const ::rtl::OUString& rURL )
 {
     bool bRet = false;
@@ -87,7 +82,6 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
 }
 
 
-
 uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
     throw (uno::RuntimeException)
 {
@@ -108,7 +102,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
 }
 
 
-
 ::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
     throw (uno::RuntimeException)
 {
@@ -116,7 +109,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
 }
 
 
-
 sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
     throw (uno::RuntimeException)
 {
@@ -124,7 +116,6 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceN
 }
 
 
-
 uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 0ab910c0be94..215e14c47017 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -26,9 +26,6 @@
 #include "com/sun/star/media/XManager.hpp"
 
 
-// - Manager -
-
-
 namespace avmedia { namespace quicktime {
 
 class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm
index b7081844f783..1426020a5be7 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -26,9 +26,6 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace quicktime {
 
-// - Manager -
-
-
 Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     mxMgr( rxMgr )
 {
@@ -36,13 +33,11 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
 }
 
 
-
 Manager::~Manager()
 {
 }
 
 
-
 uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
     throw (uno::RuntimeException)
 {
@@ -59,7 +54,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
 }
 
 
-
 ::rtl::OUString SAL_CALL Manager::getImplementationName(  )
     throw (uno::RuntimeException)
 {
@@ -67,7 +61,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
 }
 
 
-
 sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
     throw (uno::RuntimeException)
 {
@@ -75,7 +68,6 @@ sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
 }
 
 
-
 uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 11e12faf4349..636efb034fee 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -26,12 +26,6 @@
 
 namespace avmedia { namespace quicktime {
 
-/*
-
-// - Player -
-
-*/
-
 class Player : public ::cppu::WeakImplHelper< css::media::XPlayer,
                                               css::lang::XServiceInfo >
 {
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index b5cd5f1e4df1..0c32df1e1444 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -29,16 +29,9 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
 
 namespace avmedia { namespace quicktime {
 
-
-// - Player -
-
-
 Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     mxMgr( rxMgr ),
     mpMovie( nil ),
-    /* GST
-    mbFakeVideo (false ),
-    */
     mnUnmutedVolume( 0 ),
     mnStopTime( DBL_MAX ),  //max double
     mbMuted( false ),
@@ -51,7 +44,6 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
 }
 
 
-
 Player::~Player()
 {
     if( mpMovie )
@@ -69,7 +61,6 @@ QTMovie* Player::getMovie()
 }
 
 
-
 bool Player::create( const ::rtl::OUString& rURL )
 {
     bool    bRet = false;
@@ -109,7 +100,6 @@ bool Player::create( const ::rtl::OUString& rURL )
 }
 
 
-
 void SAL_CALL Player::start(  )
     throw (uno::RuntimeException)
 {
@@ -122,7 +112,6 @@ void SAL_CALL Player::start(  )
 }
 
 
-
 void SAL_CALL Player::stop(  )
     throw (uno::RuntimeException)
 {
@@ -134,7 +123,6 @@ void SAL_CALL Player::stop(  )
 }
 
 
-
 sal_Bool SAL_CALL Player::isPlaying()
     throw (uno::RuntimeException)
 {
@@ -152,7 +140,6 @@ sal_Bool SAL_CALL Player::isPlaying()
 }
 
 
-
 double SAL_CALL Player::getDuration(  )
     throw (uno::RuntimeException)
 {
@@ -169,7 +156,6 @@ double SAL_CALL Player::getDuration(  )
 }
 
 
-
 void SAL_CALL Player::setMediaTime( double fTime )
     throw (uno::RuntimeException)
 {
@@ -182,7 +168,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
 }
 
 
-
 double SAL_CALL Player::getMediaTime(  )
     throw (uno::RuntimeException)
 {
@@ -219,7 +204,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
 }
 
 
-
 sal_Bool SAL_CALL Player::isPlaybackLoop(  )
     throw (uno::RuntimeException)
 {
@@ -232,7 +216,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop(  )
 }
 
 
-
 void SAL_CALL Player::setMute( sal_Bool bSet )
     throw (uno::RuntimeException)
 {
@@ -251,7 +234,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
 }
 
 
-
 sal_Bool SAL_CALL Player::isMute(  )
     throw (uno::RuntimeException)
 {
@@ -261,7 +243,6 @@ sal_Bool SAL_CALL Player::isMute(  )
 }
 
 
-
 void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
     throw (uno::RuntimeException)
 {
@@ -288,7 +269,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
 }
 
 
-
 sal_Int16 SAL_CALL Player::getVolumeDB(  )
     throw (uno::RuntimeException)
 {
@@ -313,7 +293,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB(  )
 }
 
 
-
 awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
     throw (uno::RuntimeException)
 {
@@ -323,7 +302,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
 }
 
 
-
 uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
     throw (uno::RuntimeException)
 {
@@ -348,7 +326,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
 }
 
 
-
 uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
     throw (css::uno::RuntimeException)
 {
@@ -371,7 +348,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
 }
 
 
-
 ::rtl::OUString SAL_CALL Player::getImplementationName(  )
     throw (uno::RuntimeException)
 {
@@ -379,7 +355,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
 }
 
 
-
 sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
     throw (uno::RuntimeException)
 {
@@ -387,7 +362,6 @@ sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
 }
 
 
-
 uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 4268b358c55b..cbcb9ee2faf9 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -28,10 +28,6 @@
 
 namespace avmedia { namespace quicktime {
 
-
-// - Window -
-
-
 class Player;
 
 class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 415af5527b5d..61634bc04b29 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -27,22 +27,17 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace priv {
 
-// - MediaEventListenersImpl -
-
-
 MediaEventListenersImpl::MediaEventListenersImpl( vcl::Window& rEventWindow ) :
     mpNotifyWindow( &rEventWindow )
 {
 }
 
 
-
 MediaEventListenersImpl::~MediaEventListenersImpl()
 {
 }
 
 
-
 void MediaEventListenersImpl::cleanUp()
 {
     Application::RemoveMouseAndKeyEvents( reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ) );
@@ -50,14 +45,12 @@ void MediaEventListenersImpl::cleanUp()
 }
 
 
-
-void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& /* Source */ )
+void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& )
     throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 
-
 void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -77,7 +70,6 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
 }
 
 
-
 void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e )
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -96,7 +88,6 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e
 }
 
 
-
 void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent& e )
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -116,7 +107,6 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent&
     }
 }
 
-// ----------------------------------------------gvd-----------------------
 
 void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent& e )
     throw (css::uno::RuntimeException, std::exception)
@@ -138,8 +128,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent
 }
 
 
-
-void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& )
     throw (css::uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
@@ -151,8 +140,7 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent&
 }
 
 
-
-void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& )
     throw (css::uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
@@ -164,7 +152,6 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent&
 }
 
 
-
 void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent& e )
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -179,7 +166,6 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent&
 }
 
 
-
 void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e )
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -194,20 +180,19 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e
 }
 
 
-
-void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& )
     throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 
-
-void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& /* e */ )
+void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& )
     throw (css::uno::RuntimeException, std::exception)
 {
 }
 
+
 } // namespace priv
-} // namespace avemdia
+} // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index f7c6fe885209..5fd94ee1a6ba 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -39,10 +39,6 @@ using namespace ::com::sun::star;
 
 namespace avmedia {
 
-
-// - MediaWindow -
-
-
 MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) :
     mpImpl( VclPtr<priv::MediaWindowImpl>::Create( parent, this, bInternalMediaControl ) )
 {
@@ -50,154 +46,130 @@ MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) :
 }
 
 
-
 MediaWindow::~MediaWindow()
 {
     mpImpl.disposeAndClear();
 }
 
 
-
 void MediaWindow::setURL( const OUString& rURL, const OUString& rReferer )
 {
     mpImpl->setURL( rURL, OUString(), rReferer );
 }
 
 
-
 const OUString& MediaWindow::getURL() const
 {
     return mpImpl->getURL();
 }
 
 
-
 bool MediaWindow::isValid() const
 {
     return mpImpl->isValid();
 }
 
 
-
-void MediaWindow::MouseMove( const MouseEvent& /* rMEvt */ )
+void MediaWindow::MouseMove( const MouseEvent& )
 {
 }
 
 
-
-void MediaWindow::MouseButtonDown( const MouseEvent& /* rMEvt */ )
+void MediaWindow::MouseButtonDown( const MouseEvent& )
 {
 }
 
 
-
-void MediaWindow::MouseButtonUp( const MouseEvent& /* rMEvt */ )
+void MediaWindow::MouseButtonUp( const MouseEvent& )
 {
 }
 
 
-
-void MediaWindow::KeyInput( const KeyEvent& /* rKEvt */ )
+void MediaWindow::KeyInput( const KeyEvent& )
 {
 }
 
 
-
-void MediaWindow::KeyUp( const KeyEvent& /* rKEvt */ )
+void MediaWindow::KeyUp( const KeyEvent& )
 {
 }
 
-
-
-void MediaWindow::Command( const CommandEvent& /* rCEvt */ )
+void MediaWindow::Command( const CommandEvent& )
 {
 }
 
 
-
-sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
+sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& )
 {
     return 0;
 }
 
 
-
-sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& /* rEvt */ )
+sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& )
 {
     return 0;
 }
 
 
-
-void MediaWindow::StartDrag( sal_Int8 /* nAction */, const Point& /* rPosPixel */ )
+void MediaWindow::StartDrag( sal_Int8, const Point& )
 {
 }
 
 
-
 Size MediaWindow::getPreferredSize() const
 {
     return mpImpl->getPreferredSize();
 }
 
 
-
 void MediaWindow::setPosSize( const Rectangle& rNewRect )
 {
     mpImpl->setPosSize( rNewRect );
 }
 
 
-
 void MediaWindow::setPointer( const Pointer& rPointer )
 {
     mpImpl->setPointer( rPointer );
 }
 
 
-
 bool MediaWindow::start()
 {
     return mpImpl->start();
 }
 
 
-
 void MediaWindow::updateMediaItem( MediaItem& rItem ) const
 {
     mpImpl->updateMediaItem( rItem );
 }
 
 
-
 void MediaWindow::executeMediaItem( const MediaItem& rItem )
 {
     mpImpl->executeMediaItem( rItem );
 }
 
 
-
 void MediaWindow::show()
 {
     mpImpl->Show();
 }
 
 
-
 void MediaWindow::hide()
 {
     mpImpl->Hide();
 }
 
 
-
 vcl::Window* MediaWindow::getWindow() const
 {
     return mpImpl.get();
 }
 
 
-
 void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
 {
     static const char* pFilters[] = { "Advanced Audio Coding", "aac",
@@ -236,8 +208,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
 }
 
 
-
-bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
+bool MediaWindow::executeMediaURLDialog(vcl::Window*,
         OUString& rURL, bool *const o_pbLink)
 {
     ::sfx2::FileDialogHelper        aDlg( (o_pbLink)
@@ -325,7 +296,6 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
 }
 
 
-
 void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
 {
     ScopedVclPtrInstance< MessageDialog > aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) );
@@ -335,7 +305,6 @@ void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
 }
 
 
-
 bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep, Size* pPreferredSizePixel )
 {
     const INetURLObject aURL( rURL );
@@ -391,14 +360,12 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo
 }
 
 
-
 uno::Reference< media::XPlayer > MediaWindow::createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType )
 {
     return priv::MediaWindowImpl::createPlayer( rURL, rReferer, pMimeType );
 }
 
 
-
 uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL,
                                                             const OUString& rReferer,
                                                             const OUString& sMimeType,
@@ -447,17 +414,18 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
     return xRet;
 }
 
+
 BitmapEx MediaWindow::getAudioLogo()
 {
     return BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_AUDIOLOGO));
 }
 
+
 BitmapEx MediaWindow::getEmptyLogo()
 {
     return BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_EMPTYLOGO));
 }
 
-
-} // namespace avemdia
+} // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 4d6305c8ca12..65300406b276 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -49,20 +49,19 @@ using namespace ::com::sun::star;
 namespace avmedia { namespace win {
 
 
-// - FrameGrabber -
-
-
 FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     mxMgr( rxMgr )
 {
     ::CoInitialize( NULL );
 }
 
+
 FrameGrabber::~FrameGrabber()
 {
     ::CoUninitialize();
 }
 
+
 IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const
 {
     IMediaDet* pDet = NULL;
@@ -85,6 +84,7 @@ IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const
     return pDet;
 }
 
+
 bool FrameGrabber::create( const OUString& rURL )
 {
     // just check if a MediaDet interface can be created with the given URL
@@ -102,6 +102,7 @@ bool FrameGrabber::create( const OUString& rURL )
     return !maURL.isEmpty();
 }
 
+
 uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
     throw (uno::RuntimeException)
 {
@@ -198,18 +199,21 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
     return xRet;
 }
 
+
 OUString SAL_CALL FrameGrabber::getImplementationName(  )
     throw (uno::RuntimeException)
 {
     return OUString( AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME );
 }
 
+
 sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
     throw (uno::RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
+
 uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 98dc0cc78d1c..d9845c08cb18 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -28,10 +28,6 @@ struct IMediaDet;
 
 namespace avmedia { namespace win {
 
-
-// - FrameGrabber -
-
-
 class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
                                                     css::lang::XServiceInfo >
 {
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index d33c9c8949bd..a5042d4e49b9 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -30,18 +30,17 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace win {
 
-// - Manager -
-
-
 Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     mxMgr( rxMgr )
 {
 }
 
+
 Manager::~Manager()
 {
 }
 
+
 uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
     throw (uno::RuntimeException)
 {
@@ -55,18 +54,21 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString&
     return xRet;
 }
 
+
 OUString SAL_CALL Manager::getImplementationName(  )
     throw (uno::RuntimeException)
 {
     return OUString( AVMEDIA_WIN_MANAGER_IMPLEMENTATIONNAME );
 }
 
+
 sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
     throw (uno::RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
+
 uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 9f309c750c10..a70861ef22d8 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -25,9 +25,6 @@
 #include "com/sun/star/media/XManager.hpp"
 
 
-// - Manager -
-
-
 namespace avmedia { namespace win {
 
 class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 8bf50f231d45..5bb45e07a1ad 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -85,9 +85,6 @@ bool isWindowsVistaOrHigher()
 }
 
 
-// - Player -
-
-
 Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     Player_BASE(m_aMutex),
     mxMgr( rxMgr ),
@@ -110,6 +107,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     ::CoInitialize( NULL );
 }
 
+
 Player::~Player()
 {
     if( mnFrameWnd )
@@ -118,6 +116,7 @@ Player::~Player()
     ::CoUninitialize();
 }
 
+
 void SAL_CALL Player::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -156,6 +155,7 @@ void SAL_CALL Player::disposing()
         mpGB->Release();
 }
 
+
 bool Player::create( const OUString& rURL )
 {
     HRESULT hR;
@@ -202,11 +202,13 @@ bool Player::create( const OUString& rURL )
     return bRet;
 }
 
+
 const IVideoWindow* Player::getVideoWindow() const
 {
     return mpVW;
 }
 
+
 void Player::setNotifyWnd( HWND nNotifyWnd )
 {
     mbAddWindow = false;
@@ -214,6 +216,7 @@ void Player::setNotifyWnd( HWND nNotifyWnd )
         mpME->SetNotifyWindow( (OAHWND) nNotifyWnd, WM_GRAPHNOTIFY, reinterpret_cast< LONG_PTR>( this ) );
 }
 
+
 long Player::processEvent()
 {
     long nCode;
@@ -241,6 +244,7 @@ long Player::processEvent()
     return 0;
 }
 
+
 void SAL_CALL Player::start(  )
     throw (uno::RuntimeException)
 {
@@ -284,6 +288,7 @@ void SAL_CALL Player::start(  )
     }
 }
 
+
 void SAL_CALL Player::stop(  )
     throw (uno::RuntimeException)
 {
@@ -292,6 +297,7 @@ void SAL_CALL Player::stop(  )
         mpMC->Stop();
 }
 
+
 sal_Bool SAL_CALL Player::isPlaying()
     throw (uno::RuntimeException)
 {
@@ -306,6 +312,7 @@ sal_Bool SAL_CALL Player::isPlaying()
     return bRet;
 }
 
+
 double SAL_CALL Player::getDuration(  )
     throw (uno::RuntimeException)
 {
@@ -319,6 +326,7 @@ double SAL_CALL Player::getDuration(  )
     return aRefTime;
 }
 
+
 void SAL_CALL Player::setMediaTime( double fTime )
     throw (uno::RuntimeException)
 {
@@ -335,6 +343,7 @@ void SAL_CALL Player::setMediaTime( double fTime )
     }
 }
 
+
 double SAL_CALL Player::getMediaTime(  )
     throw (uno::RuntimeException)
 {
@@ -348,6 +357,7 @@ double SAL_CALL Player::getMediaTime(  )
     return aRefTime;
 }
 
+
 void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
     throw (uno::RuntimeException)
 {
@@ -356,6 +366,7 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
     mbLooping = bSet;
 }
 
+
 sal_Bool SAL_CALL Player::isPlaybackLoop(  )
     throw (uno::RuntimeException)
 {
@@ -364,6 +375,7 @@ sal_Bool SAL_CALL Player::isPlaybackLoop(  )
     return mbLooping;
 }
 
+
 void SAL_CALL Player::setMute( sal_Bool bSet )
     throw (uno::RuntimeException)
 {
@@ -376,6 +388,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
     }
 }
 
+
 sal_Bool SAL_CALL Player::isMute(  )
     throw (uno::RuntimeException)
 {
@@ -384,6 +397,7 @@ sal_Bool SAL_CALL Player::isMute(  )
     return mbMuted;
 }
 
+
 void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
     throw (uno::RuntimeException)
 {
@@ -395,6 +409,7 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
         mpBA->put_Volume( mnUnmutedVolume );
 }
 
+
 sal_Int16 SAL_CALL Player::getVolumeDB(  )
     throw (uno::RuntimeException)
 {
@@ -403,6 +418,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB(  )
     return( static_cast< sal_Int16 >( mnUnmutedVolume / 100 ) );
 }
 
+
 awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
     throw (uno::RuntimeException)
 {
@@ -422,6 +438,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
     return aSize;
 }
 
+
 uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
     throw (uno::RuntimeException)
 {
@@ -443,6 +460,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
     return xRet;
 }
 
+
 uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
     throw (uno::RuntimeException)
 {
@@ -461,18 +479,21 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
     return xRet;
 }
 
+
 OUString SAL_CALL Player::getImplementationName(  )
     throw (uno::RuntimeException)
 {
     return OUString( AVMEDIA_WIN_PLAYER_IMPLEMENTATIONNAME );
 }
 
+
 sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
     throw (uno::RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
+
 uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index e7c84012c09b..2923d0ded939 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -46,13 +46,10 @@ struct IDirectDrawSurface;
 
 namespace avmedia { namespace win {
 
-
-// - Player -
-
-
 typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
                                          css::lang::XServiceInfo > Player_BASE;
 
+
 class Player : public cppu::BaseMutex,
                public Player_BASE
 {
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index fa01b19c1ed7..ca44d392ca91 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -34,12 +34,9 @@ struct IVideoWindow;
 
 namespace avmedia { namespace win {
 
-
-// - Window -
-
-
 class Player;
 
+
 class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
                                               css::lang::XServiceInfo >
 {