summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-08-13 16:16:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-08-15 11:27:20 +0200
commit18e20676024baecaf5719139f80f053f5f1e784a (patch)
tree54e7d15b178ee373c0c72e153d9b1a427963d889 /sc
parent82a7c54ad8b9b193e767fcafb5316d3f05e21001 (diff)
loplugin:useuniqueptr in OverlayObjectList
Change-Id: I641d93e54504c27bcc49bae8edf6286c0a9a471f Reviewed-on: https://gerrit.libreoffice.org/59024 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/view/gridwin.cxx40
-rw-r--r--sc/source/ui/view/tabview3.cxx6
2 files changed, 23 insertions, 23 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6106ca423a7f..21ca80104434 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -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));
}
}
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index cdcd17fdea5e..7002d8bebc3f 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -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));
}
}
}