diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/print.cxx | 13 | ||||
| -rw-r--r-- | vcl/source/image/Image.cxx | 3 |
2 files changed, 2 insertions, 14 deletions
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index ebe19e95b327..dd9e6b38eee8 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1820,19 +1820,6 @@ void Printer::SetFontOrientation( ImplFontEntry* const pFontEntry ) const pFontEntry->mnOrientation = pFontEntry->maMetric.mnOrientation; } -void Printer::DrawImage( const Point&, const Image&, DrawImageFlags ) -{ - SAL_WARN ("vcl.gdi", "DrawImage(): Images can't be drawn on any Printer instance"); - assert(false); -} - -void Printer::DrawImage( const Point&, const Size&, const Image&, DrawImageFlags ) -{ - SAL_WARN ("vcl.gdi", "DrawImage(): Images can't be drawn on any Printer instance"); - assert(false); -} - - Bitmap Printer::GetBitmap( const Point& rSrcPt, const Size& rSize ) const { SAL_WARN("vcl.gdi", "GetBitmap(): This should never be called on by a Printer instance"); diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx index bc9c9441bca6..ef132ae4e8c5 100644 --- a/vcl/source/image/Image.cxx +++ b/vcl/source/image/Image.cxx @@ -229,7 +229,8 @@ bool Image::operator==(const Image& rImage) const void Image::Draw(OutputDevice* pOutDev, const Point& rPos, DrawImageFlags nStyle, const Size* pSize) { - if (mpImplData == nullptr || !mpImplData->mpBitmapEx || !pOutDev->IsDeviceOutputNecessary()) + if (mpImplData == nullptr || !mpImplData->mpBitmapEx || + (!pOutDev->IsDeviceOutputNecessary() && pOutDev->GetConnectMetaFile() == nullptr)) return; const Point aSrcPos(0, 0); |