diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 14:35:31 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 14:42:17 +0200 |
commit | dd28837249088bf6e6ec11ed01a01be6f1774985 (patch) | |
tree | 452a88ea26e395f846df690472147898dd999036 /sd | |
parent | vcl: Image: mark newly added constructor "explicit" (diff) | |
download | core-dd28837249088bf6e6ec11ed01a01be6f1774985.tar.gz core-dd28837249088bf6e6ec11ed01a01be6f1774985.zip |
vcl: mark more Image constructors as "explicit"
Change-Id: If59d7c75c89a102a573738d15d8593cb8ac5c486
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/dlgass.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdpreslt.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPageContainerProviders.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 10 |
10 files changed, 18 insertions, 17 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 8a3fd5e5f3de..5442d31bd0ff 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -151,7 +151,8 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn OUString aText( SD_RESSTR( pInfo->mnStrResId ) ); BitmapEx aBmp( SdResId( pInfo->mnBmpResId ) ); - pValue->InsertItem( static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, aBmp, aText ); + pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, + Image(aBmp), aText); aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() ); aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() ); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 8820b5e7dce3..38d777fa9587 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -609,7 +609,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl) aBmp.Scale( nYRatio, nYRatio ); aBmp.Convert( BMP_CONVERSION_24BIT ); - pImg->SetImage( aBmp ); + pImg->SetImage(Image(aBmp)); } else { diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 76833b4702ec..76179bd37cd4 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1808,7 +1808,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) if ( ! xIconList.hasElements()) break; - aIcon = Graphic(xIconList[0]).GetBitmapEx(); + aIcon = Image(Graphic(xIconList[0]).GetBitmapEx()); } while(false); } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index fc6a5682f9bf..eb7fbd784ec5 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -837,7 +837,7 @@ void SdNavigatorWin::ApplyImageList() { maToolbox.SetImageList( maImageList ); - maToolbox.SetItemImage( TBI_SHAPE_FILTER, BitmapEx( SdResId( BMP_GRAPHIC ) ) ); + maToolbox.SetItemImage(TBI_SHAPE_FILTER, Image(BitmapEx(SdResId(BMP_GRAPHIC)))); SetDragImage(); } diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index ae074a713537..8597412e1b82 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -152,7 +152,7 @@ void SdPresLayoutDlg::FillValueSet() aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)); maLayoutNames.push_back(aLayoutName); - Bitmap aBitmap(mpDocSh->GetPagePreviewBitmap(pMaster, 90)); + Image aBitmap(Bitmap(mpDocSh->GetPagePreviewBitmap(pMaster, 90))); maVS.InsertItem((sal_uInt16)maLayoutNames.size(), aBitmap, aLayoutName); } } @@ -255,7 +255,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)); maLayoutNames.push_back(aLayoutName); - Bitmap aBitmap(pTemplDocSh->GetPagePreviewBitmap(pMaster, 90)); + Image aBitmap(Bitmap(pTemplDocSh->GetPagePreviewBitmap(pMaster, 90))); maVS.InsertItem((sal_uInt16)maLayoutNames.size(), aBitmap, aLayoutName); } } @@ -272,7 +272,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) // empty layout maLayoutNames.push_back(maStrNone); maVS.InsertItem( (sal_uInt16) maLayoutNames.size(), - Bitmap( SdResId( BMP_FOIL_NONE ) ), maStrNone ); + Image(Bitmap(SdResId(BMP_FOIL_NONE))), maStrNone ); } if (!bCancel) diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 4a8576b439cc..f01c00cb7554 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -235,8 +235,8 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) WB_HSCROLL | WB_HASBUTTONSATROOT | WB_QUICK_SEARCH /* i31275 */ ); - SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND ) ), - Bitmap( SdResId( BMP_COLLAPSE ) ) ); + SetNodeBitmaps( Image(Bitmap( SdResId(BMP_EXPAND) )), + Image(Bitmap( SdResId(BMP_COLLAPSE) ))); SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY | diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index ea5ad828ba7d..11138d9c8ea8 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -653,7 +653,7 @@ void LayoutMenu::Fill (void) if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode)) aBmp.Mirror (BMP_MIRROR_HORZ); - InsertItem (i, aBmp, SdResId (pInfo->mnStrResId)); + InsertItem(i, Image(aBmp), SdResId (pInfo->mnStrResId)); SetItemData (i, new AutoLayout(pInfo->maAutoLayout)); n++; } diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index 8d52d1fe2b73..e1d6ee56b31b 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -108,7 +108,7 @@ Image TemplatePreviewProvider::operator() ( (void)pPage; (void)rRenderer; - return ThumbnailView::readThumbnail(msURL); + return Image(ThumbnailView::readThumbnail(msURL)); } diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 87d91d2aca4c..3755352cc3b3 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -337,7 +337,7 @@ void InsertionIndicatorOverlay::Paint ( if ( ! IsVisible()) return; - rDevice.DrawImage(maLocation, maIcon); + rDevice.DrawImage(maLocation, Image(maIcon)); } diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 1b88f8ad06e3..aa40d46e1cbd 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -146,9 +146,9 @@ Image PreviewRenderer::RenderPage ( PaintFrame(); Size aSize (mpPreviewDevice->GetOutputSizePixel()); - aPreview = mpPreviewDevice->GetBitmap ( + aPreview = Image(mpPreviewDevice->GetBitmap ( mpPreviewDevice->PixelToLogic(Point(0,0)), - mpPreviewDevice->PixelToLogic(aSize)); + mpPreviewDevice->PixelToLogic(aSize))); Cleanup(); } @@ -211,9 +211,9 @@ Image PreviewRenderer::RenderSubstitution ( PaintFrame(); const Size aSize (mpPreviewDevice->GetOutputSizePixel()); - aPreview = mpPreviewDevice->GetBitmap ( + aPreview = Image(mpPreviewDevice->GetBitmap( mpPreviewDevice->PixelToLogic(Point(0,0)), - mpPreviewDevice->PixelToLogic(aSize)); + mpPreviewDevice->PixelToLogic(aSize))); } catch (const com::sun::star::uno::Exception&) { @@ -520,7 +520,7 @@ Image PreviewRenderer::ScaleBitmap ( aScaledBitmap.GetBitmap()); // Get the resulting bitmap. - aPreview = mpPreviewDevice->GetBitmap (Point(0,0), aFrameSize); + aPreview = Image(mpPreviewDevice->GetBitmap(Point(0,0), aFrameSize)); } while (false); |