From 41b8b8c5ede634774851b438a4c823962c14b611 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 18 Jan 2019 11:06:53 +0200 Subject: 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. Change-Id: I4c16fd221f7ec3693e37bacf3fdf7026a8c2e8bc Reviewed-on: https://gerrit.libreoffice.org/66574 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sd/source/ui/animations/SlideTransitionPane.cxx | 4 ++-- sd/source/ui/dlg/inspagob.cxx | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 311d5356f36d..d4f7a597277c 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -1159,10 +1159,10 @@ IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback, Timer *, void) OUString sImageName("sd/cmd/transition-" + pPreset->getSetId() + ".png"); BitmapEx aIcon( sImageName ); if ( aIcon.IsEmpty() ) // need a fallback - aIcon = BitmapEx( "sd/cmd/transition-none.png" ); + sImageName = "sd/cmd/transition-none.png"; mpVS_TRANSITION_ICONS->InsertItem( - nPresetOffset + 1, Image( aIcon ), sLabel, + nPresetOffset + 1, Image( sImageName ), sLabel, VALUESET_APPEND, /* show legend */ true ); m_aNumVariants[ pPreset->getSetId() ] = 1; diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 9f2dcc7ca7d9..a70bdc81dc29 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -82,9 +82,7 @@ void SdInsertPagesObjsDlg::Reset() } else { - BitmapEx aBmpText(BMP_DOC_TEXT); - //to-do, check if this is already transparent and remove intermedia bitmapex if it is - Image aImgText(BitmapEx(aBmpText.GetBitmap(), COL_WHITE)); + Image aImgText(BMP_DOC_TEXT); m_pLbTree->InsertEntry( rName, aImgText, aImgText ); } -- cgit