diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-04 14:48:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-04 20:20:55 +0100 |
| commit | 507c1c9905ce02c376be4e57a937cde8d01d2c26 (patch) | |
| tree | 781de1a3cabfa28b4520460aeeb4c02d5b72562b /avmedia | |
| parent | fa5c7ccff482c23f96def89978377f2d7d41d225 (diff) | |
Resolves: rhbz#1012379 draw audio-placeholder in presentation mode
Change-Id: Ied61f9b4947e1a6eda04c442d95037cc1c7ef460
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 02e5b63258a7..183a9554e129 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -433,7 +433,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL if( !aPrefSize.Width && !aPrefSize.Height ) { - const BitmapEx aBmpEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) ); + const BitmapEx aBmpEx( getAudioLogo() ); apGraphic.reset( new Graphic( aBmpEx ) ); } } @@ -441,7 +441,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL if( !xRet.is() && !apGraphic.get() && bAllowToCreateReplacementGraphic ) { - const BitmapEx aBmpEx( AVMEDIA_RESID( AVMEDIA_BMP_EMPTYLOGO ) ); + const BitmapEx aBmpEx( getEmptyLogo() ); apGraphic.reset( new Graphic( aBmpEx ) ); } @@ -451,6 +451,17 @@ 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 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |