diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-18 11:44:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-19 09:45:46 +0200 |
| commit | 692c5df18ec1f558abe1a3a658c9881cfb7210a9 (patch) | |
| tree | f9d6d6d6750ffcfa9401660314c0a1d61993766b /sd | |
| parent | 1815aa9472080b9dac263d393b9c922dd16351fe (diff) | |
ImplPlayWithRenderer never checks its OutputDevice against nullptr
just pass a reference instead and spread that around to some similar
cases
Change-Id: Ifb2dee8c7bf02a9f01982b928c90666cbbdd84fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115759
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/html/buttonset.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/presenter/PresenterTextView.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/showwin.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index 8f9ec50423a2..ec35118ceb0b 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -230,7 +230,7 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< OUString >& rButton for( const Graphic& aGraphic : aGraphics ) { - aGraphic.Draw( pDev, aPos ); + aGraphic.Draw(*pDev, aPos); aPos.AdjustX(aGraphic.GetSizePixel().Width() + 3 ); } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 6f3b9f93b97e..6f40fd36b0d3 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -413,7 +413,7 @@ Reference<rendering::XBitmap> const & PresenterTextView::Implementation::GetBitm mpEditEngine->SetText(msText); mpEditEngine->SetPaperSize(maSize); - mpEditEngine->Draw(mpOutputDevice, aWindowBox, Point(0,mnTop)); + mpEditEngine->Draw(*mpOutputDevice, aWindowBox, Point(0,mnTop)); const BitmapEx aBitmap (mpOutputDevice->GetBitmapEx(Point(0,0), maSize)); mxBitmap = cppcanvas::VCLFactory::createBitmap( diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 52597482b5dd..2e961e45e4b2 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -484,9 +484,9 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) std::max( aOutOrg.Y() + aOutSize.Height() - aGrfSize.Height() - aOffset.Height(), aOutOrg.Y() ) ); if( maLogo.IsAnimated() ) - maLogo.StartAnimation( GetOutDev(), aGrfPos, aGrfSize, reinterpret_cast<sal_IntPtr>(this) ); + maLogo.StartAnimation(*GetOutDev(), aGrfPos, aGrfSize, reinterpret_cast<sal_IntPtr>(this)); else - maLogo.Draw( GetOutDev(), aGrfPos, aGrfSize ); + maLogo.Draw(*GetOutDev(), aGrfPos, aGrfSize); } if( SLIDE_NO_TIMEOUT != mnPauseTimeout ) diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 7191b3565cc7..20f75eea71d3 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1133,7 +1133,7 @@ namespace { pOutliner->Clear(); pOutliner->SetText(*mpParaObject); - pOutliner->Draw(&rPrinter, aOutRect); + pOutliner->Draw(rPrinter, aOutRect); PrintMessage( rPrinter, |