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> | 2019-09-30 20:27:04 +0200 |
commit | eda88cd2eb4cba8f1a3482a3d1bfda66d29f3aab (patch) | |
tree | e78b76eb2c992ab899cdfabe8b68a9157411c832 /svtools | |
parent | b14830db341ef1a136bf9f5e5ba3c7ea521bea48 (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.
Reviewed-on: https://gerrit.libreoffice.org/64760
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/64860
Tested-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 89161e4d5835b93f0942e960a116a0d3863cc55c)
Change-Id: I3224e11937d720fa484b0d659d25673a9e809267
Reviewed-on: https://gerrit.libreoffice.org/79844
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/foldertree.cxx | 4 | ||||
-rw-r--r-- | svtools/source/misc/imagemgr.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 166302d0860f..9cad8494486b 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1303,7 +1303,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand ,mnSuspendSelectCallback ( 0 ) ,mbIsFirstResort ( true ) ,aIntlWrapper ( Application::GetSettings().GetLanguageTag() ) - ,maFolderImage (BitmapEx(RID_BMP_FOLDER)) + ,maFolderImage (StockImage::Yes, RID_BMP_FOLDER) ,mxCmdEnv ( xEnv ) { diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx index 438b764ac949..423962c02fe4 100644 --- a/svtools/source/contnr/foldertree.cxx +++ b/svtools/source/contnr/foldertree.cxx @@ -21,8 +21,8 @@ FolderTree::FolderTree( vcl::Window* pParent, WinBits nBits ) InteractionHandler::createWithParent(xContext, VCLUnoHelper::GetInterface(GetParentDialog())), UNO_QUERY_THROW ); m_xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() ); - Image aFolderImage(BitmapEx(RID_BMP_FOLDER)); - Image aFolderExpandedImage(BitmapEx(RID_BMP_FOLDER_OPEN)); + Image aFolderImage(StockImage::Yes, RID_BMP_FOLDER); + Image aFolderExpandedImage(StockImage::Yes, RID_BMP_FOLDER_OPEN); SetDefaultCollapsedEntryBmp( aFolderImage ); SetDefaultExpandedEntryBmp( aFolderExpandedImage ); } diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 4978dfda4d49..8ca9d542cc7c 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -690,7 +690,7 @@ static Image GetImageFromList_Impl( SvImageId nImageId, bool bBig ) { OUString sImageName(GetImageNameFromList_Impl(nImageId, bBig)); if (!sImageName.isEmpty()) - return Image(BitmapEx(sImageName)); + return Image(StockImage::Yes, sImageName); return Image(); } |