diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-01-19 09:38:10 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-19 10:02:14 +0000 |
commit | f0421b64cb66709b09ef836129cdf77ccd60243e (patch) | |
tree | dd8bf3273ff5b46bd3e15077e920e1f8fef1cc73 /sc/source/ui/pagedlg | |
parent | f6572fa96c300be282a410d9e11f0cae7049547f (diff) |
sc: load BitmapEx resources instead of Image ones
Change-Id: If10ae4238a580ab6d19287968aecbf29acbd550e
Diffstat (limited to 'sc/source/ui/pagedlg')
-rw-r--r-- | sc/source/ui/pagedlg/pagedlg.hrc | 5 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/pagedlg.src | 17 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tptable.cxx | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc index 67fdbe365f3b..6798b8e2257c 100644 --- a/sc/source/ui/pagedlg/pagedlg.hrc +++ b/sc/source/ui/pagedlg/pagedlg.hrc @@ -18,11 +18,10 @@ */ #include "sc.hrc" - // -> RID_SCPAGE_AREAS // TabPage: Tabelle -#define IMG_LEFTRIGHT (SC_DIALOGS_START + 43 + 23) -#define IMG_TOPDOWN (SC_DIALOGS_START + 43 + 24) +#define BMP_LEFTRIGHT (SC_DIALOGS_START + 43 + 23) +#define BMP_TOPDOWN (SC_DIALOGS_START + 43 + 24) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src index e26d0dbf4498..16972ce51921 100644 --- a/sc/source/ui/pagedlg/pagedlg.src +++ b/sc/source/ui/pagedlg/pagedlg.src @@ -18,13 +18,14 @@ */ #include "pagedlg.hrc" -Image IMG_LEFTRIGHT - { - ImageBitmap = Bitmap { File = "lftrgt.png" ; }; - }; -Image IMG_TOPDOWN - { - ImageBitmap = Bitmap { File = "topdown.png" ; }; - }; +Bitmap BMP_LEFTRIGHT +{ + File = "lftrgt.png"; +}; + +Bitmap BMP_TOPDOWN +{ + File = "topdown.png"; +}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 1ea9e0f8160a..fb1ad78ad644 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -117,7 +117,7 @@ ScTablePage::ScTablePage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : void ScTablePage::ShowImage() { - Image aImg = Image( ScResId( (m_pBtnLeftRight->IsChecked()) ? IMG_LEFTRIGHT : IMG_TOPDOWN ) ); + Image aImg(BitmapEx(ScResId((m_pBtnLeftRight->IsChecked()) ? BMP_LEFTRIGHT : BMP_TOPDOWN))); m_pBmpPageDir->SetImage( aImg ); m_pBmpPageDir->SetOutputSizePixel( aImg.GetSizePixel() ); } |