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 /svtools | |
| 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 '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 ad4816518f06..891fd40e7128 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1294,7 +1294,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 b5bf64dcd859..83bf6c6110f9 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(); } |