From ec665e3e898e733c9f602b21046079e569b58568 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 1 Jun 2018 16:37:57 +0200 Subject: use more OutputDevice::GetBitmapEx instead of GetBitmap Change-Id: Ib43cfaf3c91968d623e5a24f44539368da28d36f Reviewed-on: https://gerrit.libreoffice.org/55190 Tested-by: Jenkins Reviewed-by: Noel Grandin --- cui/source/customize/SvxToolbarConfigPage.cxx | 2 +- cui/source/options/optchart.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cui') diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index f61203cab3f2..4e66f814cae7 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -960,7 +960,7 @@ Image SvxToolbarEntriesListBox::GetSizedImage( rVDev.DrawLine( Point( aNewSize.Width()-3, 0 ), Point( aNewSize.Width()-3, aNewSize.Height()-1 )); // Create new image that uses the fillcolor as transparent - return Image(BitmapEx(rVDev.GetBitmap(Point(), aNewSize), aFillColor)); + return Image(BitmapEx(rVDev.GetBitmapEx(Point(), aNewSize).GetBitmap(), aFillColor)); } void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 02676c9d63f7..089b641ea72c 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); - BitmapEx aBitmap(xDevice->GetBitmap(Point(0, 0), xDevice->GetOutputSize())); + BitmapEx aBitmap(xDevice->GetBitmapEx(Point(0, 0), xDevice->GetOutputSize())); nPos = m_pLbChartColors->InsertEntry(rStr, Image(aBitmap), nPos); -- cgit