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 /basctl/source/basicide/baside2b.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 'basctl/source/basicide/baside2b.cxx')
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 7876a0a1ad49..bc137c171825 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -23,6 +23,7 @@ #include "helpid.hrc" #include <basidesh.hrc> +#include "bitmaps.hlst" #include "baside2.hxx" #include "brkdlg.hxx" @@ -74,9 +75,9 @@ SbxVariable* IsSbxVariable (SbxBase* pBase) return nullptr; } -Image GetImage (unsigned nId) +Image GetImage(const OUString& rId) { - return Image(BitmapEx(IDEResId(nId))); + return Image(BitmapEx(rId)); } int const nScrollLine = 12; @@ -1378,7 +1379,7 @@ void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext) Size const aOutSz = GetOutputSize(); long const nLineHeight = GetTextHeight(); - Image aMarker = GetImage(bErrorMarker ? RID_BMP_ERRORMARKER : RID_BMP_STEPMARKER); + Image aMarker = GetImage(bErrorMarker ? OUStringLiteral(RID_BMP_ERRORMARKER) : OUStringLiteral(RID_BMP_STEPMARKER)); Size aMarkerSz(aMarker.GetSizePixel()); aMarkerSz = rRenderContext.PixelToLogic(aMarkerSz); @@ -1568,7 +1569,7 @@ WatchWindow::WatchWindow (Layout* pParent) aRemoveWatchButton->SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) ); aRemoveWatchButton->SetPosPixel( Point( nTextLen + aXEdit->GetSizePixel().Width() + 4, 2 ) ); aRemoveWatchButton->SetHelpId(HID_BASICIDE_REMOVEWATCH); - aRemoveWatchButton->SetModeImage(Image(BitmapEx(IDEResId(RID_BMP_REMOVEWATCH)))); + aRemoveWatchButton->SetModeImage(Image(BitmapEx(RID_BMP_REMOVEWATCH))); aRemoveWatchButton->SetQuickHelpText(IDEResId(RID_STR_REMOVEWATCHTIP)); Size aSz( aRemoveWatchButton->GetModeImage().GetSizePixel() ); aSz.Width() += 6; |