summaryrefslogtreecommitdiff
path: root/avmedia/source/viewer/mediawindow_impl.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-19 12:02:25 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-04-25 17:02:15 +0200
commitd7559de4f70afdf64dea3bfbf462f5f188da7d05 (patch)
treef27987aec5a5518928a8271af04bd875bb92ef58 /avmedia/source/viewer/mediawindow_impl.cxx
parente68b6e349c31ac1376e90218013e1e7612f2b522 (diff)
remove bitmaps from .src files
and into includeable .hlst files, add them to postprocess/CustomTarget_images.mk to continue only including used bitmaps in icon-theme zips Change-Id: I5c24c3eca93a9c4101bcdcacb0e4b2712133968e Reviewed-on: https://gerrit.libreoffice.org/36941 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia/source/viewer/mediawindow_impl.cxx')
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 518b83eaf119..172e4a3610ab 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -23,6 +23,7 @@
#include "mediawindow_impl.hxx"
#include "mediaevent_impl.hxx"
#include "mediamisc.hxx"
+#include "bitmaps.hlst"
#include "mediawindow.hrc"
#include "helpids.hrc"
@@ -605,14 +606,14 @@ void MediaWindowImpl::Paint(vcl::RenderContext& rRenderContext, const tools::Rec
if (!mxPlayer.is())
{
if (!mpEmptyBmpEx)
- mpEmptyBmpEx = new BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_EMPTYLOGO));
+ mpEmptyBmpEx = new BitmapEx(AVMEDIA_BMP_EMPTYLOGO);
pLogo = mpEmptyBmpEx;
}
else if (!mxPlayerWindow.is())
{
if (!mpAudioBmpEx)
- mpAudioBmpEx = new BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_AUDIOLOGO));
+ mpAudioBmpEx = new BitmapEx(AVMEDIA_BMP_AUDIOLOGO);
pLogo = mpAudioBmpEx;
}