diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-19 11:01:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-19 15:13:28 +0000 |
| commit | 0d08b70ec10e3100ae374564c95d74b78508a5a6 (patch) | |
| tree | b4236fb4c6beb749f562715fc156919ad768bd49 /sd | |
| parent | fe9c6fa5a43177f4d77766f29d44784e17f53320 (diff) | |
can use Bitmaps directly here
Change-Id: I75f4148ff864657e747b02d80a120177b469f28a
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsResource.src | 16 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsTheme.cxx | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsResource.src b/sd/source/ui/slidesorter/view/SlsResource.src index 129c15d8df53..a192e557e1a9 100644 --- a/sd/source/ui/slidesorter/view/SlsResource.src +++ b/sd/source/ui/slidesorter/view/SlsResource.src @@ -21,24 +21,24 @@ Resource RID_SLIDESORTER_ICONS { - Image IMAGE_SHADOW + Bitmap IMAGE_SHADOW { - ImageBitmap = Bitmap { File = "slide_sorter_shadow.png" ; }; + File = "slide_sorter_shadow.png"; }; - Image IMAGE_INSERT_SHADOW + Bitmap IMAGE_INSERT_SHADOW { - ImageBitmap = Bitmap { File = "slide_sorter_insert_shadow.png" ; }; + File = "slide_sorter_insert_shadow.png"; }; - Image IMAGE_HIDE_SLIDE_OVERLAY + Bitmap IMAGE_HIDE_SLIDE_OVERLAY { - ImageBitmap = Bitmap { File = "slide_sorter_hide_slide_overlay.png" ; }; + File = "slide_sorter_hide_slide_overlay.png"; }; - Image IMAGE_FOCUS_BORDER + Bitmap IMAGE_FOCUS_BORDER { - ImageBitmap = Bitmap { File = "slide_sorter_focus_border.png" ; }; + File = "slide_sorter_focus_border.png"; }; }; diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 86bf11a0b81d..44ca4cb50497 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -248,7 +248,7 @@ void Theme::InitializeIcon (const IconType eType, sal_uInt16 nResourceId) { if (eType>=0 && size_t(eType)<maIcons.size()) { - const BitmapEx aIcon (Image(SdResId(nResourceId)).GetBitmapEx()); + const BitmapEx aIcon((SdResId(nResourceId))); maIcons[eType] = aIcon; } else |