summaryrefslogtreecommitdiff
path: root/avmedia/source/viewer
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-22 21:20:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 03:38:49 +0000
commit0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch)
tree5024cba9f9ea5e3b23ea26025323f6aef39488d0 /avmedia/source/viewer
parentb81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff)
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia/source/viewer')
-rw-r--r--avmedia/source/viewer/mediaevent_impl.cxx28
-rw-r--r--avmedia/source/viewer/mediawindow.cxx60
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx64
3 files changed, 76 insertions, 76 deletions
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index cfe96099c422..966d83a026d0 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -26,22 +26,22 @@
using namespace ::com::sun::star;
namespace avmedia { namespace priv {
-// ---------------------------
+
// - MediaEventListenersImpl -
-// ---------------------------
+
MediaEventListenersImpl::MediaEventListenersImpl( Window& rEventWindow ) :
mpNotifyWindow( &rEventWindow )
{
}
-// ---------------------------------------------------------------------
+
MediaEventListenersImpl::~MediaEventListenersImpl()
{
}
-// ---------------------------------------------------------------------
+
void MediaEventListenersImpl::cleanUp()
{
@@ -49,14 +49,14 @@ void MediaEventListenersImpl::cleanUp()
mpNotifyWindow = NULL;
}
-// ---------------------------------------------------------------------
+
void SAL_CALL MediaEventListenersImpl::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
throw (::com::sun::star::uno::RuntimeException)
{
}
-// ---------------------------------------------------------------------
+
void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::KeyEvent& e )
throw (::com::sun::star::uno::RuntimeException)
@@ -76,7 +76,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::
}
}
-// ---------------------------------------------------------------------
+
void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt::KeyEvent& e )
throw (::com::sun::star::uno::RuntimeException)
@@ -95,7 +95,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt:
}
}
-// ---------------------------------------------------------------------
+
void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt::MouseEvent& e )
throw (::com::sun::star::uno::RuntimeException)
@@ -137,7 +137,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
}
}
-// ---------------------------------------------------------------------
+
void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt::MouseEvent& /* e */ )
throw (::com::sun::star::uno::RuntimeException)
@@ -150,7 +150,7 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt
}
}
-// ---------------------------------------------------------------------
+
void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt::MouseEvent& /* e */ )
throw (::com::sun::star::uno::RuntimeException)
@@ -163,7 +163,7 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt:
}
}
-// ---------------------------------------------------------------------
+
void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt::MouseEvent& e )
throw (::com::sun::star::uno::RuntimeException)
@@ -178,7 +178,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt
}
}
-// ---------------------------------------------------------------------
+
void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::MouseEvent& e )
throw (::com::sun::star::uno::RuntimeException)
@@ -193,14 +193,14 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::
}
}
-// ---------------------------------------------------------------------
+
void SAL_CALL MediaEventListenersImpl::focusGained( const ::com::sun::star::awt::FocusEvent& /* e */ )
throw (::com::sun::star::uno::RuntimeException)
{
}
-// ---------------------------------------------------------------------
+
void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::FocusEvent& /* e */ )
throw (::com::sun::star::uno::RuntimeException)
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 3835bc1e13ba..992bb40a3460 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -41,9 +41,9 @@ using namespace ::com::sun::star;
namespace avmedia {
-// ---------------
+
// - MediaWindow -
-// ---------------
+
MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) :
mpImpl( new priv::MediaWindowImpl( parent, this, bInternalMediaControl ) )
@@ -51,151 +51,151 @@ MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) :
mpImpl->Show();
}
-// -------------------------------------------------------------------------
+
MediaWindow::~MediaWindow() {}
-// -------------------------------------------------------------------------
+
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::MouseButtonDown( const MouseEvent& /* rMEvt */ )
{
}
-// ---------------------------------------------------------------------
+
void MediaWindow::MouseButtonUp( const MouseEvent& /* rMEvt */ )
{
}
-// -------------------------------------------------------------------------
+
void MediaWindow::KeyInput( const KeyEvent& /* rKEvt */ )
{
}
-// -------------------------------------------------------------------------
+
void MediaWindow::KeyUp( const KeyEvent& /* rKEvt */ )
{
}
-// -------------------------------------------------------------------------
+
void MediaWindow::Command( const CommandEvent& /* rCEvt */ )
{
}
-// -------------------------------------------------------------------------
+
sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
{
return 0;
}
-// -------------------------------------------------------------------------
+
sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& /* rEvt */ )
{
return 0;
}
-// -------------------------------------------------------------------------
+
void MediaWindow::StartDrag( sal_Int8 /* nAction */, const Point& /* rPosPixel */ )
{
}
-// -------------------------------------------------------------------------
+
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();
}
-// -------------------------------------------------------------------------
+
Window* MediaWindow::getWindow() const
{
return mpImpl.get();
}
-// -------------------------------------------------------------------------
+
void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
{
@@ -229,7 +229,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
}
}
-// -------------------------------------------------------------------------
+
bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
OUString& rURL, bool *const o_pbLink)
@@ -318,7 +318,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
return !rURL.isEmpty();
}
-// -------------------------------------------------------------------------
+
void MediaWindow::executeFormatErrorBox( Window* pParent )
{
@@ -327,7 +327,7 @@ void MediaWindow::executeFormatErrorBox( Window* pParent )
aErrBox.Execute();
}
-// -------------------------------------------------------------------------
+
bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep, Size* pPreferredSizePixel )
{
@@ -383,14 +383,14 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo
return bRet;
}
-// -------------------------------------------------------------------------
+
uno::Reference< media::XPlayer > MediaWindow::createPlayer( const OUString& rURL, const OUString& rReferer )
{
return priv::MediaWindowImpl::createPlayer( rURL, rReferer );
}
-// -------------------------------------------------------------------------
+
uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL,
const OUString& rReferer,
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 73b4bf4fd80f..43416d3e760a 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -40,22 +40,22 @@ using namespace ::com::sun::star;
namespace avmedia { namespace priv {
-// ----------------------
+
// - MediaWindowControl -
-// ----------------------
+
MediaWindowControl::MediaWindowControl( Window* pParent ) :
MediaControl( pParent, MEDIACONTROLSTYLE_MULTILINE )
{
}
-// ---------------------------------------------------------------------
+
MediaWindowControl::~MediaWindowControl()
{
}
-// ---------------------------------------------------------------------
+
void MediaWindowControl::update()
{
@@ -65,29 +65,29 @@ void MediaWindowControl::update()
setState( aItem );
}
-// ---------------------------------------------------------------------
+
void MediaWindowControl::execute( const MediaItem& rItem )
{
static_cast< MediaWindowImpl* >( GetParent() )->executeMediaItem( rItem );
}
-// --------------------
+
// - MediaChildWindow -
-// --------------------
+
MediaChildWindow::MediaChildWindow( Window* pParent ) :
SystemChildWindow( pParent, WB_CLIPCHILDREN )
{
}
-// ---------------------------------------------------------------------
+
MediaChildWindow::~MediaChildWindow()
{
}
-// ---------------------------------------------------------------------
+
void MediaChildWindow::MouseMove( const MouseEvent& rMEvt )
{
@@ -98,7 +98,7 @@ void MediaChildWindow::MouseMove( const MouseEvent& rMEvt )
GetParent()->MouseMove( aTransformedEvent );
}
-// ---------------------------------------------------------------------
+
void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
@@ -109,7 +109,7 @@ void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
GetParent()->MouseButtonDown( aTransformedEvent );
}
-// ---------------------------------------------------------------------
+
void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
{
@@ -120,7 +120,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
GetParent()->MouseButtonUp( aTransformedEvent );
}
-// ---------------------------------------------------------------------
+
void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
{
@@ -128,7 +128,7 @@ void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
GetParent()->KeyInput( rKEvt );
}
-// ---------------------------------------------------------------------
+
void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
{
@@ -136,7 +136,7 @@ void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
GetParent()->KeyUp( rKEvt );
}
-// ---------------------------------------------------------------------
+
void MediaChildWindow::Command( const CommandEvent& rCEvt )
{
@@ -147,9 +147,9 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt )
GetParent()->Command( aTransformedEvent );
}
-// ----------------------
+
// - MediaWindowImpl -
-// ----------------------
+
MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) :
Control( pParent ),
@@ -173,7 +173,7 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo
}
}
-// ---------------------------------------------------------------------
+
MediaWindowImpl::~MediaWindowImpl()
{
@@ -527,14 +527,14 @@ void MediaWindowImpl::onURLChanged()
}
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::setPosSize( const Rectangle& rRect )
{
SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() );
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::setPointer( const Pointer& rPointer )
{
@@ -559,7 +559,7 @@ void MediaWindowImpl::setPointer( const Pointer& rPointer )
}
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::Resize()
{
@@ -583,7 +583,7 @@ void MediaWindowImpl::Resize()
maChildWindow.SetPosSizePixel( Point( 0, 0 ), aPlayerWindowSize );
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::StateChanged( StateChangedType eType )
{
@@ -612,7 +612,7 @@ void MediaWindowImpl::StateChanged( StateChangedType eType )
}
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::Paint( const Rectangle& )
{
@@ -668,13 +668,13 @@ void MediaWindowImpl::Paint( const Rectangle& )
}
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::GetFocus()
{
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::MouseMove( const MouseEvent& rMEvt )
{
@@ -682,7 +682,7 @@ void MediaWindowImpl::MouseMove( const MouseEvent& rMEvt )
mpMediaWindow->MouseMove( rMEvt );
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::MouseButtonDown( const MouseEvent& rMEvt )
{
@@ -690,7 +690,7 @@ void MediaWindowImpl::MouseButtonDown( const MouseEvent& rMEvt )
mpMediaWindow->MouseButtonDown( rMEvt );
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::MouseButtonUp( const MouseEvent& rMEvt )
{
@@ -698,7 +698,7 @@ void MediaWindowImpl::MouseButtonUp( const MouseEvent& rMEvt )
mpMediaWindow->MouseButtonUp( rMEvt );
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::KeyInput( const KeyEvent& rKEvt )
{
@@ -706,7 +706,7 @@ void MediaWindowImpl::KeyInput( const KeyEvent& rKEvt )
mpMediaWindow->KeyInput( rKEvt );
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::KeyUp( const KeyEvent& rKEvt )
{
@@ -714,7 +714,7 @@ void MediaWindowImpl::KeyUp( const KeyEvent& rKEvt )
mpMediaWindow->KeyUp( rKEvt );
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::Command( const CommandEvent& rCEvt )
{
@@ -722,21 +722,21 @@ void MediaWindowImpl::Command( const CommandEvent& rCEvt )
mpMediaWindow->Command( rCEvt );
}
-// ---------------------------------------------------------------------
+
sal_Int8 MediaWindowImpl::AcceptDrop( const AcceptDropEvent& rEvt )
{
return( mpMediaWindow ? mpMediaWindow->AcceptDrop( rEvt ) : 0 );
}
-// ---------------------------------------------------------------------
+
sal_Int8 MediaWindowImpl::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
return( mpMediaWindow ? mpMediaWindow->ExecuteDrop( rEvt ) : 0 );
}
-// ---------------------------------------------------------------------
+
void MediaWindowImpl::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
{