diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-16 12:01:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-16 14:30:43 +0000 |
| commit | 0bb8bcf1f8ea7b0e54eb52dc53b986d0485fa07c (patch) | |
| tree | 7e8e0e93243d0fdbbd1e3094fb93a74df350dd57 /framework | |
| parent | d602f404883f7303a927668dcef32eaf17a01f3f (diff) | |
e*, f*: load BitmapEx resources instead of Image ones
Change-Id: I3383e222829042557a8fd9f575049c47aeddeb09
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/classes/resource.hrc | 4 | ||||
| -rw-r--r-- | framework/source/classes/resource.src | 9 | ||||
| -rw-r--r-- | framework/source/uielement/popuptoolbarcontroller.cxx | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc index f3ad7e64981b..83656e5f31f5 100644 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -53,8 +53,8 @@ #define STR_REMOTE_TITLE (RID_STR_START+26) #define STR_SAFEMODE_TITLE (RID_STR_START+27) -#define IMG_SAVEMODIFIED_SMALL (RID_IMAGE_START+0) -#define IMG_SAVEMODIFIED_LARGE (RID_IMAGE_START+1) +#define BMP_SAVEMODIFIED_SMALL (RID_IMAGE_START+0) +#define BMP_SAVEMODIFIED_LARGE (RID_IMAGE_START+1) #define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION (RID_MENU_START+0) diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index a95149f7ffcf..745e10e5c8c7 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -204,13 +204,14 @@ String STR_LANGSTATUS_HINT Text [ en-US ] = "Text Language. Right-click to set character or paragraph language" ; }; -Image IMG_SAVEMODIFIED_SMALL +Bitmap BMP_SAVEMODIFIED_SMALL { - ImageBitmap = Bitmap{File = "savemodified_small.png";}; + File = "savemodified_small.png"; }; -Image IMG_SAVEMODIFIED_LARGE + +Bitmap BMP_SAVEMODIFIED_LARGE { - ImageBitmap = Bitmap{File = "savemodified_large.png";}; + File = "savemodified_large.png"; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index c4e627d8c5a4..98b6b47b735c 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -515,7 +515,7 @@ void SaveToolbarController::updateImage() } else if ( m_bModified ) { - Image aResImage(eImageType == vcl::ImageType::Size16 ? FwkResId(IMG_SAVEMODIFIED_SMALL) : FwkResId(IMG_SAVEMODIFIED_LARGE)); + Image aResImage(BitmapEx(eImageType == vcl::ImageType::Size16 ? FwkResId(BMP_SAVEMODIFIED_SMALL) : FwkResId(BMP_SAVEMODIFIED_LARGE))); aImage = aResImage; } |