diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-06 15:51:19 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-07 16:43:23 +0100 |
commit | 33b7d62281f1f9aaeaa2f68615e90190fe7b5aaf (patch) | |
tree | 1c0156528fda73b0941982c84a8885f0867e993f /sw/source | |
parent | cf11a0dfca5470baea8429c41021527187a5c32d (diff) |
these casts are no longer necessary
Change-Id: Ife51f47d95e286e0fec165882377c31b1a664241
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163058
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/draw/dcontact.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 9 | ||||
-rw-r--r-- | sw/source/uibase/docvw/OverlayRanges.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/docvw/UnfloatTableButton.cxx | 7 | ||||
-rw-r--r-- | sw/source/uibase/docvw/contentcontrolaliasbutton.cxx | 7 |
5 files changed, 12 insertions, 17 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index fd81d18d427e..67af9dc54b5e 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -2263,7 +2263,7 @@ namespace sdr::contact { // create transform primitive xRetval = drawinglayer::primitive2d::Primitive2DContainer { - drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::TransformPrimitive2D(aOffsetMatrix, std::move(xRetval))) + new drawinglayer::primitive2d::TransformPrimitive2D(aOffsetMatrix, std::move(xRetval)) }; } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index e36c11cad17e..0f9f401bbf54 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2680,10 +2680,9 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) cons { drawinglayer::primitive2d::Primitive2DContainer aSequence; aSequence.append( - drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::SdrFrameBorderPrimitive2D( std::move(aData), - true))); // force visualization to minimal one discrete unit (pixel) + true)); // force visualization to minimal one discrete unit (pixel) // paint mrTabFrame.ProcessPrimitives(aSequence); } @@ -5167,10 +5166,9 @@ namespace drawinglayer::primitive2d if(!aData.empty()) { rContainer.append( - drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::SdrFrameBorderPrimitive2D( std::move(aData), - true))); // force visualization to minimal one discrete unit (pixel) + true)); // force visualization to minimal one discrete unit (pixel) } } @@ -5297,13 +5295,12 @@ void PaintCharacterBorder( drawinglayer::primitive2d::Primitive2DContainer aBorderLineTarget; aBorderLineTarget.append( - drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::SwBorderRectanglePrimitive2D( aBorderTransform, aStyleTop, aStyleRight, aStyleBottom, - aStyleLeft))); + aStyleLeft)); gProp.pBLines->AddBorderLines(std::move(aBorderLineTarget)); } diff --git a/sw/source/uibase/docvw/OverlayRanges.cxx b/sw/source/uibase/docvw/OverlayRanges.cxx index 2b30f9543ebe..3201848bad18 100644 --- a/sw/source/uibase/docvw/OverlayRanges.cxx +++ b/sw/source/uibase/docvw/OverlayRanges.cxx @@ -68,10 +68,10 @@ namespace sw::overlay { const basegfx::BColor aRGBColor(getBaseColor().getBColor()); const basegfx::B2DPolygon aPolygon(basegfx::utils::createPolygonFromRect(maRanges[a])); - aRetval[a] = drawinglayer::primitive2d::Primitive2DReference( + aRetval[a] = new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( basegfx::B2DPolyPolygon(aPolygon), - aRGBColor)); + aRGBColor); } // embed all rectangles in transparent paint const sal_uInt16 nTransparence( SvtOptionsDrawinglayer::GetTransparentSelectionPercent() ); diff --git a/sw/source/uibase/docvw/UnfloatTableButton.cxx b/sw/source/uibase/docvw/UnfloatTableButton.cxx index 4e8449383ecd..c9169102f14e 100644 --- a/sw/source/uibase/docvw/UnfloatTableButton.cxx +++ b/sw/source/uibase/docvw/UnfloatTableButton.cxx @@ -214,10 +214,9 @@ void UnfloatTableButton::PaintButton() aFontSize.getX(), aFontSize.getY(), static_cast<double>(aTextPos.X()), static_cast<double>(aTextPos.Y()))); - aSeq.push_back(drawinglayer::primitive2d::Primitive2DReference( - new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( - aTextMatrix, m_sLabel, 0, m_sLabel.getLength(), std::vector<double>(), {}, - std::move(aFontAttr), css::lang::Locale(), aLineColor))); + aSeq.push_back(new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( + aTextMatrix, m_sLabel, 0, m_sLabel.getLength(), std::vector<double>(), {}, + std::move(aFontAttr), css::lang::Locale(), aLineColor)); // Create the processor and process the primitives const drawinglayer::geometry::ViewInformation2D aNewViewInfos; diff --git a/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx b/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx index 0d11b5c60641..a22deda2d4ee 100644 --- a/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx +++ b/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx @@ -118,10 +118,9 @@ void SwContentControlAliasButton::PaintButton() aFontSize.getX(), aFontSize.getY(), static_cast<double>(aTextPos.X()), static_cast<double>(aTextPos.Y())); - aSeq.push_back(drawinglayer::primitive2d::Primitive2DReference( - new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( - aTextMatrix, m_sLabel, 0, m_sLabel.getLength(), std::vector<double>(), {}, - std::move(aFontAttr), css::lang::Locale(), aLineColor))); + aSeq.push_back(new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( + aTextMatrix, m_sLabel, 0, m_sLabel.getLength(), std::vector<double>(), {}, + std::move(aFontAttr), css::lang::Locale(), aLineColor)); // Create the processor and process the primitives drawinglayer::geometry::ViewInformation2D aViewInfo; |