summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drawinglayer/README.md21
-rw-r--r--drawinglayer/source/tools/converters.cxx119
-rw-r--r--include/drawinglayer/processor2d/processor2dtools.hxx6
-rw-r--r--sc/source/ui/miscdlgs/autofmt.cxx7
-rw-r--r--svx/source/dialog/frmsel.cxx7
-rw-r--r--svx/source/dialog/pagectrl.cxx6
-rw-r--r--svx/source/sdr/contact/objectcontactofobjlistpainter.cxx5
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx5
-rw-r--r--svx/source/sdr/overlay/overlaymanager.cxx39
-rw-r--r--svx/source/svdraw/svdedxv.cxx37
-rw-r--r--svx/source/xoutdev/xtabdash.cxx9
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx13
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx13
-rw-r--r--svx/source/xoutdev/xtablend.cxx9
-rw-r--r--sw/source/core/doc/notxtfrm.cxx10
-rw-r--r--sw/source/core/layout/paintfrm.cxx7
16 files changed, 132 insertions, 181 deletions
diff --git a/drawinglayer/README.md b/drawinglayer/README.md
index 38bdc2197c70..04ebcadf0b17 100644
--- a/drawinglayer/README.md
+++ b/drawinglayer/README.md
@@ -24,18 +24,15 @@ A stripped down version with extended comments:
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(
drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(...));
- if (pProcessor2D)
- {
- // Fill-in the display list.
- drawinglayer::primitive2d::Primitive2DSequence aSequence(2);
-
- aSequence[0] = aHatchPrimitive;
- aSequence[1] = aBlackRectanglePrimitive;
-
- // Render it to the virtual device.
- pProcessor2D->process(aSequence);
- pProcessor2D.reset();
- }
+ // Fill-in the display list.
+ drawinglayer::primitive2d::Primitive2DSequence aSequence(2);
+
+ aSequence[0] = aHatchPrimitive;
+ aSequence[1] = aBlackRectanglePrimitive;
+
+ // Render it to the virtual device.
+ pProcessor2D->process(aSequence);
+ pProcessor2D.reset();
// Obtain the bitmap that was rendered from the virtual device, to re-use
// it in the widget.
diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx
index e1a59d0175df..6a963748161f 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -85,87 +85,84 @@ namespace drawinglayer
*pContent,
rViewInformation2D);
- if(pContentProcessor)
- {
#ifdef DBG_UTIL
- static bool bDoSaveForVisualControl(false); // loplugin:constvars:ignore
+ static bool bDoSaveForVisualControl(false); // loplugin:constvars:ignore
#endif
- // render content
- pContentProcessor->process(aSequence);
+ // render content
+ pContentProcessor->process(aSequence);
- // get content
- pContent->EnableMapMode(false);
- const Bitmap aContent(pContent->GetBitmap(aEmptyPoint, aSizePixel));
+ // get content
+ pContent->EnableMapMode(false);
+ const Bitmap aContent(pContent->GetBitmap(aEmptyPoint, aSizePixel));
#ifdef DBG_UTIL
- if(bDoSaveForVisualControl)
- {
- SvFileStream aNew(
+ if(bDoSaveForVisualControl)
+ {
+ SvFileStream aNew(
#ifdef _WIN32
- "c:\\test_content.png"
+ "c:\\test_content.png"
#else
- "~/test_content.png"
+ "~/test_content.png"
#endif
- , StreamMode::WRITE|StreamMode::TRUNC);
- BitmapEx aContentEx(aContent);
- vcl::PNGWriter aPNGWriter(aContentEx);
- aPNGWriter.Write(aNew);
- }
+ , StreamMode::WRITE|StreamMode::TRUNC);
+ BitmapEx aContentEx(aContent);
+ vcl::PNGWriter aPNGWriter(aContentEx);
+ aPNGWriter.Write(aNew);
+ }
#endif
- // prepare for mask creation
- pContent->SetMapMode(aMapModePixel);
-
- // set alpha to all white (fully transparent)
- pContent->Erase();
-
- // embed primitives to paint them black
- const primitive2d::Primitive2DReference xRef(
- new primitive2d::ModifiedColorPrimitive2D(
- aSequence,
- std::make_shared<basegfx::BColorModifier_replace>(
- basegfx::BColor(0.0, 0.0, 0.0))));
- const primitive2d::Primitive2DContainer xSeq { xRef };
-
- // render
- pContentProcessor->process(xSeq);
- pContentProcessor.reset();
-
- // get alpha channel from vdev
- pContent->EnableMapMode(false);
- const Bitmap aAlpha(pContent->GetBitmap(aEmptyPoint, aSizePixel));
+ // prepare for mask creation
+ pContent->SetMapMode(aMapModePixel);
+
+ // set alpha to all white (fully transparent)
+ pContent->Erase();
+
+ // embed primitives to paint them black
+ const primitive2d::Primitive2DReference xRef(
+ new primitive2d::ModifiedColorPrimitive2D(
+ aSequence,
+ std::make_shared<basegfx::BColorModifier_replace>(
+ basegfx::BColor(0.0, 0.0, 0.0))));
+ const primitive2d::Primitive2DContainer xSeq { xRef };
+
+ // render
+ pContentProcessor->process(xSeq);
+ pContentProcessor.reset();
+
+ // get alpha channel from vdev
+ pContent->EnableMapMode(false);
+ const Bitmap aAlpha(pContent->GetBitmap(aEmptyPoint, aSizePixel));
#ifdef DBG_UTIL
- if(bDoSaveForVisualControl)
- {
- SvFileStream aNew(
+ if(bDoSaveForVisualControl)
+ {
+ SvFileStream aNew(
#ifdef _WIN32
- "c:\\test_alpha.png"
+ "c:\\test_alpha.png"
#else
- "~/test_alpha.png"
+ "~/test_alpha.png"
#endif
- , StreamMode::WRITE|StreamMode::TRUNC);
- BitmapEx aAlphaEx(aAlpha);
- vcl::PNGWriter aPNGWriter(aAlphaEx);
- aPNGWriter.Write(aNew);
- }
+ , StreamMode::WRITE|StreamMode::TRUNC);
+ BitmapEx aAlphaEx(aAlpha);
+ vcl::PNGWriter aPNGWriter(aAlphaEx);
+ aPNGWriter.Write(aNew);
+ }
#endif
- // create BitmapEx result
- aRetval = BitmapEx(aContent, AlphaMask(aAlpha));
+ // create BitmapEx result
+ aRetval = BitmapEx(aContent, AlphaMask(aAlpha));
#ifdef DBG_UTIL
- if(bDoSaveForVisualControl)
- {
- SvFileStream aNew(
+ if(bDoSaveForVisualControl)
+ {
+ SvFileStream aNew(
#ifdef _WIN32
- "c:\\test_combined.png"
+ "c:\\test_combined.png"
#else
- "~/test_combined.png"
-#endif
- , StreamMode::WRITE|StreamMode::TRUNC);
- vcl::PNGWriter aPNGWriter(aRetval);
- aPNGWriter.Write(aNew);
- }
+ "~/test_combined.png"
#endif
+ , StreamMode::WRITE|StreamMode::TRUNC);
+ vcl::PNGWriter aPNGWriter(aRetval);
+ aPNGWriter.Write(aNew);
}
+#endif
}
return aRetval;
diff --git a/include/drawinglayer/processor2d/processor2dtools.hxx b/include/drawinglayer/processor2d/processor2dtools.hxx
index 54e725f3b934..86ad2562e711 100644
--- a/include/drawinglayer/processor2d/processor2dtools.hxx
+++ b/include/drawinglayer/processor2d/processor2dtools.hxx
@@ -39,8 +39,7 @@ namespace drawinglayer::processor2d
The ViewInformation to use
@return
- the created BaseProcessor2D (ownership change) or null if
- something went wrong
+ the created BaseProcessor2D (ownership change)
*/
DRAWINGLAYER_DLLPUBLIC std::unique_ptr<BaseProcessor2D> createPixelProcessor2DFromOutputDevice(
OutputDevice& rTargetOutDev,
@@ -58,8 +57,7 @@ namespace drawinglayer::processor2d
The ViewInformation to use
@return
- the created BaseProcessor2D (ownership change) or null if
- something went wrong
+ the created BaseProcessor2D (ownership change)
*/
DRAWINGLAYER_DLLPUBLIC std::unique_ptr<BaseProcessor2D> createProcessor2DFromOutputDevice(
OutputDevice& rTargetOutDev,
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 34e22845fa3f..23f77ee76cab 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -404,11 +404,8 @@ void ScAutoFmtPreview::PaintCells(vcl::RenderContext& rRenderContext)
rRenderContext,
aNewViewInformation2D));
- if (pProcessor2D)
- {
- pProcessor2D->process(maArray.CreateB2DPrimitiveArray());
- pProcessor2D.reset();
- }
+ pProcessor2D->process(maArray.CreateB2DPrimitiveArray());
+ pProcessor2D.reset();
}
void ScAutoFmtPreview::Init()
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());
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index dd93b15e9aaf..c0b8984e6cf4 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -906,12 +906,10 @@ static bool paintUsingPrimitivesHelper(
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(
drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rOutputDevice, aViewInformation2D) );
- if(pProcessor2D)
- {
- // render and cleanup
- pProcessor2D->process(rSequence);
- return true;
- }
+
+ // render and cleanup
+ pProcessor2D->process(rSequence);
+ return true;
}
}
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index edd2491ad138..01fe03594ba9 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1800,11 +1800,8 @@ bool DrawFillAttributes(
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rOut,
aViewInformation2D) );
- if(pProcessor)
- {
- pProcessor->process(*pPrimitives);
- return true;
- }
+ pProcessor->process(*pPrimitives);
+ return true;
}
}
}
generated by cgit (git 2.34.1) at 2025-02-08 10:13:33 +0000