diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-19 12:02:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-25 17:02:15 +0200 |
| commit | d7559de4f70afdf64dea3bfbf462f5f188da7d05 (patch) | |
| tree | f27987aec5a5518928a8271af04bd875bb92ef58 /vcl/source/window/menubarwindow.cxx | |
| parent | e68b6e349c31ac1376e90218013e1e7612f2b522 (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 'vcl/source/window/menubarwindow.cxx')
| -rw-r--r-- | vcl/source/window/menubarwindow.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index e1f50c0b5632..46c453edb737 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -29,6 +29,7 @@ #include <salmenu.hxx> #include <svdata.hxx> #include <svids.hrc> +#include <bitmaps.hlst> #include <window.h> // document closing button @@ -58,12 +59,8 @@ void DecoToolBox::calcMinSize() ScopedVclPtrInstance<ToolBox> aTbx( GetParent() ); if( GetItemCount() == 0 ) { - ResMgr* pResMgr = ImplGetResMgr(); - - Bitmap aBitmap; - if( pResMgr ) - aBitmap = Bitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) ); - aTbx->InsertItem( IID_DOCUMENTCLOSE, Image( aBitmap ) ); + BitmapEx aBitmap(SV_RESID_BITMAP_CLOSEDOC); + aTbx->InsertItem(IID_DOCUMENTCLOSE, Image(aBitmap)); } else { @@ -132,7 +129,7 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) : if(pResMgr) { - BitmapEx aBitmap(ResId(SV_RESID_BITMAP_CLOSEDOC, *pResMgr)); + BitmapEx aBitmap(SV_RESID_BITMAP_CLOSEDOC); aCloseBtn->maImage = Image(aBitmap); aCloseBtn->SetOutStyle(TOOLBOX_STYLE_FLAT); |