Skip to content

C
core
Kaydet (Commit) 18e20676 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:useuniqueptr in OverlayObjectList 

Change-Id: I641d93e54504c27bcc49bae8edf6286c0a9a471f
Reviewed-on: https://gerrit.libreoffice.org/59024
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 82a7c54a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 99 deletions
chart2/source/controller/main/DragMethod_RotateDiagram.cxx
Dosyayı görüntüle @ 18e20676
......@@ -211,10 +211,10 @@ void DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage
// transform to 2D view coordinates
aPolyPolygon.transform(rVCScene.getObjectTransformation());
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aPolyPolygon);
std::unique_ptr<sdr::overlay::OverlayPolyPolygonStripedAndFilled> pNew(new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aPolyPolygon));
rOverlayManager.add(*pNew);
addToOverlayObjectList(pNew);
addToOverlayObjectList(std::move(pNew));
}
}
} //namespace chart
......
include/svx/sdr/overlay/overlayobjectlist.hxx
Dosyayı görüntüle @ 18e20676
......@@ -23,6 +23,8 @@
#include <svx/sdr/overlay/overlayobject.hxx>
#include <sal/types.h>
#include <svx/svxdllapi.h>
#include <memory>
#include <vector>
class Point;
......@@ -34,7 +36,7 @@ namespace sdr
class SVX_DLLPUBLIC OverlayObjectList final
{
// the vector of OverlayObjects
OverlayObjectVector maVector;
::std::vector< std::unique_ptr<OverlayObject> > maVector;
public:
OverlayObjectList() {}
......@@ -46,7 +48,7 @@ namespace sdr
void clear();
// append objects (takes ownership)
void append(OverlayObject* pOverlayObject);
void append(std::unique_ptr<OverlayObject> pOverlayObject);
// access to objects
sal_uInt32 count() const { return maVector.size(); }
......
include/svx/svddrgmt.hxx
Dosyayı görüntüle @ 18e20676
......@@ -130,7 +130,7 @@ protected:
virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact);
// access for derivated classes to maOverlayObjectList (passes ownership)
void addToOverlayObjectList(sdr::overlay::OverlayObject* pNew) { maOverlayObjectList.append(pNew); }
void addToOverlayObjectList(std::unique_ptr<sdr::overlay::OverlayObject> pNew) { maOverlayObjectList.append(std::move(pNew)); }
// access for derivated classes to mrSdrDragView
SdrDragView& getSdrDragView() { return mrSdrDragView; }
......
sc/source/ui/view/gridwin.cxx
Dosyayı görüntüle @ 18e20676
......@@ -5840,9 +5840,9 @@ void ScGridWindow::UpdateCopySourceOverlay()
tools::Rectangle aLogic = PixelToLogic(aRect, aDrawMode);
::basegfx::B2DRange aRange(aLogic.Left(), aLogic.Top(), aLogic.Right(), aLogic.Bottom());
ScOverlayDashedBorder* pDashedBorder = new ScOverlayDashedBorder(aRange, aHighlight);
std::unique_ptr<ScOverlayDashedBorder> pDashedBorder(new ScOverlayDashedBorder(aRange, aHighlight));
xOverlayManager->add(*pDashedBorder);
mpOOSelectionBorder->append(pDashedBorder);
mpOOSelectionBorder->append(std::move(pDashedBorder));
}
if ( aOldMode != aDrawMode )
......@@ -6052,15 +6052,15 @@ void ScGridWindow::UpdateCursorOverlay()
aRanges.push_back(aRB);
}
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
std::unique_ptr<sdr::overlay::OverlayObject> pOverlay(new sdr::overlay::OverlaySelection(
sdr::overlay::OverlayType::Solid,
aCursorColor,
aRanges,
false);
false));
xOverlayManager->add(*pOverlay);
mpOOCursors.reset(new sdr::overlay::OverlayObjectList);
mpOOCursors->append(pOverlay);
mpOOCursors->append(std::move(pOverlay));
}
}
}
......@@ -6129,15 +6129,15 @@ void ScGridWindow::UpdateSelectionOverlay()
const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
const Color aHighlight(aSvtOptionsDrawinglayer.getHilightColor());
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
std::unique_ptr<sdr::overlay::OverlayObject> pOverlay(new sdr::overlay::OverlaySelection(
sdr::overlay::OverlayType::Transparent,
aHighlight,
aRanges,
true);
true));
xOverlayManager->add(*pOverlay);
mpOOSelection.reset(new sdr::overlay::OverlayObjectList);
mpOOSelection->append(pOverlay);
mpOOSelection->append(std::move(pOverlay));
}
}
else
......@@ -6223,15 +6223,15 @@ void ScGridWindow::UpdateAutoFillOverlay()
aRB.transform(aTransform);
aRanges.push_back(aRB);
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
std::unique_ptr<sdr::overlay::OverlayObject> pOverlay(new sdr::overlay::OverlaySelection(
sdr::overlay::OverlayType::Solid,
aHandleColor,
aRanges,
false);
false));
xOverlayManager->add(*pOverlay);
mpOOAutoFill.reset(new sdr::overlay::OverlayObjectList);
mpOOAutoFill->append(pOverlay);
mpOOAutoFill->append(std::move(pOverlay));
}
if ( aOldMode != aDrawMode )
......@@ -6350,15 +6350,15 @@ void ScGridWindow::UpdateDragRectOverlay()
aRanges.push_back(aRB);
}
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
std::unique_ptr<sdr::overlay::OverlayObject> pOverlay(new sdr::overlay::OverlaySelection(
sdr::overlay::OverlayType::Invert,
COL_BLACK,
aRanges,
false);
false));
xOverlayManager->add(*pOverlay);
mpOODragRect.reset(new sdr::overlay::OverlayObjectList);
mpOODragRect->append(pOverlay);
mpOODragRect->append(std::move(pOverlay));
}
}
......@@ -6396,15 +6396,15 @@ void ScGridWindow::UpdateHeaderOverlay()
aRB.transform(aTransform);
aRanges.push_back(aRB);
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
std::unique_ptr<sdr::overlay::OverlayObject> pOverlay(new sdr::overlay::OverlaySelection(
sdr::overlay::OverlayType::Invert,
COL_BLACK,
aRanges,
false);
false));
xOverlayManager->add(*pOverlay);
mpOOHeader.reset(new sdr::overlay::OverlayObjectList);
mpOOHeader->append(pOverlay);
mpOOHeader->append(std::move(pOverlay));
}
}
......@@ -6463,15 +6463,15 @@ void ScGridWindow::UpdateShrinkOverlay()
aRB.transform(aTransform);
aRanges.push_back(aRB);
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
std::unique_ptr<sdr::overlay::OverlayObject> pOverlay(new sdr::overlay::OverlaySelection(
sdr::overlay::OverlayType::Invert,
COL_BLACK,
aRanges,
false);
false));
xOverlayManager->add(*pOverlay);
mpOOShrink.reset(new sdr::overlay::OverlayObjectList);
mpOOShrink->append(pOverlay);
mpOOShrink->append(std::move(pOverlay));
}
}
......
sc/source/ui/view/tabview3.cxx
Dosyayı görüntüle @ 18e20676
......@@ -784,7 +784,7 @@ void ScTabView::TestHintWindow()
ScOverlayHint* pOverlay = new ScOverlayHint(aTitle, aMessage, aCommentColor, pFrameWin->GetFont());
mxInputHintOO.reset(new sdr::overlay::OverlayObjectList);
mxInputHintOO->append(pOverlay);
mxInputHintOO->append(std::unique_ptr<sdr::overlay::OverlayObject>(pOverlay));
Size aHintWndSize = pOverlay->GetSizePixel();
long nCellSizeX = 0;
......@@ -815,11 +815,11 @@ void ScTabView::TestHintWindow()
//missing portions will be displayed in the other split windows to form an apparent
//single tip, albeit "under" the split lines
Point aOtherPos(pWindow->ScreenToOutputPixel(pWin->OutputToScreenPixel(aHintPos)));
ScOverlayHint* pOtherOverlay = new ScOverlayHint(aTitle, aMessage, aCommentColor, pFrameWin->GetFont());
std::unique_ptr<ScOverlayHint> pOtherOverlay(new ScOverlayHint(aTitle, aMessage, aCommentColor, pFrameWin->GetFont()));
Point aFooPos(pWindow->PixelToLogic(aOtherPos, pWindow->GetDrawMapMode()));
pOtherOverlay->SetPos(aFooPos, pWindow->GetDrawMapMode());
mxInputHintOO->append(pOtherOverlay);
xOverlayManager->add(*pOtherOverlay);
mxInputHintOO->append(std::move(pOtherOverlay));
}
}
}
......
sd/source/ui/animations/motionpathtag.cxx
Dosyayı görüntüle @ 18e20676
......@@ -288,10 +288,10 @@ void SdPathHdl::CreateB2dIAObject()
{
const sdr::contact::ViewContact& rVC = mpPathObj->GetViewContact();
const drawinglayer::primitive2d::Primitive2DContainer aSequence = rVC.getViewIndependentPrimitive2DContainer();
sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
std::unique_ptr<sdr::overlay::OverlayObject> pNew(new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence));
xManager->add(*pNew);
maOverlayGroup.append(pNew);
maOverlayGroup.append(std::move(pNew));
}
}
}
......
sd/source/ui/annotations/annotationtag.cxx
Dosyayı görüntüle @ 18e20676
......@@ -210,22 +210,22 @@ void AnnotationHdl::CreateB2dIAObject()
rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if(rPaintWindow.OutputToWindow() && xManager.is() )
{
sdr::overlay::OverlayObject* pOverlayObject = nullptr;
std::unique_ptr<sdr::overlay::OverlayObject> pOverlayObject;
// animate focused handles
if(bFocused)
{
const sal_uInt64 nBlinkTime = rStyleSettings.GetCursorBlinkTime();
pOverlayObject = new sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBitmapEx, aBitmapEx2, nBlinkTime, 0, 0, 0, 0 );
pOverlayObject.reset(new sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBitmapEx, aBitmapEx2, nBlinkTime, 0, 0, 0, 0 ));
}
else
{
pOverlayObject = new sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 );
pOverlayObject.reset(new sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 ));
}
xManager->add(*pOverlayObject);
maOverlayGroup.append(pOverlayObject);
maOverlayGroup.append(std::move(pOverlayObject));
}
}
}
......
sd/source/ui/view/viewoverlaymanager.cxx
Dosyayı görüntüle @ 18e20676
......@@ -245,11 +245,10 @@ void ImageButtonHdl::CreateB2dIAObject()
rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if(rPaintWindow.OutputToWindow() && xManager.is() )
{
sdr::overlay::OverlayObject* pOverlayObject = nullptr;
pOverlayObject = new sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 );
std::unique_ptr<sdr::overlay::OverlayObject> pOverlayObject(
new sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 ));
xManager->add(*pOverlayObject);
maOverlayGroup.append(pOverlayObject);
maOverlayGroup.append(std::move(pOverlayObject));
}
}
}
......
svx/source/engine3d/dragmt3d.cxx
Dosyayı görüntüle @ 18e20676
......@@ -248,10 +248,10 @@ void E3dDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
if(aResult.count())
{
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aResult);
std::unique_ptr<sdr::overlay::OverlayPolyPolygonStripedAndFilled> pNew(new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aResult));
rOverlayManager.add(*pNew);
addToOverlayObjectList(pNew);
addToOverlayObjectList(std::move(pNew));
}
}
......
svx/source/engine3d/view3d.cxx
Dosyayı görüntüle @ 18e20676
......@@ -200,10 +200,10 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr
drawinglayer::primitive2d::Primitive2DReference aUnifiedTransparencePrimitive2D(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(aContent, 0.5));
aContent = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparencePrimitive2D };
sdr::overlay::OverlayPrimitive2DSequenceObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aContent);
std::unique_ptr<sdr::overlay::OverlayPrimitive2DSequenceObject> pNew(new sdr::overlay::OverlayPrimitive2DSequenceObject(aContent));
xTargetOverlay->add(*pNew);
maObjects.append(pNew);
maObjects.append(std::move(pNew));
}
}
else
......@@ -214,10 +214,10 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr
basegfx::B2DPolyPolygon aPolyPolygon(mpPolygons[b]);
aPolyPolygon.transform(aMatrixTransform);
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aPolyPolygon);
std::unique_ptr<sdr::overlay::OverlayPolyPolygonStripedAndFilled> pNew(new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aPolyPolygon));
xTargetOverlay->add(*pNew);
maObjects.append(pNew);
maObjects.append(std::move(pNew));
}
}
}
......
svx/source/sdr/overlay/overlayobjectlist.cxx
Dosyayı görüntüle @ 18e20676
......@@ -41,27 +41,25 @@ namespace sdr
void OverlayObjectList::clear()
{
for(OverlayObject* pCandidate : maVector)
for(auto & pCandidate : maVector)
{
if(pCandidate->getOverlayManager())
pCandidate->getOverlayManager()->remove(*pCandidate);
delete pCandidate;
}
maVector.clear();
}
void OverlayObjectList::append(OverlayObject* pOverlayObject)
void OverlayObjectList::append(std::unique_ptr<OverlayObject> pOverlayObject)
{
assert(pOverlayObject && "tried to add invalid OverlayObject to OverlayObjectList");
maVector.push_back(pOverlayObject);
maVector.push_back(std::move(pOverlayObject));
}
bool OverlayObjectList::isHitLogic(const basegfx::B2DPoint& rLogicPosition, double fLogicTolerance) const
{
if(!maVector.empty())
{
OverlayObject* pFirst = maVector.front();
OverlayObject* pFirst = maVector.front().get();
OverlayManager* pManager = pFirst->getOverlayManager();
if(pManager)
......@@ -89,7 +87,7 @@ namespace sdr
fLogicTolerance,
false);
for(OverlayObject* pCandidate : maVector)
for(auto & pCandidate : maVector)
{
if(pCandidate->isHittable())
{
......@@ -117,7 +115,7 @@ namespace sdr
sal_uInt32 nDiscreteTolerance = DEFAULT_VALUE_FOR_HITTEST_PIXEL;
if(!maVector.empty())
{
OverlayObject* pCandidate = maVector.front();
OverlayObject* pCandidate = maVector.front().get();
OverlayManager* pManager = pCandidate->getOverlayManager();
if(pManager)
......@@ -137,7 +135,7 @@ namespace sdr
{
basegfx::B2DRange aRetval;
for(OverlayObject* pCandidate : maVector)
for(auto & pCandidate : maVector)
{
aRetval.expand(pCandidate->getBaseRange());
}
......
svx/source/svdraw/svdcrtv.cxx
Dosyayı görüntüle @ 18e20676
......@@ -77,10 +77,10 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
Size aHalfLogicSize(xTargetOverlay->getOutputDevice().PixelToLogic(Size(4 * fScalingFactor, 4 * fScalingFactor)));
// object
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aB2DPolyPolygon);
std::unique_ptr<sdr::overlay::OverlayPolyPolygonStripedAndFilled> pNew(new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aB2DPolyPolygon));
xTargetOverlay->add(*pNew);
maObjects.append(pNew);
maObjects.append(std::move(pNew));
// glue points
for(sal_uInt16 i(0); i < 4; i++)
......@@ -101,10 +101,10 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
basegfx::B2DPolyPolygon aTempPolyPoly;
aTempPolyPoly.append(aTempPoly);
pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aTempPolyPoly);
xTargetOverlay->add(*pNew);
maObjects.append(pNew);
std::unique_ptr<sdr::overlay::OverlayPolyPolygonStripedAndFilled> pNew2(new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aTempPolyPoly));
xTargetOverlay->add(*pNew2);
maObjects.append(std::move(pNew2));
}
}
}
......@@ -145,18 +145,18 @@ void ImpSdrCreateViewExtraData::CreateAndShowOverlay(const SdrCreateView& rView,
{
const sdr::contact::ViewContact& rVC = pObject->GetViewContact();
const drawinglayer::primitive2d::Primitive2DContainer aSequence = rVC.getViewIndependentPrimitive2DContainer();
sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
std::unique_ptr<sdr::overlay::OverlayObject> pNew(new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence));
xOverlayManager->add(*pNew);
maObjects.append(pNew);
maObjects.append(std::move(pNew));
}
if(rPolyPoly.count())
{
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
rPolyPoly);
std::unique_ptr<sdr::overlay::OverlayPolyPolygonStripedAndFilled> pNew(new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
rPolyPoly));
xOverlayManager->add(*pNew);
maObjects.append(pNew);
maObjects.append(std::move(pNew));
}
}
}
......
svx/source/svdraw/svddrgmt.cxx
Dosyayı görüntüle @ 18e20676
......@@ -769,9 +769,9 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
if(!aResult.empty())
{
sdr::overlay::OverlayObject* pNewOverlayObject = new sdr::overlay::OverlayPrimitive2DSequenceObject(aResult);
std::unique_ptr<sdr::overlay::OverlayObject> pNewOverlayObject(new sdr::overlay::OverlayPrimitive2DSequenceObject(aResult));
rOverlayManager.add(*pNewOverlayObject);
addToOverlayObjectList(pNewOverlayObject);
addToOverlayObjectList(std::move(pNewOverlayObject));
}
if(!aResultTransparent.empty())
......@@ -779,9 +779,9 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
drawinglayer::primitive2d::Primitive2DReference aUnifiedTransparencePrimitive2D(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(aResultTransparent, 0.5));
aResultTransparent = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparencePrimitive2D };
sdr::overlay::OverlayObject* pNewOverlayObject = new sdr::overlay::OverlayPrimitive2DSequenceObject(aResultTransparent);
std::unique_ptr<sdr::overlay::OverlayObject> pNewOverlayObject(new sdr::overlay::OverlayPrimitive2DSequenceObject(aResultTransparent));
rOverlayManager.add(*pNewOverlayObject);
addToOverlayObjectList(pNewOverlayObject);
addToOverlayObjectList(std::move(pNewOverlayObject));
}
}
......@@ -793,11 +793,11 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
const basegfx::B2DPoint aTopLeft(aActionRectangle.Left(), aActionRectangle.Top());
const basegfx::B2DPoint aBottomRight(aActionRectangle.Right(), aActionRectangle.Bottom());
sdr::overlay::OverlayRollingRectangleStriped* pNew = new sdr::overlay::OverlayRollingRectangleStriped(
aTopLeft, aBottomRight, true, false);
std::unique_ptr<sdr::overlay::OverlayRollingRectangleStriped> pNew(new sdr::overlay::OverlayRollingRectangleStriped(
aTopLeft, aBottomRight, true, false));
rOverlayManager.add(*pNew);
addToOverlayObjectList(pNew);
addToOverlayObjectList(std::move(pNew));
}
}
......
svx/source/svdraw/svdedxv.cxx
Dosyayı görüntüle @ 18e20676
......@@ -1190,15 +1190,15 @@ bool SdrObjEditView::SdrBeginTextEdit(
rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is())
{
TextEditOverlayObject* pNewTextEditOverlayObject = new TextEditOverlayObject(
std::unique_ptr<TextEditOverlayObject> pNewTextEditOverlayObject(new TextEditOverlayObject(
aHilightColor,
*pTextEditOutlinerView,
bVisualizeSurroundingFrame);
bVisualizeSurroundingFrame));
xManager->add(*pNewTextEditOverlayObject);
xManager->add(const_cast<sdr::overlay::OverlaySelection&>(*pNewTextEditOverlayObject->getOverlaySelection()));
maTEOverlayGroup.append(pNewTextEditOverlayObject);
maTEOverlayGroup.append(std::move(pNewTextEditOverlayObject));
}
}
}
......
svx/source/svdraw/svdhdl.cxx
Dosyayı görüntüle @ 18e20676
This diff is collapsed.
svx/source/svdraw/svdmrkv.cxx
Dosyayı görüntüle @ 18e20676
......@@ -94,10 +94,10 @@ ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx:
if (xTargetOverlay.is())
{
sdr::overlay::OverlayRollingRectangleStriped* pNew = new sdr::overlay::OverlayRollingRectangleStriped(
rStartPos, rStartPos, false);
std::unique_ptr<sdr::overlay::OverlayRollingRectangleStriped> pNew(new sdr::overlay::OverlayRollingRectangleStriped(
rStartPos, rStartPos, false));
xTargetOverlay->add(*pNew);
maObjects.append(pNew);
maObjects.append(std::move(pNew));
}
}
}
......
svx/source/svdraw/svdsnpv.cxx
Dosyayı görüntüle @ 18e20676
......@@ -62,10 +62,10 @@ ImplPageOriginOverlay::ImplPageOriginOverlay(const SdrPaintView& rView, const ba
if (xTargetOverlay.is())
{
sdr::overlay::OverlayCrosshairStriped* aNew = new sdr::overlay::OverlayCrosshairStriped(
maPosition);
std::unique_ptr<sdr::overlay::OverlayCrosshairStriped> aNew(new sdr::overlay::OverlayCrosshairStriped(
maPosition));
xTargetOverlay->add(*aNew);
maObjects.append(aNew);
maObjects.append(std::move(aNew));
}
}
}
......@@ -136,10 +136,10 @@ ImplHelpLineOverlay::ImplHelpLineOverlay(
if (xTargetOverlay.is())
{
sdr::overlay::OverlayHelplineStriped* aNew = new sdr::overlay::OverlayHelplineStriped(
maPosition, meHelpLineKind);
std::unique_ptr<sdr::overlay::OverlayHelplineStriped> aNew(new sdr::overlay::OverlayHelplineStriped(
maPosition, meHelpLineKind));
xTargetOverlay->add(*aNew);
maObjects.append(aNew);
maObjects.append(std::move(aNew));
}
}
}
......
svx/source/svdraw/svdview.cxx
Dosyayı görüntüle @ 18e20676
......@@ -96,11 +96,11 @@ void SdrDropMarkerOverlay::ImplCreateOverlays(
if (xTargetOverlay.is())
{
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
rLinePolyPolygon);
std::unique_ptr<sdr::overlay::OverlayPolyPolygonStripedAndFilled> pNew(new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
rLinePolyPolygon));
xTargetOverlay->add(*pNew);
maObjects.append(pNew);
maObjects.append(std::move(pNew));
}
}
}
......
svx/source/table/tablecontroller.cxx
Dosyayı görüntüle @ 18e20676
......@@ -2190,11 +2190,11 @@ void SvxTableController::updateSelectionOverlay()
rtl::Reference < sdr::overlay::OverlayManager > xOverlayManager = pPaintWindow->GetOverlayManager();
if( xOverlayManager.is() )
{
sdr::overlay::OverlayObjectCell* pOverlay = new sdr::overlay::OverlayObjectCell( aHighlight, aRanges );
std::unique_ptr<sdr::overlay::OverlayObjectCell> pOverlay(new sdr::overlay::OverlayObjectCell( aHighlight, aRanges ));
xOverlayManager->add(*pOverlay);
mpSelectionOverlay.reset(new sdr::overlay::OverlayObjectList);
mpSelectionOverlay->append(pOverlay);
mpSelectionOverlay->append(std::move(pOverlay));
}
}
}
......
svx/source/table/tablehandles.cxx
Dosyayı görüntüle @ 18e20676
......@@ -174,9 +174,9 @@ void TableEdgeHdl::CreateB2dIAObject()
if(aVisible.count())
{
// create overlay object for visible parts
sdr::overlay::OverlayObject* pOverlayObject = new OverlayTableEdge(aVisible, true);
std::unique_ptr<sdr::overlay::OverlayObject> pOverlayObject(new OverlayTableEdge(aVisible, true));
xManager->add(*pOverlayObject);
maOverlayGroup.append(pOverlayObject);
maOverlayGroup.append(std::move(pOverlayObject));
}
if(aInvisible.count())
......@@ -184,9 +184,9 @@ void TableEdgeHdl::CreateB2dIAObject()
// also create overlay object for invisible parts to allow
// a standard HitTest using the primitives from that overlay object
// (see OverlayTableEdge implementation)
sdr::overlay::OverlayObject* pOverlayObject = new OverlayTableEdge(aInvisible, false);
std::unique_ptr<sdr::overlay::OverlayObject> pOverlayObject(new OverlayTableEdge(aInvisible, false));
xManager->add(*pOverlayObject);
maOverlayGroup.append(pOverlayObject);
maOverlayGroup.append(std::move(pOverlayObject));
}
}
}
......@@ -288,12 +288,12 @@ void TableBorderHdl::CreateB2dIAObject()
float fScaleFactor = rOutDev.GetDPIScaleFactor();
double fWidth = fScaleFactor * 6.0;
sdr::overlay::OverlayObject* pOverlayObject =
std::unique_ptr<sdr::overlay::OverlayObject> pOverlayObject(
new sdr::overlay::OverlayRectangle(aRange.getMinimum(), aRange.getMaximum(),
aHilightColor, fTransparence,
fWidth, 0.0, 0.0, bAnimate);
fWidth, 0.0, 0.0, bAnimate));
xManager->add(*pOverlayObject);
maOverlayGroup.append(pOverlayObject);
maOverlayGroup.append(std::move(pOverlayObject));
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment