summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-10 15:26:06 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-11 07:00:18 +0000
commitf31d98f63c4ad11897e0a961fb378fdf7989f4d3 (patch)
treed54843c13bef0cd2b9b7a5e234e3df0d2b7f8a6d /avmedia
parent22d0d2455f9aa699fac95c450da725c603333132 (diff)
loplugin:expandablemethods in avmedia..canvas
Change-Id: Ic230f1ef6b1dbe796ac7862a1a7e6a718f9e4e54 Reviewed-on: https://gerrit.libreoffice.org/30753 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/viewer/mediawindow.cxx15
1 files changed, 2 insertions, 13 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index a3d6bc724667..9ae9070190b9 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -394,7 +394,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
if( !aPrefSize.Width && !aPrefSize.Height )
{
- const BitmapEx aBmpEx( getAudioLogo() );
+ const BitmapEx aBmpEx( AVMEDIA_RESID(AVMEDIA_BMP_AUDIOLOGO) );
xGraphic.reset( new Graphic( aBmpEx ) );
}
}
@@ -402,7 +402,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
if( !xRet.is() && !xGraphic.get() )
{
- const BitmapEx aBmpEx( getEmptyLogo() );
+ const BitmapEx aBmpEx( AVMEDIA_RESID(AVMEDIA_BMP_EMPTYLOGO) );
xGraphic.reset( new Graphic( aBmpEx ) );
}
@@ -413,17 +413,6 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
}
-BitmapEx MediaWindow::getAudioLogo()
-{
- return BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_AUDIOLOGO));
-}
-
-
-BitmapEx MediaWindow::getEmptyLogo()
-{
- return BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_EMPTYLOGO));
-}
-
} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */