summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2017-01-23 09:01:42 +0100
committerJochen Nitschke <j.nitschke+logerrit@ok.de>2017-01-23 13:50:45 +0000
commitabc8057ab1a1189ff7f88d42b13b363ceb228d16 (patch)
tree20145fa90c9a1bf91dea3489d384fe6d28ac2ec0 /svx/source
parent5f1bc19a9a0dbdf88e11ef81cc8c2f302748632c (diff)
pass ownership by pointer
to show the intend of the code. assert on invalid objects. remove useless OSL_ENSURE. make sure list of owning pointers can't be copied. Change-Id: I3cccf8ea87585ec9fe62921203a4d12e617ce15c Reviewed-on: https://gerrit.libreoffice.org/33393 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/engine3d/dragmt3d.cxx2
-rw-r--r--svx/source/engine3d/view3d.cxx4
-rw-r--r--svx/source/sdr/overlay/overlayobjectlist.cxx8
-rw-r--r--svx/source/svdraw/svdcrtv.cxx8
-rw-r--r--svx/source/svdraw/svddrgmt.cxx6
-rw-r--r--svx/source/svdraw/svdhdl.cxx24
-rw-r--r--svx/source/svdraw/svdmrkv.cxx2
-rw-r--r--svx/source/svdraw/svdsnpv.cxx4
-rw-r--r--svx/source/svdraw/svdview.cxx2
-rw-r--r--svx/source/table/tablecontroller.cxx2
-rw-r--r--svx/source/table/tablehandles.cxx6
11 files changed, 36 insertions, 32 deletions
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index eb4d6c2d2a4d..fef392fe38af 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -246,7 +246,7 @@ void E3dDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aResult);
rOverlayManager.add(*pNew);
- addToOverlayObjectList(*pNew);
+ addToOverlayObjectList(pNew);
}
}
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index b60bf78c8dc3..7b78e622ebf3 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -206,7 +206,7 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr
sdr::overlay::OverlayPrimitive2DSequenceObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aContent);
xTargetOverlay->add(*pNew);
- maObjects.append(*pNew);
+ maObjects.append(pNew);
}
}
else
@@ -220,7 +220,7 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aPolyPolygon);
xTargetOverlay->add(*pNew);
- maObjects.append(*pNew);
+ maObjects.append(pNew);
}
}
}
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index eef8cf5a7ee5..ba72794a8193 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -60,13 +60,18 @@ namespace sdr
maVector.clear();
}
+ void OverlayObjectList::append(OverlayObject* pOverlayObject)
+ {
+ assert(pOverlayObject && "tried to add invalid OverlayObject to OverlayObjectList");
+ maVector.push_back(pOverlayObject);
+ }
+
bool OverlayObjectList::isHitLogic(const basegfx::B2DPoint& rLogicPosition, double fLogicTolerance) const
{
if(!maVector.empty())
{
OverlayObjectVector::const_iterator aStart(maVector.begin());
sdr::overlay::OverlayObject* pFirst = *aStart;
- OSL_ENSURE(pFirst, "Corrupt OverlayObjectList (!)");
OverlayManager* pManager = pFirst->getOverlayManager();
if(pManager)
@@ -97,7 +102,6 @@ namespace sdr
for(; aStart != maVector.end(); ++aStart)
{
sdr::overlay::OverlayObject* pCandidate = *aStart;
- OSL_ENSURE(pCandidate, "Corrupt OverlayObjectList (!)");
if(pCandidate->isHittable())
{
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index d3b0a2872eea..3dcda7360448 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -77,7 +77,7 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aB2DPolyPolygon);
xTargetOverlay->add(*pNew);
- maObjects.append(*pNew);
+ maObjects.append(pNew);
// glue points
for(sal_uInt16 i(0); i < 4; i++)
@@ -101,7 +101,7 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aTempPolyPoly);
xTargetOverlay->add(*pNew);
- maObjects.append(*pNew);
+ maObjects.append(pNew);
}
}
}
@@ -153,7 +153,7 @@ void ImpSdrCreateViewExtraData::CreateAndShowOverlay(const SdrCreateView& rView,
sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
xOverlayManager->add(*pNew);
- maObjects.append(*pNew);
+ maObjects.append(pNew);
}
if(rPolyPoly.count())
@@ -161,7 +161,7 @@ void ImpSdrCreateViewExtraData::CreateAndShowOverlay(const SdrCreateView& rView,
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
rPolyPoly);
xOverlayManager->add(*pNew);
- maObjects.append(*pNew);
+ maObjects.append(pNew);
}
}
}
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 34b3a8b7a1a4..50d4da0800ff 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -788,7 +788,7 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
{
sdr::overlay::OverlayObject* pNewOverlayObject = new sdr::overlay::OverlayPrimitive2DSequenceObject(aResult);
rOverlayManager.add(*pNewOverlayObject);
- addToOverlayObjectList(*pNewOverlayObject);
+ addToOverlayObjectList(pNewOverlayObject);
}
if(!aResultTransparent.empty())
@@ -798,7 +798,7 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
sdr::overlay::OverlayObject* pNewOverlayObject = new sdr::overlay::OverlayPrimitive2DSequenceObject(aResultTransparent);
rOverlayManager.add(*pNewOverlayObject);
- addToOverlayObjectList(*pNewOverlayObject);
+ addToOverlayObjectList(pNewOverlayObject);
}
}
@@ -814,7 +814,7 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
aTopLeft, aBottomRight, true, false);
rOverlayManager.add(*pNew);
- addToOverlayObjectList(*pNew);
+ addToOverlayObjectList(pNew);
}
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 2f8a46854969..0b51b7ccf9f9 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -630,7 +630,7 @@ void SdrHdl::CreateB2dIAObject()
if (pNewOverlayObject)
{
xManager->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
+ maOverlayGroup.append(pNewOverlayObject);
}
}
}
@@ -1142,7 +1142,7 @@ void SdrHdlColor::CreateB2dIAObject()
// OVERLAYMANAGER
xManager->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
+ maOverlayGroup.append(pNewOverlayObject);
}
}
}
@@ -1307,7 +1307,7 @@ void SdrHdlGradient::CreateB2dIAObject()
pNewOverlayObject->setBaseColor(IsGradient() ? Color(COL_BLACK) : Color(COL_BLUE));
xManager->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
+ maOverlayGroup.append(pNewOverlayObject);
// arrowhead
Point aLeft(aMidPoint.X() + (sal_Int32)(aPerpend.getX() * fHalfArrowWidth),
@@ -1329,7 +1329,7 @@ void SdrHdlGradient::CreateB2dIAObject()
DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
xManager->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
+ maOverlayGroup.append(pNewOverlayObject);
}
}
}
@@ -1457,7 +1457,7 @@ void SdrHdlLine::CreateB2dIAObject()
pNewOverlayObject->setBaseColor(Color(COL_LIGHTRED));
xManager->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
+ maOverlayGroup.append(pNewOverlayObject);
}
}
}
@@ -1517,7 +1517,7 @@ void SdrHdlBezWgt::CreateB2dIAObject()
pNewOverlayObject->setBaseColor(Color(COL_LIGHTBLUE));
xManager->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
+ maOverlayGroup.append(pNewOverlayObject);
}
}
}
@@ -1563,7 +1563,7 @@ void E3dVolumeMarker::CreateB2dIAObject()
pNewOverlayObject->setBaseColor(Color(COL_BLACK));
xManager->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
+ maOverlayGroup.append(pNewOverlayObject);
}
}
}
@@ -1629,7 +1629,7 @@ void ImpEdgeHdl::CreateB2dIAObject()
if (pNewOverlayObject)
{
xManager->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
+ maOverlayGroup.append(pNewOverlayObject);
}
}
}
@@ -1750,7 +1750,7 @@ void ImpMeasureHdl::CreateB2dIAObject()
if (pNewOverlayObject)
{
xManager->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
+ maOverlayGroup.append(pNewOverlayObject);
}
}
}
@@ -1821,7 +1821,7 @@ void ImpTextframeHdl::CreateB2dIAObject()
// OVERLAYMANAGER
pNewOverlayObject->setHittable(false);
xManager->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
+ maOverlayGroup.append(pNewOverlayObject);
}
}
}
@@ -2437,7 +2437,7 @@ void SdrCropHdl::CreateB2dIAObject()
if(pOverlayObject)
{
xManager->add(*pOverlayObject);
- maOverlayGroup.append(*pOverlayObject);
+ maOverlayGroup.append(pOverlayObject);
}
}
}
@@ -2651,7 +2651,7 @@ void SdrCropViewHdl::CreateB2dIAObject()
pNew->setHittable(false);
xManager->add(*pNew);
- maOverlayGroup.append(*pNew);
+ maOverlayGroup.append(pNew);
}
}
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index c379541d4dd8..d02747a0c177 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -93,7 +93,7 @@ ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx:
sdr::overlay::OverlayRollingRectangleStriped* pNew = new sdr::overlay::OverlayRollingRectangleStriped(
rStartPos, rStartPos, false);
xTargetOverlay->add(*pNew);
- maObjects.append(*pNew);
+ maObjects.append(pNew);
}
}
}
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index bacf45228936..3d6167d8dd5a 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -62,7 +62,7 @@ ImplPageOriginOverlay::ImplPageOriginOverlay(const SdrPaintView& rView, const ba
sdr::overlay::OverlayCrosshairStriped* aNew = new sdr::overlay::OverlayCrosshairStriped(
maPosition);
xTargetOverlay->add(*aNew);
- maObjects.append(*aNew);
+ maObjects.append(aNew);
}
}
}
@@ -140,7 +140,7 @@ ImplHelpLineOverlay::ImplHelpLineOverlay(
sdr::overlay::OverlayHelplineStriped* aNew = new sdr::overlay::OverlayHelplineStriped(
maPosition, meHelpLineKind);
xTargetOverlay->add(*aNew);
- maObjects.append(*aNew);
+ maObjects.append(aNew);
}
}
}
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index ace5cef55ebd..f69d59242cc7 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -104,7 +104,7 @@ void SdrDropMarkerOverlay::ImplCreateOverlays(
rLinePolyPolygon);
xTargetOverlay->add(*pNew);
- maObjects.append(*pNew);
+ maObjects.append(pNew);
}
}
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index fc5acd491ba8..600495aadc82 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2118,7 +2118,7 @@ void SvxTableController::updateSelectionOverlay()
xOverlayManager->add(*pOverlay);
mpSelectionOverlay = new sdr::overlay::OverlayObjectList;
- mpSelectionOverlay->append(*pOverlay);
+ mpSelectionOverlay->append(pOverlay);
}
}
}
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index a6645d2fe37a..63b2ac8f4d47 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -176,7 +176,7 @@ void TableEdgeHdl::CreateB2dIAObject()
// create overlay object for visible parts
sdr::overlay::OverlayObject* pOverlayObject = new OverlayTableEdge(aVisible, true);
xManager->add(*pOverlayObject);
- maOverlayGroup.append(*pOverlayObject);
+ maOverlayGroup.append(pOverlayObject);
}
if(aInvisible.count())
@@ -186,7 +186,7 @@ void TableEdgeHdl::CreateB2dIAObject()
// (see OverlayTableEdge implementation)
sdr::overlay::OverlayObject* pOverlayObject = new OverlayTableEdge(aInvisible, false);
xManager->add(*pOverlayObject);
- maOverlayGroup.append(*pOverlayObject);
+ maOverlayGroup.append(pOverlayObject);
}
}
}
@@ -293,7 +293,7 @@ void TableBorderHdl::CreateB2dIAObject()
aHilightColor, fTransparence,
fWidth, 0.0, 0.0, bAnimate);
xManager->add(*pOverlayObject);
- maOverlayGroup.append(*pOverlayObject);
+ maOverlayGroup.append(pOverlayObject);
}
}
}