canvas/source/cairo/cairo_devicehelper.cxx | 4 ++--
canvas/source/vcl/canvashelper.cxx | 6 +++---
canvas/source/vcl/canvashelper_texturefill.cxx | 6 +++---
canvas/source/vcl/devicehelper.cxx | 2 +-
canvas/source/vcl/spritedevicehelper.cxx | 2 +-
canvas/source/vcl/spritehelper.cxx | 6 +++---
cui/source/customize/SvxToolbarConfigPage.cxx | 2 +-
cui/source/options/optchart.cxx | 2 +-
drawinglayer/source/primitive2d/controlprimitive2d.cxx | 2 +-
include/vcl/fixed.hxx | 1 -
svtools/source/control/ctrlbox.cxx | 2 +-
svx/source/dialog/frmsel.cxx | 2 +-
svx/source/dialog/svxruler.cxx | 4 +++-
svx/source/tbxctrls/colrctrl.cxx | 2 +-
svx/source/tbxctrls/fontworkgallery.cxx | 2 +-
svx/source/tbxctrls/itemwin.cxx | 2 +-
svx/source/tbxctrls/tbcontrl.cxx | 2 +-
svx/source/unodraw/UnoGraphicExporter.cxx | 2 +-
svx/source/xoutdev/xattrbmp.cxx | 2 +-
svx/source/xoutdev/xtabbtmp.cxx | 2 +-
svx/source/xoutdev/xtabdash.cxx | 2 +-
svx/source/xoutdev/xtabgrdt.cxx | 2 +-
svx/source/xoutdev/xtabhtch.cxx | 2 +-
svx/source/xoutdev/xtablend.cxx | 2 +-
svx/source/xoutdev/xtabptrn.cxx | 2 +-
sw/source/core/frmedt/fecopy.cxx | 2 +-
toolkit/source/awt/vclxdevice.cxx | 4 ++--
vcl/inc/printdlg.hxx | 2 +-
vcl/source/filter/graphicfilter.cxx | 2 +-
vcl/source/gdi/gdimtf.cxx | 4 ++--
vcl/source/gdi/impgraph.cxx | 2 +-
vcl/source/outdev/wallpaper.cxx | 2 +-
vcl/source/window/printdlg.cxx | 6 +++---
33 files changed, 45 insertions(+), 44 deletions(-)
New commits:
commit ec665e3e898e733c9f602b21046079e569b58568
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Fri Jun 1 16:37:57 2018 +0200
use more OutputDevice::GetBitmapEx
instead of GetBitmap
Change-Id: Ib43cfaf3c91968d623e5a24f44539368da28d36f
Reviewed-on: https://gerrit.libreoffice.org/55190
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx
b/canvas/source/cairo/cairo_devicehelper.cxx
index 63c89c5fcb9d..18cf4d60a452 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -241,8 +241,8 @@ namespace cairocanvas
const ::Point aEmptyPoint;
bool bOldMap( mpRefDevice->IsMapModeEnabled() );
mpRefDevice->EnableMapMode( false );
- const ::Bitmap aTempBitmap(mpRefDevice->GetBitmap(aEmptyPoint,
mpRefDevice->GetOutputSizePixel()));
- WriteDIB(aTempBitmap, aStream, false, true);
+ const ::BitmapEx aTempBitmap(mpRefDevice->GetBitmapEx(aEmptyPoint,
mpRefDevice->GetOutputSizePixel()));
+ WriteDIB(aTempBitmap, aStream, false);
mpRefDevice->EnableMapMode( bOldMap );
++nFilePostfixCount;
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index a6661c5d5609..2d4a29e04ace 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -901,7 +901,7 @@ namespace vclcanvas
const Point aEmptyPoint(0,0);
const Size aBmpSize( rOutDev.GetOutputSizePixel() );
- Bitmap aBitmap( rOutDev.GetBitmap(aEmptyPoint, aBmpSize) );
+ BitmapEx aBitmap( rOutDev.GetBitmapEx(aEmptyPoint, aBmpSize) );
aBitmap.Scale( vcl::unotools::sizeFromRealSize2D(newSize),
beFast ? BmpScaleFlag::Default :
BmpScaleFlag::BestQuality );
@@ -927,8 +927,8 @@ namespace vclcanvas
rOutDev.EnableMapMode( false );
rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
- Bitmap aBitmap( rOutDev.GetBitmap(aRect.TopLeft(),
- aRect.GetSize()) );
+ Bitmap aBitmap( rOutDev.GetBitmapEx(aRect.TopLeft(),
+ aRect.GetSize()).GetBitmap() );
Bitmap::ScopedReadAccess pReadAccess( aBitmap );
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx
b/canvas/source/vcl/canvashelper_texturefill.cxx
index c65e73fd660a..c29fa6f3f12d 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -953,8 +953,8 @@ namespace vclcanvas
// output VDev content alpha-blended to
// target position.
const ::Point aEmptyPoint;
- Bitmap aContentBmp(
- pVDev->GetBitmap( aEmptyPoint,
+ BitmapEx aContentBmp(
+ pVDev->GetBitmapEx( aEmptyPoint,
pVDev->GetOutputSizePixel() )
);
sal_uInt8 nCol( static_cast< sal_uInt8 >(
@@ -962,7 +962,7 @@ namespace vclcanvas
AlphaMask aAlpha( pVDev->GetOutputSizePixel(),
&nCol );
- BitmapEx aOutputBmpEx( aContentBmp, aAlpha );
+ BitmapEx aOutputBmpEx( aContentBmp.GetBitmap(),
aAlpha );
rOutDev.DrawBitmapEx( aPolygonDeviceRect.TopLeft(),
aOutputBmpEx );
diff --git a/canvas/source/vcl/devicehelper.cxx
b/canvas/source/vcl/devicehelper.cxx
index b90cbdabb8b7..4f5b2649a122 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -208,7 +208,7 @@ namespace vclcanvas
OutputDevice& rOutDev = mpOutDev->getOutDev();
bool bOldMap( rOutDev.IsMapModeEnabled() );
rOutDev.EnableMapMode( false );
- WriteDIB(rOutDev.GetBitmap(aEmptyPoint,
rOutDev.GetOutputSizePixel()), aStream, false, true);
+ WriteDIB(rOutDev.GetBitmapEx(aEmptyPoint,
rOutDev.GetOutputSizePixel()), aStream, false);
rOutDev.EnableMapMode( bOldMap );
++nFilePostfixCount;
diff --git a/canvas/source/vcl/spritedevicehelper.cxx
b/canvas/source/vcl/spritedevicehelper.cxx
index 021abba778d8..eb9dd0972b98 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -120,7 +120,7 @@ namespace vclcanvas
const ::Point aEmptyPoint;
mpBackBuffer->getOutDev().EnableMapMode( false );
mpBackBuffer->getOutDev().SetAntialiasing(
AntialiasingFlags::EnableB2dDraw );
- WriteDIB(mpBackBuffer->getOutDev().GetBitmap(aEmptyPoint,
mpBackBuffer->getOutDev().GetOutputSizePixel()), aStream, false, true);
+ WriteDIB(mpBackBuffer->getOutDev().GetBitmapEx(aEmptyPoint,
mpBackBuffer->getOutDev().GetOutputSizePixel()), aStream, false);
}
++nFilePostfixCount;
diff --git a/canvas/source/vcl/spritehelper.cxx
b/canvas/source/vcl/spritehelper.cxx
index 9424d4ec54b9..0af108c84306 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -129,7 +129,7 @@ namespace vclcanvas
if( bNeedBitmapUpdate )
{
- Bitmap aBmp( mpBackBuffer->getOutDev().GetBitmap( aEmptyPoint,
+ BitmapEx aBmp( mpBackBuffer->getOutDev().GetBitmapEx(
aEmptyPoint,
aOutputSize
) );
if( isContentFullyOpaque() )
@@ -144,7 +144,7 @@ namespace vclcanvas
{
// sprite content might contain alpha, create
// BmpEx, then.
- Bitmap aMask( mpBackBufferMask->getOutDev().GetBitmap(
aEmptyPoint,
+ BitmapEx aMask( mpBackBufferMask->getOutDev().GetBitmapEx(
aEmptyPoint,
aOutputSize ) );
// bitmasks are much faster than alphamasks on some
platforms
@@ -163,7 +163,7 @@ namespace vclcanvas
// Note: since we retrieved aBmp and aMask
// directly from an OutDev, it's already a
// 'display bitmap' on windows.
- maContent = BitmapEx( aBmp, aMask );
+ maContent = BitmapEx( aBmp.GetBitmap(), aMask.GetBitmap()
);
}
}
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);
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 29ddec7c070b..a6295406d967 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -187,7 +187,7 @@ namespace drawinglayer
xControlView->draw(0, 0);
// get bitmap
- const Bitmap
aContent(aVirtualDevice->GetBitmap(Point(), aSizePixel));
+ const BitmapEx
aContent(aVirtualDevice->GetBitmapEx(Point(), aSizePixel));
// to avoid scaling, use the Bitmap pixel size
as primitive size
const Size
aBitmapSize(aContent.GetSizePixel());
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index d1c361567bcf..10a0263c5d40 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -141,7 +141,6 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
void SetBitmap( const BitmapEx& rBitmap );
- using OutputDevice::GetBitmap;
};
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 5952bc7e4529..9d7911b0552c 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -467,7 +467,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2,
long nDistance,
aVirDev->SetFillColor( aColor2 );
svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y2 ),
basegfx::B2DPoint( aSize.Width(), y2 ), n2, SvxBorderLineStyle::SOLID );
}
- rBmp = aVirDev->GetBitmap( Point(), Size( aSize.Width(), n1+nDist+n2 ) );
+ rBmp = aVirDev->GetBitmapEx( Point(), Size( aSize.Width(), n1+nDist+n2 ) );
}
LineListBox::LineListBox( vcl::Window* pParent, WinBits nWinStyle ) :
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index d18462934d09..2d08e49fb5a7 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -705,7 +705,7 @@ void
FrameSelectorImpl::CopyVirDevToControl(vcl::RenderContext& rRenderContext)
{
if (mbFullRepaint)
DrawVirtualDevice();
- rRenderContext.DrawBitmap(maVirDevPos, mpVirDev->GetBitmap(Point(0, 0),
mpVirDev->GetOutputSizePixel()));
+ rRenderContext.DrawBitmapEx(maVirDevPos, mpVirDev->GetBitmapEx(Point(0,
0), mpVirDev->GetOutputSizePixel()));
}
void FrameSelectorImpl::DrawAllTrackingRects()
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 35efe327c090..40cf9e9ed43f 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3372,9 +3372,11 @@ void SvxRuler::Command( const CommandEvent&
rCommandEvent )
sal_uInt16 nStyle = bRTL ? i|RULER_TAB_RTL : i;
nStyle |= static_cast<sal_uInt16>(bHorz ? WB_HORZ : WB_VERT);
DrawTab(*pDev, aFillColor, aPt, nStyle);
+ BitmapEx aItemBitmapEx(pDev->GetBitmapEx(Point(), aSz));
+ aItemBitmapEx.Replace(COL_WHITE, COL_TRANSPARENT);
aMenu->InsertItem(i + 1,
SvxResId(RID_SVXSTR_RULER_TAB[i]),
- Image(BitmapEx(pDev->GetBitmap(Point(), aSz),
COL_WHITE)));
+ Image(aItemBitmapEx));
aMenu->CheckItem(i + 1, i == mpTabs[mxRulerImpl->nIdx +
TAB_GAP].nStyle);
pDev->SetOutputSize(aSz); // delete device
}
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index c07f74952e0d..34e403b7cf11 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -277,7 +277,7 @@ void SvxColorDockingWindow::FillValueSet()
pVD->DrawLine( Point(), Point( nPtX, nPtY ) );
pVD->DrawLine( Point( 0, nPtY ), Point( nPtX, 0 ) );
- BitmapEx aBmp( pVD->GetBitmap( Point(), aColorSize ) );
+ BitmapEx aBmp( pVD->GetBitmapEx( Point(), aColorSize ) );
aColorSet->InsertItem( sal_uInt16(1), Image(aBmp), SvxResId(
RID_SVXSTR_INVISIBLE ) );
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index 1c2d236d69ad..26d68f321830 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -137,7 +137,7 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16
nThemeId)
pVDev->DrawCheckered(aNull, aSize, nLen, aW, aG);
pVDev->DrawBitmapEx(aNull, aThumb);
- maFavoritesHorizontal.emplace_back(pVDev->GetBitmap(aNull, aSize));
+ maFavoritesHorizontal.emplace_back(pVDev->GetBitmapEx(aNull,
aSize));
}
}
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 1f9f2fd31497..550d916eafea 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -608,7 +608,7 @@ namespace
}
}
- rBitmapEx = pVirtualDevice->GetBitmap(Point(0, 0), rSize);
+ rBitmapEx = pVirtualDevice->GetBitmapEx(Point(0, 0), rSize);
}
}
} // end of anonymous namespace
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index cd6cd4a2e5ad..7842897b42fa 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3350,7 +3350,7 @@ void SvxColorListBox::ShowPreview(const NamedColor
&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()));
SetImageAlign(ImageAlign::Left);
SetModeImage(Image(aBitmap));
SetText(rColor.second);
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 52b7eb7db319..ffb4675e6500 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -705,7 +705,7 @@ bool GraphicExporter::GetGraphic( ExportSettings const &
rSettings, Graphic& aGr
if( pVDev )
{
- aGraphic = pVDev->GetBitmap( Point(),
pVDev->GetOutputSize() );
+ aGraphic = pVDev->GetBitmapEx( Point(),
pVDev->GetOutputSize() );
aGraphic.SetPrefMapMode( aMap );
aGraphic.SetPrefSize( aSize );
}
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index a25c5d41faf4..2e9269857935 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -125,7 +125,7 @@ void XOBitmap::Array2Bitmap()
}
}
- xGraphicObject.reset(new GraphicObject(pVDev->GetBitmap(Point(),
Size(nLines, nLines))));
+ xGraphicObject.reset(new GraphicObject(pVDev->GetBitmapEx(Point(),
Size(nLines, nLines))));
bGraphicDirty = false;
}
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 48e35946b790..5123a0cf72f6 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -96,7 +96,7 @@ BitmapEx XBitmapList::CreateBitmap( long nIndex, const Size&
rSize ) const
}
}
}
- rBitmapEx = pVirtualDevice->GetBitmap(Point(0, 0), rSize);
+ rBitmapEx = pVirtualDevice->GetBitmapEx(Point(0, 0), rSize);
return rBitmapEx;
}
else
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 72687605b11d..2b890ca5b198 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -168,7 +168,7 @@ BitmapEx XDashList::ImpCreateBitmapForXDash(const XDash*
pDash)
}
// get result bitmap and scale
- BitmapEx aRetval(pVirtualDevice->GetBitmap(Point(0, 0),
pVirtualDevice->GetOutputSizePixel()));
+ BitmapEx aRetval(pVirtualDevice->GetBitmapEx(Point(0, 0),
pVirtualDevice->GetOutputSizePixel()));
if(1 != nFactor)
{
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index f9e3f0b0ced9..c9b538920c68 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -200,7 +200,7 @@ BitmapEx XGradientList::CreateBitmap( long nIndex, const
Size& rSize ) const
}
// get result bitmap and scale
- aRetval = pVirtualDevice->GetBitmap(Point(0, 0),
pVirtualDevice->GetOutputSizePixel());
+ aRetval = pVirtualDevice->GetBitmapEx(Point(0, 0),
pVirtualDevice->GetOutputSizePixel());
}
return aRetval;
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 41eda4885fea..fe4e48362a84 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -175,7 +175,7 @@ BitmapEx XHatchList::CreateBitmap( long nIndex, const Size&
rSize) const
}
// get result bitmap and scale
- aRetval = pVirtualDevice->GetBitmap(Point(0, 0),
pVirtualDevice->GetOutputSizePixel());
+ aRetval = pVirtualDevice->GetBitmapEx(Point(0, 0),
pVirtualDevice->GetOutputSizePixel());
}
return aRetval;
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index ccf9aba113eb..e70016af4149 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -157,7 +157,7 @@ BitmapEx XLineEndList::CreateBitmapForUI( long nIndex )
}
// get result bitmap and scale
- aRetval = pVirtualDevice->GetBitmap(Point(0, 0),
pVirtualDevice->GetOutputSizePixel());
+ aRetval = pVirtualDevice->GetBitmapEx(Point(0, 0),
pVirtualDevice->GetOutputSizePixel());
}
return aRetval;
diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx
index 1395fdc12d7d..853fd24a819e 100644
--- a/svx/source/xoutdev/xtabptrn.cxx
+++ b/svx/source/xoutdev/xtabptrn.cxx
@@ -132,7 +132,7 @@ BitmapEx XPatternList::CreateBitmap( long nIndex, const
Size& rSize ) const
}
}
}
- rBitmapEx = pVirtualDevice->GetBitmap(Point(0, 0), rSize);
+ rBitmapEx = pVirtualDevice->GetBitmapEx(Point(0, 0), rSize);
return rBitmapEx;
}
else
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index e814863e8279..b30bd26fffa6 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1241,7 +1241,7 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId
nFormat, Graphic& rGrf )
if( pVirtDev->SetOutputSize( aSz ) )
{
aGrf.Draw( pVirtDev.get(), Point(), aSz );
- rGrf = pVirtDev->GetBitmap( Point(), aSz );
+ rGrf = pVirtDev->GetBitmapEx( Point(), aSz );
}
else
{
diff --git a/toolkit/source/awt/vclxdevice.cxx
b/toolkit/source/awt/vclxdevice.cxx
index b6c3fb7f5c05..5f0cc09cb381 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -194,10 +194,10 @@ css::uno::Reference< css::awt::XBitmap >
VCLXDevice::createBitmap( sal_Int32 nX,
css::uno::Reference< css::awt::XBitmap > xBmp;
if( mpOutputDevice )
{
- Bitmap aBmp = mpOutputDevice->GetBitmap( Point( nX, nY ), Size(
nWidth, nHeight ) );
+ BitmapEx aBmp = mpOutputDevice->GetBitmapEx( Point( nX, nY ), Size(
nWidth, nHeight ) );
VCLXBitmap* pBmp = new VCLXBitmap;
- pBmp->SetBitmap( BitmapEx( aBmp ) );
+ pBmp->SetBitmap( aBmp );
xBmp = pBmp;
}
return xBmp;
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index b16d91cad1f6..e855c123e5d3 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -44,7 +44,7 @@ namespace vcl
Size maPreviewSize;
sal_Int32 mnDPIX;
sal_Int32 mnDPIY;
- Bitmap maPreviewBitmap;
+ BitmapEx maPreviewBitmap;
OUString maReplacementString;
OUString maToolTipString;
bool mbGreyscale;
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index e26dc197c004..b928b83f7695 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2202,7 +2202,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic&
rGraphic, const OUString& r
Graphic aGraphic2=aGraphic;
aGraphic2.Draw(aVirDev.get(),Point(0,0),aSizePixel); // this
changes the MapMode
aVirDev->SetMapMode(MapMode(MapUnit::MapPixel));
- aGraphic=Graphic(aVirDev->GetBitmap(Point(0,0),aSizePixel));
+ aGraphic=Graphic(aVirDev->GetBitmapEx(Point(0,0),aSizePixel));
}
}
if( rOStm.GetError() )
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index aee51fb98b99..afad52d2cc3e 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2812,7 +2812,7 @@ bool GDIMetaFile::CreateThumbnail(BitmapEx& rBitmapEx,
BmpConversion eColorConve
const_cast<GDIMetaFile *>(this)->Play(aVDev.get(), Point(),
aAntialias);
// get paint bitmap
- Bitmap aBitmap( aVDev->GetBitmap( aNullPt, aVDev->GetOutputSizePixel()
) );
+ BitmapEx aBitmap( aVDev->GetBitmapEx( aNullPt,
aVDev->GetOutputSizePixel() ) );
// scale down the image to the desired size - use the input scaler for
the scaling operation
aBitmap.Scale(aDrawSize, nScaleFlag);
@@ -2822,7 +2822,7 @@ bool GDIMetaFile::CreateThumbnail(BitmapEx& rBitmapEx,
BmpConversion eColorConve
if (aSize.Width() && aSize.Height())
aBitmap.Convert(eColorConversion);
- rBitmapEx = BitmapEx(aBitmap);
+ rBitmapEx = aBitmap;
}
return !rBitmapEx.IsEmpty();
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 792e46d27f27..ff59da4a9f0b 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -737,7 +737,7 @@ Bitmap ImpGraphic::ImplGetBitmap(const
GraphicConversionParameters& rParameters)
ImplDraw( aVDev.get(), Point(), aDrawSize );
// use maEx as local buffer for rendered metafile
- const_cast< ImpGraphic* >(this)->maEx = aVDev->GetBitmap(
Point(), aVDev->GetOutputSizePixel() );
+ const_cast< ImpGraphic* >(this)->maEx = aVDev->GetBitmapEx(
Point(), aVDev->GetOutputSizePixel() );
}
}
diff --git a/vcl/source/outdev/wallpaper.cxx b/vcl/source/outdev/wallpaper.cxx
index 71b75c6c9054..105c23447229 100644
--- a/vcl/source/outdev/wallpaper.cxx
+++ b/vcl/source/outdev/wallpaper.cxx
@@ -146,7 +146,7 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY,
aVDev->SetBackground( rWallpaper.GetColor() );
aVDev->SetOutputSizePixel( Size( nBmpWidth, nBmpHeight ) );
aVDev->DrawBitmapEx( Point(), aBmpEx );
- aBmpEx = BitmapEx(aVDev->GetBitmap( Point(),
aVDev->GetOutputSizePixel() ));
+ aBmpEx = aVDev->GetBitmapEx( Point(),
aVDev->GetOutputSizePixel() );
}
bDrawColorBackground = true;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 084763fa934b..f5bf9a09326d 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -165,14 +165,14 @@ void
PrintDialog::PrintPreviewWindow::Paint(vcl::RenderContext& rRenderContext,
}
else
{
- Bitmap aPreviewBitmap(maPreviewBitmap);
+ BitmapEx aPreviewBitmap(maPreviewBitmap);
// This explicit force-to-scale allows us to get the
// mentioned best quality here. Unfortunately this is
// currently not sure when using just ::DrawBitmap with
// a defined size or ::DrawOutDev
aPreviewBitmap.Scale(maPreviewSize, BmpScaleFlag::BestQuality);
- rRenderContext.DrawBitmap(aOffset, aPreviewBitmap);
+ rRenderContext.DrawBitmapEx(aOffset, aPreviewBitmap);
}
tools::Rectangle aFrameRect(aOffset + Point(-1, -1),
Size(maPreviewSize.Width() + 2, maPreviewSize.Height() + 2));
@@ -377,7 +377,7 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap()
SetMapMode(MapMode(MapUnit::MapPixel));
pPrerenderVDev->SetMapMode(MapMode(MapUnit::MapPixel));
- maPreviewBitmap = pPrerenderVDev->GetBitmap(Point(0, 0), aVDevSize);
+ maPreviewBitmap = pPrerenderVDev->GetBitmapEx(Point(0, 0), aVDevSize);
pPrerenderVDev->SetDrawMode( nOldDrawMode );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
