diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-07 10:29:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-08 19:15:09 +0100 |
| commit | 15f0d61206dddee12159b68aeab5c860e3d5aff4 (patch) | |
| tree | 9eee7e6918281ba7e5ffd3e06d74a2fa4fe28de3 /desktop | |
| parent | ceb32911f07b63fda074facba377eeb4d5946cdf (diff) | |
use Image(OUString) instead of Image(Bitmap(OUString))
which benefits LOOL since we can delay creating the image until
we know the dpi setting of the display we are going to write to.
Achieved by
perl -pi -w -e "s/\bImage\s*\(\s*BitmapEx\s*\((\w+)\s*\)\s*\)/Image\(\1\)/g" $( git grep -lw "BitmapEx" )
followed by
git grep -nP '\bImage\s*\(\s*BitmapEx\s*\('
followed by commenting out the BitmapEx(OUString) constructor and seeing
what needed adjusting.
Change-Id: I3224e11937d720fa484b0d659d25673a9e809267
Reviewed-on: https://gerrit.libreoffice.org/64760
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 3e3808c3bbfa..677c8598c799 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -184,10 +184,10 @@ ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) : m_nActive( 0 ), m_nTopIndex( 0 ), m_nActiveHeight( 0 ), - m_aSharedImage(BitmapEx(RID_BMP_SHARED)), - m_aLockedImage(BitmapEx(RID_BMP_LOCKED)), - m_aWarningImage(BitmapEx(RID_BMP_WARNING)), - m_aDefaultImage(BitmapEx(RID_BMP_EXTENSION)), + m_aSharedImage(StockImage::Yes, RID_BMP_SHARED), + m_aLockedImage(StockImage::Yes, RID_BMP_LOCKED), + m_aWarningImage(StockImage::Yes, RID_BMP_WARNING), + m_aDefaultImage(StockImage::Yes, RID_BMP_EXTENSION), m_pScrollBar( nullptr ), m_pManager( nullptr ) { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 347c6e6445fa..243ed17fb4f3 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -588,7 +588,7 @@ UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & d m_enableUpdate( DpResId( RID_DLG_UPDATE_ENABLE ) ), m_dialog(dialog) { - SetNormalStaticImage(Image(BitmapEx(RID_DLG_UPDATE_NORMALALERT))); + SetNormalStaticImage(Image(StockImage::Yes, RID_DLG_UPDATE_NORMALALERT)); } sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const { |