From 36ad2b13371a24d99dcec16a60b48d895e0228aa Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 31 May 2018 17:00:49 +0200 Subject: drop Image(Bitmap) constructor and convert some more code from Bitmap to BitmapEx Change-Id: Icf3c18608e0bb608408fe69722441cfa19f6b161 Reviewed-on: https://gerrit.libreoffice.org/55160 Tested-by: Jenkins Reviewed-by: Michael Meeks --- cui/source/dialogs/screenshotannotationdlg.cxx | 2 +- cui/source/options/optchart.cxx | 2 +- cui/source/tabpages/tpbitmap.cxx | 2 +- cui/source/tabpages/tpgradnt.cxx | 4 ++-- cui/source/tabpages/tphatch.cxx | 4 ++-- cui/source/tabpages/tppattern.cxx | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index a405266f3748..d0fa722fe0d5 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -543,7 +543,7 @@ void ScreenshotAnnotationDlg_Impl::RepaintPictureElement() // also set image to get repaints right, but trigger no repaint mpPicture->SetImage( Image( - mpVirtualBufferDevice->GetBitmap( + mpVirtualBufferDevice->GetBitmapEx( Point(0, 0), mpVirtualBufferDevice->GetOutputSizePixel()))); mpPicture->Validate(); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index feba29eb1a7e..d9c92433c006 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -47,7 +47,7 @@ void SvxDefaultColorOptPage::InsertColorEntry(const XColorEntry& rEntry, sal_Int xDevice->SetFillColor(rColor); xDevice->SetLineColor(rStyleSettings.GetDisableColor()); xDevice->DrawRect(aRect); - Bitmap aBitmap(xDevice->GetBitmap(Point(0, 0), xDevice->GetOutputSize())); + BitmapEx aBitmap(xDevice->GetBitmap(Point(0, 0), xDevice->GetOutputSize())); nPos = m_pLbChartColors->InsertEntry(rStr, Image(aBitmap), nPos); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 52ca43fb6892..24136082515e 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -794,7 +794,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void) m_pBitmapList->Insert(o3tl::make_unique(aGraphic, aName), nCount); sal_Int32 nId = m_pBitmapLB->GetItemId( nCount - 1 ); - Bitmap aBitmap = m_pBitmapList->GetBitmapForPreview( nCount, m_pBitmapLB->GetIconSize() ); + BitmapEx aBitmap = m_pBitmapList->GetBitmapForPreview( nCount, m_pBitmapLB->GetIconSize() ); m_pBitmapLB->InsertItem( nId + 1, Image(aBitmap), aName ); m_pBitmapLB->SelectItem( nId + 1 ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 0a91b2c02f0c..96b0063b81c7 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -411,7 +411,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) m_pGradientList->Insert(o3tl::make_unique(aXGradient, aName), nCount); sal_Int32 nId = m_pGradientLB->GetItemId(nCount - 1); //calculate the last ID - Bitmap aBitmap = m_pGradientList->GetBitmapForPreview( nCount, m_pGradientLB->GetIconSize() ); + BitmapEx aBitmap = m_pGradientList->GetBitmapForPreview( nCount, m_pGradientLB->GetIconSize() ); m_pGradientLB->InsertItem( nId + 1, Image(aBitmap), aName ); m_pGradientLB->SelectItem( nId + 1 ); m_pGradientLB->Resize(); @@ -449,7 +449,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) m_pGradientList->Replace(o3tl::make_unique(aXGradient, aName), nPos); - Bitmap aBitmap = m_pGradientList->GetBitmapForPreview( static_cast(nPos), m_pGradientLB->GetIconSize() ); + BitmapEx aBitmap = m_pGradientList->GetBitmapForPreview( static_cast(nPos), m_pGradientLB->GetIconSize() ); m_pGradientLB->RemoveItem( nId ); m_pGradientLB->InsertItem( nId, Image(aBitmap), aName, static_cast(nPos) ); m_pGradientLB->SelectItem( nId ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 9f7985e3d9e5..16e45e307db7 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -474,7 +474,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) m_pHatchingList->Insert(o3tl::make_unique(aXHatch, aName), nCount); sal_Int32 nId = m_pHatchLB->GetItemId(nCount - 1); // calculate the last ID - Bitmap aBitmap = m_pHatchingList->GetBitmapForPreview( nCount, m_pHatchLB->GetIconSize() ); + BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( nCount, m_pHatchLB->GetIconSize() ); // Insert the new entry at the next ID m_pHatchLB->InsertItem( nId + 1, Image(aBitmap), aName ); m_pHatchLB->SelectItem( nId + 1 ); @@ -502,7 +502,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) m_pHatchingList->Replace(o3tl::make_unique(aXHatch, aName), nPos); - Bitmap aBitmap = m_pHatchingList->GetBitmapForPreview( static_cast(nPos), m_pHatchLB->GetIconSize() ); + BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( static_cast(nPos), m_pHatchLB->GetIconSize() ); m_pHatchLB->RemoveItem( nId ); m_pHatchLB->InsertItem( nId, Image(aBitmap), aName, static_cast(nPos) ); m_pHatchLB->SelectItem( nId ); diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 4768d0189a49..52ad7eb3762c 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -404,7 +404,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) { m_pPatternList->Insert(std::move(pEntry), nCount); sal_Int32 nId = m_pPatternLB->GetItemId( nCount - 1 ); - Bitmap aBitmap = m_pPatternList->GetBitmapForPreview( nCount, m_pPatternLB->GetIconSize() ); + BitmapEx aBitmap = m_pPatternList->GetBitmapForPreview( nCount, m_pPatternLB->GetIconSize() ); m_pPatternLB->InsertItem( nId + 1, Image(aBitmap), aName ); m_pPatternLB->SelectItem( nId + 1 ); m_pPatternLB->Resize(); @@ -441,7 +441,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl, Button*, void) // #i123497# Need to replace the existing entry with a new one (old returned needs to be deleted) m_pPatternList->Replace(o3tl::make_unique(Graphic(aBitmapEx), aName), nPos); - Bitmap aBitmap = m_pPatternList->GetBitmapForPreview( static_cast( nPos ), m_pPatternLB->GetIconSize() ); + BitmapEx aBitmap = m_pPatternList->GetBitmapForPreview( static_cast( nPos ), m_pPatternLB->GetIconSize() ); m_pPatternLB->RemoveItem(nId); m_pPatternLB->InsertItem( nId, Image(aBitmap), aName, static_cast(nPos) ); m_pPatternLB->SelectItem( nId ); -- cgit v1.2.3