drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 9 +++----- drawinglayer/source/primitive2d/textprimitive2d.cxx | 6 +---- framework/source/uielement/toolbarmanager.cxx | 3 -- sfx2/source/view/viewfrm.cxx | 5 +--- svgio/source/svgreader/svgclippathnode.cxx | 12 +++++----- svgio/source/svgreader/svgfefloodnode.cxx | 6 ++--- svgio/source/svgreader/svgmasknode.cxx | 12 +++++----- svx/source/engine3d/view3d.cxx | 5 ++-- svx/source/sdr/contact/viewobjectcontact.cxx | 19 ++++++++--------- svx/source/sdr/overlay/overlayobject.cxx | 13 ++++++----- svx/source/sdr/overlay/overlayobjectcell.cxx | 14 ++++++------ svx/source/sdr/overlay/overlaytools.cxx | 12 +++++----- svx/source/svdraw/svddrgmt.cxx | 5 ++-- 13 files changed, 60 insertions(+), 61 deletions(-)
New commits: commit 8c3a651a3f939bbc346ced5547326fe110958cdb Author: Caolán McNamara <[email protected]> AuthorDate: Sat Dec 16 12:29:34 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Dec 16 20:26:16 2023 +0100 cid#1546456 COPY_INSTEAD_OF_MOVE and cid#1546450 COPY_INSTEAD_OF_MOVE cid#1546430 COPY_INSTEAD_OF_MOVE cid#1546401 COPY_INSTEAD_OF_MOVE cid#1546313 COPY_INSTEAD_OF_MOVE cid#1546302 COPY_INSTEAD_OF_MOVE cid#1546301 COPY_INSTEAD_OF_MOVE cid#1546299 COPY_INSTEAD_OF_MOVE cid#1546280 COPY_INSTEAD_OF_MOVE cid#1546233 COPY_INSTEAD_OF_MOVE cid#1546217 COPY_INSTEAD_OF_MOVE cid#1546215 COPY_INSTEAD_OF_MOVE cid#1546204 COPY_INSTEAD_OF_MOVE Change-Id: Iaab419509ad4a0bea9cae3665723af0e99c60ee4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160849 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index fb6a8ed369d2..435408cd5846 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -142,16 +142,15 @@ void SingleLinePrimitive2D::get2DDecomposition( if (getStart() == getEnd()) { // single point - std::vector<basegfx::B2DPoint> aPoints = { getStart() }; - Primitive2DContainer aSequence - = { new PointArrayPrimitive2D(std::move(aPoints), getBColor()) }; + Primitive2DContainer aSequence = { new PointArrayPrimitive2D( + std::vector<basegfx::B2DPoint>{ getStart() }, getBColor()) }; rVisitor.visit(aSequence); } else { // line - basegfx::B2DPolygon aPolygon{ getStart(), getEnd() }; - Primitive2DContainer aSequence = { new PolygonHairlinePrimitive2D(aPolygon, getBColor()) }; + Primitive2DContainer aSequence = { new PolygonHairlinePrimitive2D( + basegfx::B2DPolygon{ getStart(), getEnd() }, getBColor()) }; rVisitor.visit(aSequence); } } diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index f60f73b21045..ee6144df7dd2 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -191,10 +191,8 @@ void TextSimplePortionPrimitive2D::create2DDecomposition( aPolygonTransform.decompose(aScale, aTranslate, fRotate, fShearX); // create outline text effect with current content and replace - Primitive2DReference aNewTextEffect(new TextEffectPrimitive2D( - std::move(aRetval), aTranslate, fRotate, TextEffectStyle2D::Outline)); - - aRetval = Primitive2DContainer{ aNewTextEffect }; + aRetval = Primitive2DContainer{ Primitive2DReference(new TextEffectPrimitive2D( + std::move(aRetval), aTranslate, fRotate, TextEffectStyle2D::Outline)) }; } rContainer.append(std::move(aRetval)); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 51855edd6402..bdc4627c2c8d 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1104,7 +1104,7 @@ void ToolBarManager::CreateControllers() OUString aControlType = static_cast< AddonsParams* >( m_pToolBar->GetItemData( nId ))->aControlType; sal_uInt16 nWidth = static_cast< AddonsParams* >( m_pToolBar->GetItemData( nId ))->nWidth; - Reference< XStatusListener > xStatusListener( + xController.set( ToolBarMerger::CreateController( m_xContext, m_xFrame, m_pToolBar, @@ -1113,7 +1113,6 @@ void ToolBarManager::CreateControllers() nWidth, aControlType ).get(), UNO_QUERY ); - xController = xStatusListener; } else { diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 40ee7bd2f962..203c638728b0 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2959,9 +2959,8 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) //seen in tdf#122598, no parent for subsequent dialog SfxAllItemSet aSet(rPool); - css::uno::Reference< css::frame::XFrame > xFrame = - GetFrame().GetFrameInterface(); - aSet.Put(SfxUnoFrameItem(SID_FILLFRAME, xFrame)); + aSet.Put(SfxUnoFrameItem(SID_FILLFRAME, + GetFrame().GetFrameInterface())); aReq.SetInternalArgs_Impl(aSet); aReq.AppendItem( SfxBoolItem(SID_RECORDMACRO,true) ); diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx index 5941c22da74c..af7ea5cacb05 100644 --- a/svgio/source/svgreader/svgclippathnode.cxx +++ b/svgio/source/svgreader/svgclippathnode.cxx @@ -232,12 +232,12 @@ namespace svgio::svgreader // geometry. Using the automatically set mbIsClipPathContent at // SvgStyleAttributes the clip definition is without fill, stroke, // and strokeWidth and forced to black - drawinglayer::primitive2d::Primitive2DReference xEmbedTransparence( - new drawinglayer::primitive2d::MaskPrimitive2D( - std::move(aClipPolyPolygon), - std::move(rContent))); - - rContent = drawinglayer::primitive2d::Primitive2DContainer { xEmbedTransparence }; + rContent = drawinglayer::primitive2d::Primitive2DContainer { + drawinglayer::primitive2d::Primitive2DReference( + new drawinglayer::primitive2d::MaskPrimitive2D( + std::move(aClipPolyPolygon), + std::move(rContent))) + }; } else { diff --git a/svgio/source/svgreader/svgfefloodnode.cxx b/svgio/source/svgreader/svgfefloodnode.cxx index 89f12c4a4d5d..775bdb3b1cb9 100644 --- a/svgio/source/svgreader/svgfefloodnode.cxx +++ b/svgio/source/svgreader/svgfefloodnode.cxx @@ -138,10 +138,10 @@ void SvgFeFloodNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTar const double fY(maY.solve(*this, NumberType::ycoordinate)); const basegfx::B2DRange aRange(fX, fY, fX + fWidth, fY + fHeight); - basegfx::B2DPolyPolygon aPolygon(basegfx::utils::createPolygonFromRect(aRange)); drawinglayer::primitive2d::Primitive2DReference xRef( - new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(aPolygon, - maFloodColor.getBColor())); + new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( + basegfx::B2DPolyPolygon(basegfx::utils::createPolygonFromRect(aRange)), + maFloodColor.getBColor())); rTarget = drawinglayer::primitive2d::Primitive2DContainer{ xRef }; diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx index 57c95ee01af5..cb7001dddad7 100644 --- a/svgio/source/svgreader/svgmasknode.cxx +++ b/svgio/source/svgreader/svgmasknode.cxx @@ -175,12 +175,12 @@ namespace svgio::svgreader if(getTransform()) { // create embedding group element with transformation - drawinglayer::primitive2d::Primitive2DReference xRef( - new drawinglayer::primitive2d::TransformPrimitive2D( - *getTransform(), - std::move(aNewTarget))); - - aNewTarget = drawinglayer::primitive2d::Primitive2DContainer { xRef }; + aNewTarget = drawinglayer::primitive2d::Primitive2DContainer { + drawinglayer::primitive2d::Primitive2DReference( + new drawinglayer::primitive2d::TransformPrimitive2D( + *getTransform(), + std::move(aNewTarget))) + }; } // append to current target diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 844d96b48727..eac781290624 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -171,8 +171,9 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr // if we have full overlay from selected objects, embed with 50% transparence, the // transformation is added to the OverlayPrimitive2DSequenceObject - drawinglayer::primitive2d::Primitive2DReference aUnifiedTransparencePrimitive2D(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aContent), 0.5)); - aContent = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparencePrimitive2D }; + aContent = drawinglayer::primitive2d::Primitive2DContainer { + drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aContent), 0.5)) + }; std::unique_ptr<sdr::overlay::OverlayPrimitive2DSequenceObject> pNew(new sdr::overlay::OverlayPrimitive2DSequenceObject(std::move(aContent))); diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index acb33fb10484..5d01880d2ef4 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -416,15 +416,16 @@ void ViewObjectContact::createStructureTag(drawinglayer::primitive2d::Primitive2 annotIds = pPDFExtOutDevData->GetScreenAnnotIds(pSdrObj); } - drawinglayer::primitive2d::Primitive2DReference xReference( - new drawinglayer::primitive2d::StructureTagPrimitive2D( - eElement, - bBackground, - bImage, - std::move(rNewPrimitiveSequence), - pAnchorKey, - &annotIds)); - rNewPrimitiveSequence = drawinglayer::primitive2d::Primitive2DContainer { xReference }; + rNewPrimitiveSequence = drawinglayer::primitive2d::Primitive2DContainer { + drawinglayer::primitive2d::Primitive2DReference( + new drawinglayer::primitive2d::StructureTagPrimitive2D( + eElement, + bBackground, + bImage, + std::move(rNewPrimitiveSequence), + pAnchorKey, + &annotIds)) + }; } } } diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 5c1de4627396..2c83a32d6cd1 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -113,12 +113,13 @@ namespace sdr::overlay const basegfx::B2DHomMatrix aTranslateGridOffset( basegfx::utils::createTranslateB2DHomMatrix( getOffset())); - drawinglayer::primitive2d::Primitive2DReference aEmbed( - new drawinglayer::primitive2d::TransformPrimitive2D( - aTranslateGridOffset, - std::move(const_cast<drawinglayer::primitive2d::Primitive2DContainer&>(maPrimitive2DSequence)))); - - const_cast< OverlayObject* >(this)->maPrimitive2DSequence = drawinglayer::primitive2d::Primitive2DContainer { aEmbed }; + const_cast< OverlayObject* >(this)->maPrimitive2DSequence = + drawinglayer::primitive2d::Primitive2DContainer { + drawinglayer::primitive2d::Primitive2DReference( + new drawinglayer::primitive2d::TransformPrimitive2D( + aTranslateGridOffset, + std::move(const_cast<drawinglayer::primitive2d::Primitive2DContainer&>(maPrimitive2DSequence)))) + }; } } diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx index a7da6a299ff5..8dcf71edd8ec 100644 --- a/svx/source/sdr/overlay/overlayobjectcell.cxx +++ b/svx/source/sdr/overlay/overlayobjectcell.cxx @@ -64,13 +64,13 @@ namespace sdr::overlay } - // embed in 50% transparent paint - drawinglayer::primitive2d::Primitive2DReference aUnifiedTransparence( - new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D( - std::move(aRetval), - 0.5)); - - aRetval = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparence }; + aRetval = drawinglayer::primitive2d::Primitive2DContainer { + // embed in 50% transparent paint + drawinglayer::primitive2d::Primitive2DReference( + new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D( + std::move(aRetval), + 0.5)) + }; } return aRetval; diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index 709a3d5e0085..c4afac654567 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -345,12 +345,12 @@ sal_uInt32 OverlayStaticRectanglePrimitive::getPrimitive2DID() const // embed filled to transparency (if used) if(getTransparence() > 0.0) { - Primitive2DReference aFillTransparent( - new UnifiedTransparencePrimitive2D( - std::move(aRetval), - getTransparence())); - - aRetval = Primitive2DContainer { aFillTransparent }; + aRetval = Primitive2DContainer { + Primitive2DReference( + new UnifiedTransparencePrimitive2D( + std::move(aRetval), + getTransparence())) + }; } } else diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index b80014718257..31271af9aef4 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -794,8 +794,9 @@ void SdrDragMethod::CreateOverlayGeometry( if(!aResultTransparent.empty()) { - drawinglayer::primitive2d::Primitive2DReference aUnifiedTransparencePrimitive2D(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aResultTransparent), 0.5)); - aResultTransparent = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparencePrimitive2D }; + aResultTransparent = drawinglayer::primitive2d::Primitive2DContainer { + drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aResultTransparent), 0.5)) + }; std::unique_ptr<sdr::overlay::OverlayObject> pNewOverlayObject( new sdr::overlay::OverlayPrimitive2DSequenceObject(
