diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-04-28 13:27:58 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-04-28 21:37:43 +0200 |
commit | c33f08ca36084643e6eed20c18f151cf75045c62 (patch) | |
tree | 9f9936e77ae004ced1fc7fde574b8ee4c85a66d1 /svx | |
parent | 9f46ae1ab572b62af01119dcd473f99184e4760c (diff) |
createPixelProcessor2DFromOutputDevice won't return null
nor will createProcessor2DFromOutputDevice
Change-Id: I1e0359ef2f94eeaf2da9a89d9e9dfb615587d3da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114814
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/frmsel.cxx | 7 | ||||
-rw-r--r-- | svx/source/dialog/pagectrl.cxx | 6 | ||||
-rw-r--r-- | svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 5 | ||||
-rw-r--r-- | svx/source/sdr/contact/objectcontactofpageview.cxx | 5 | ||||
-rw-r--r-- | svx/source/sdr/overlay/overlaymanager.cxx | 39 | ||||
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 37 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabdash.cxx | 9 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabgrdt.cxx | 13 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabhtch.cxx | 13 | ||||
-rw-r--r-- | svx/source/xoutdev/xtablend.cxx | 9 |
10 files changed, 55 insertions, 88 deletions
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index c3abf1875481..75e1a066ec63 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -695,11 +695,8 @@ void FrameSelectorImpl::DrawAllFrameBorders() *mpVirDev, aNewViewInformation2D)); - if (pProcessor2D) - { - pProcessor2D->process(maArray.CreateB2DPrimitiveArray()); - pProcessor2D.reset(); - } + pProcessor2D->process(maArray.CreateB2DPrimitiveArray()); + pProcessor2D.reset(); } void FrameSelectorImpl::DrawVirtualDevice() diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index a60d3f23e51d..1fb9d0ae1464 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -363,13 +363,9 @@ void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext, std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor( drawinglayer::processor2d::createProcessor2DFromOutputDevice(rRenderContext, aViewInformation2D)); - if (pProcessor) - { - pProcessor->process(aSequence); - } + pProcessor->process(aSequence); } - void SvxPageWindow::EnableFrameDirection(bool bEnable) { bFrameDirection = bEnable; diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 200b05b9cbc0..608a97ebd698 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -123,10 +123,7 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo) *pTargetDevice, getViewInformation2D())); - if(pProcessor2D) - { - pProcessor2D->process(xPrimitiveSequence); - } + pProcessor2D->process(xPrimitiveSequence); } } diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 3d234b6fdd65..3a3c28b972f8 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -276,10 +276,7 @@ namespace sdr::contact drawinglayer::processor2d::createProcessor2DFromOutputDevice( rTargetOutDev, getViewInformation2D())); - if(pProcessor2D) - { - pProcessor2D->process(xPrimitiveSequence); - } + pProcessor2D->process(xPrimitiveSequence); } // #114359# restore old ClipReghion diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 980015d7ceb9..b3cdf0151792 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -50,39 +50,36 @@ namespace sdr::overlay rDestinationDevice, getCurrentViewInformation2D())); - if(pProcessor) + for(const auto& rpOverlayObject : maOverlayObjects) { - for(const auto& rpOverlayObject : maOverlayObjects) + OSL_ENSURE(rpOverlayObject, "Corrupted OverlayObject List (!)"); + const OverlayObject& rCandidate = *rpOverlayObject; + + if(rCandidate.isVisible()) { - OSL_ENSURE(rpOverlayObject, "Corrupted OverlayObject List (!)"); - const OverlayObject& rCandidate = *rpOverlayObject; + const drawinglayer::primitive2d::Primitive2DContainer& rSequence = rCandidate.getOverlayObjectPrimitive2DSequence(); - if(rCandidate.isVisible()) + if(!rSequence.empty()) { - const drawinglayer::primitive2d::Primitive2DContainer& rSequence = rCandidate.getOverlayObjectPrimitive2DSequence(); - - if(!rSequence.empty()) + if(rRange.overlaps(rCandidate.getBaseRange())) { - if(rRange.overlaps(rCandidate.getBaseRange())) + if(bIsAntiAliasing && rCandidate.allowsAntiAliase()) { - if(bIsAntiAliasing && rCandidate.allowsAntiAliase()) - { - rDestinationDevice.SetAntialiasing(nOriginalAA | AntialiasingFlags::Enable); - } - else - { - rDestinationDevice.SetAntialiasing(nOriginalAA & ~AntialiasingFlags::Enable); - } - - pProcessor->process(rSequence); + rDestinationDevice.SetAntialiasing(nOriginalAA | AntialiasingFlags::Enable); } + else + { + rDestinationDevice.SetAntialiasing(nOriginalAA & ~AntialiasingFlags::Enable); + } + + pProcessor->process(rSequence); } } } - - pProcessor.reset(); } + pProcessor.reset(); + // restore AA settings rDestinationDevice.SetAntialiasing(nOriginalAA); } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index a5071163779c..fa04f309e86d 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -764,27 +764,22 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const tools:: drawinglayer::processor2d::createProcessor2DFromOutputDevice(rTargetDevice, aViewInformation2D)); - if (xProcessor) - { - const bool bMapModeEnabled(rTargetDevice.IsMapModeEnabled()); - const basegfx::B2DRange aRange = vcl::unotools::b2DRectangleFromRectangle(aPixRect); - const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer; - const Color aHilightColor(aSvtOptionsDrawinglayer.getHilightColor()); - const double fTransparence(aSvtOptionsDrawinglayer.GetTransparentSelectionPercent() - * 0.01); - const sal_uInt16 nPixSiz(rOutlView.GetInvalidateMore() - 1); - const drawinglayer::primitive2d::Primitive2DReference xReference( - new drawinglayer::primitive2d::OverlayRectanglePrimitive( - aRange, aHilightColor.getBColor(), fTransparence, - std::max(6, nPixSiz - 2), // grow - 0.0, // shrink - 0.0)); - const drawinglayer::primitive2d::Primitive2DContainer aSequence{ xReference }; - - rTargetDevice.EnableMapMode(false); - xProcessor->process(aSequence); - rTargetDevice.EnableMapMode(bMapModeEnabled); - } + const bool bMapModeEnabled(rTargetDevice.IsMapModeEnabled()); + const basegfx::B2DRange aRange = vcl::unotools::b2DRectangleFromRectangle(aPixRect); + const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer; + const Color aHilightColor(aSvtOptionsDrawinglayer.getHilightColor()); + const double fTransparence(aSvtOptionsDrawinglayer.GetTransparentSelectionPercent() * 0.01); + const sal_uInt16 nPixSiz(rOutlView.GetInvalidateMore() - 1); + const drawinglayer::primitive2d::Primitive2DReference xReference( + new drawinglayer::primitive2d::OverlayRectanglePrimitive( + aRange, aHilightColor.getBColor(), fTransparence, std::max(6, nPixSiz - 2), // grow + 0.0, // shrink + 0.0)); + const drawinglayer::primitive2d::Primitive2DContainer aSequence{ xReference }; + + rTargetDevice.EnableMapMode(false); + xProcessor->process(aSequence); + rTargetDevice.EnableMapMode(bMapModeEnabled); } rOutlView.ShowCursor(/*bGotoCursor=*/true, /*bActivate=*/true); diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index e70e4911b0c2..787a8e9e1b1d 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -161,13 +161,10 @@ BitmapEx XDashList::ImpCreateBitmapForXDash(const XDash* pDash) *pVirtualDevice, aNewViewInformation2D)); - if(pProcessor2D) - { - const drawinglayer::primitive2d::Primitive2DContainer aSequence { aLinePrimitive }; + const drawinglayer::primitive2d::Primitive2DContainer aSequence { aLinePrimitive }; - pProcessor2D->process(aSequence); - pProcessor2D.reset(); - } + pProcessor2D->process(aSequence); + pProcessor2D.reset(); // get result bitmap and scale BitmapEx aRetval(pVirtualDevice->GetBitmapEx(Point(0, 0), pVirtualDevice->GetOutputSizePixel())); diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index b730025c47d0..5010ff2e49bd 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -187,16 +187,13 @@ BitmapEx XGradientList::CreateBitmap( tools::Long nIndex, const Size& rSize ) co *pVirtualDevice, aNewViewInformation2D)); - if(pProcessor2D) - { - drawinglayer::primitive2d::Primitive2DContainer aSequence(2); + drawinglayer::primitive2d::Primitive2DContainer aSequence(2); - aSequence[0] = aGradientPrimitive; - aSequence[1] = aBlackRectanglePrimitive; + aSequence[0] = aGradientPrimitive; + aSequence[1] = aBlackRectanglePrimitive; - pProcessor2D->process(aSequence); - pProcessor2D.reset(); - } + pProcessor2D->process(aSequence); + pProcessor2D.reset(); // get result bitmap and scale aRetval = pVirtualDevice->GetBitmapEx(Point(0, 0), pVirtualDevice->GetOutputSizePixel()); diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 6c2bb3a4e294..19bc8b737887 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -164,15 +164,12 @@ BitmapEx XHatchList::CreateBitmap( tools::Long nIndex, const Size& rSize) const *pVirtualDevice, aNewViewInformation2D)); - if(pProcessor2D) - { - drawinglayer::primitive2d::Primitive2DContainer aSequence(2); + drawinglayer::primitive2d::Primitive2DContainer aSequence(2); - aSequence[0] = aHatchPrimitive; - aSequence[1] = aBlackRectanglePrimitive; - pProcessor2D->process(aSequence); - pProcessor2D.reset(); - } + aSequence[0] = aHatchPrimitive; + aSequence[1] = aBlackRectanglePrimitive; + pProcessor2D->process(aSequence); + pProcessor2D.reset(); // get result bitmap and scale aRetval = pVirtualDevice->GetBitmapEx(Point(0, 0), pVirtualDevice->GetOutputSizePixel()); diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 7c4bca0186c9..39a963373c71 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -148,13 +148,10 @@ BitmapEx XLineEndList::CreateBitmapForUI( tools::Long nIndex ) *pVirtualDevice, aNewViewInformation2D)); - if(pProcessor2D) - { - const drawinglayer::primitive2d::Primitive2DContainer aSequence { aLineStartEndPrimitive }; + const drawinglayer::primitive2d::Primitive2DContainer aSequence { aLineStartEndPrimitive }; - pProcessor2D->process(aSequence); - pProcessor2D.reset(); - } + pProcessor2D->process(aSequence); + pProcessor2D.reset(); // get result bitmap and scale aRetval = pVirtualDevice->GetBitmapEx(Point(0, 0), pVirtualDevice->GetOutputSizePixel()); |