[Libreoffice-commits] core.git: chart2/source include/svx sc/source sd/source svx/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Mon Jan 23 13:51:15 UTC 2017
chart2/source/controller/main/DragMethod_RotateDiagram.cxx | 2 -
include/svx/sdr/overlay/overlayobjectlist.hxx | 6 ++-
include/svx/svddrgmt.hxx | 4 +-
sc/source/ui/view/gridwin.cxx | 14 +++----
sc/source/ui/view/tabview3.cxx | 4 +-
sd/source/ui/animations/motionpathtag.cxx | 2 -
sd/source/ui/annotations/annotationtag.cxx | 2 -
sd/source/ui/view/viewoverlaymanager.cxx | 2 -
svx/source/engine3d/dragmt3d.cxx | 2 -
svx/source/engine3d/view3d.cxx | 4 +-
svx/source/sdr/overlay/overlayobjectlist.cxx | 8 +++-
svx/source/svdraw/svdcrtv.cxx | 8 ++--
svx/source/svdraw/svddrgmt.cxx | 6 +--
svx/source/svdraw/svdhdl.cxx | 24 ++++++-------
svx/source/svdraw/svdmrkv.cxx | 2 -
svx/source/svdraw/svdsnpv.cxx | 4 +-
svx/source/svdraw/svdview.cxx | 2 -
svx/source/table/tablecontroller.cxx | 2 -
svx/source/table/tablehandles.cxx | 6 +--
19 files changed, 55 insertions(+), 49 deletions(-)
New commits:
commit abc8057ab1a1189ff7f88d42b13b363ceb228d16
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Mon Jan 23 09:01:42 2017 +0100
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 at libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 543f32e..5595977 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -215,7 +215,7 @@ void DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage
sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aPolyPolygon);
rOverlayManager.add(*pNew);
- addToOverlayObjectList(*pNew);
+ addToOverlayObjectList(pNew);
}
}
} //namespace chart
diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx
index c8e670d..b348b3c 100644
--- a/include/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/include/svx/sdr/overlay/overlayobjectlist.hxx
@@ -39,13 +39,15 @@ namespace sdr
public:
OverlayObjectList() {}
+ OverlayObjectList(const OverlayObjectList&) = delete;
+ OverlayObjectList& operator=(const OverlayObjectList&) = delete;
~OverlayObjectList();
// clear list, this includes deletion of all contained objects
void clear();
- // append objects
- void append(OverlayObject& rOverlayObject) { maVector.push_back(&rOverlayObject); }
+ // append objects (takes ownership)
+ void append(OverlayObject* pOverlayObject);
// access to objects
sal_uInt32 count() const { return maVector.size(); }
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index df51ea8..e328629 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -128,8 +128,8 @@ protected:
virtual void createSdrDragEntries();
virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact);
- // access for derivated classes to maOverlayObjectList
- void addToOverlayObjectList(sdr::overlay::OverlayObject& rNew) { maOverlayObjectList.append(rNew); }
+ // access for derivated classes to maOverlayObjectList (passes ownership)
+ void addToOverlayObjectList(sdr::overlay::OverlayObject* pNew) { maOverlayObjectList.append(pNew); }
// access for derivated classes to mrSdrDragView
SdrDragView& getSdrDragView() { return mrSdrDragView; }
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 578fd2a..3ac3af0 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5848,7 +5848,7 @@ void ScGridWindow::UpdateCopySourceOverlay()
::basegfx::B2DRange aRange(aLogic.Left(), aLogic.Top(), aLogic.Right(), aLogic.Bottom());
ScOverlayDashedBorder* pDashedBorder = new ScOverlayDashedBorder(aRange, aHighlight);
xOverlayManager->add(*pDashedBorder);
- mpOOSelectionBorder->append(*pDashedBorder);
+ mpOOSelectionBorder->append(pDashedBorder);
}
if ( aOldMode != aDrawMode )
@@ -6066,7 +6066,7 @@ void ScGridWindow::UpdateCursorOverlay()
xOverlayManager->add(*pOverlay);
mpOOCursors.reset(new sdr::overlay::OverlayObjectList);
- mpOOCursors->append(*pOverlay);
+ mpOOCursors->append(pOverlay);
// notify the LibreOfficeKit too
updateLibreOfficeKitSelection(pViewData, aPixelRects);
@@ -6142,7 +6142,7 @@ void ScGridWindow::UpdateSelectionOverlay()
xOverlayManager->add(*pOverlay);
mpOOSelection.reset(new sdr::overlay::OverlayObjectList);
- mpOOSelection->append(*pOverlay);
+ mpOOSelection->append(pOverlay);
// notify the LibreOfficeKit too
updateLibreOfficeKitSelection(pViewData, aPixelRects);
@@ -6239,7 +6239,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
xOverlayManager->add(*pOverlay);
mpOOAutoFill.reset(new sdr::overlay::OverlayObjectList);
- mpOOAutoFill->append(*pOverlay);
+ mpOOAutoFill->append(pOverlay);
}
if ( aOldMode != aDrawMode )
@@ -6366,7 +6366,7 @@ void ScGridWindow::UpdateDragRectOverlay()
xOverlayManager->add(*pOverlay);
mpOODragRect.reset(new sdr::overlay::OverlayObjectList);
- mpOODragRect->append(*pOverlay);
+ mpOODragRect->append(pOverlay);
}
}
@@ -6412,7 +6412,7 @@ void ScGridWindow::UpdateHeaderOverlay()
xOverlayManager->add(*pOverlay);
mpOOHeader.reset(new sdr::overlay::OverlayObjectList);
- mpOOHeader->append(*pOverlay);
+ mpOOHeader->append(pOverlay);
}
}
@@ -6479,7 +6479,7 @@ void ScGridWindow::UpdateShrinkOverlay()
xOverlayManager->add(*pOverlay);
mpOOShrink.reset(new sdr::overlay::OverlayObjectList);
- mpOOShrink->append(*pOverlay);
+ mpOOShrink->append(pOverlay);
}
}
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 58a846c..98bdecf 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -733,7 +733,7 @@ void ScTabView::TestHintWindow()
ScOverlayHint* pOverlay = new ScOverlayHint(aTitle, aMessage, aCommentColor, pFrameWin->GetFont());
mxInputHintOO.reset(new sdr::overlay::OverlayObjectList);
- mxInputHintOO->append(*pOverlay);
+ mxInputHintOO->append(pOverlay);
Size aHintWndSize = pOverlay->GetSizePixel();
long nCellSizeX = 0;
@@ -767,7 +767,7 @@ void ScTabView::TestHintWindow()
ScOverlayHint* pOtherOverlay = new ScOverlayHint(aTitle, aMessage, aCommentColor, pFrameWin->GetFont());
Point aFooPos(pWindow->PixelToLogic(aOtherPos, pWindow->GetDrawMapMode()));
pOtherOverlay->SetPos(aFooPos, pWindow->GetDrawMapMode());
- mxInputHintOO->append(*pOtherOverlay);
+ mxInputHintOO->append(pOtherOverlay);
xOverlayManager->add(*pOtherOverlay);
}
}
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 3d5c436..a05b011 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -289,7 +289,7 @@ void SdPathHdl::CreateB2dIAObject()
sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
xManager->add(*pNew);
- maOverlayGroup.append(*pNew);
+ maOverlayGroup.append(pNew);
}
}
}
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index fe740b5..0251af2 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -225,7 +225,7 @@ void AnnotationHdl::CreateB2dIAObject()
}
xManager->add(*pOverlayObject);
- maOverlayGroup.append(*pOverlayObject);
+ maOverlayGroup.append(pOverlayObject);
}
}
}
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 008705d..476593a 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -240,7 +240,7 @@ void ImageButtonHdl::CreateB2dIAObject()
pOverlayObject = new sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 );
xManager->add(*pOverlayObject);
- maOverlayGroup.append(*pOverlayObject);
+ maOverlayGroup.append(pOverlayObject);
}
}
}
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index eb4d6c2..fef392f 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 b60bf78..7b78e62 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 eef8cf5..ba72794 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 d3b0a28..3dcda73 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 34b3a8b..50d4da0 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 2f8a468..0b51b7c 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 c379541..d02747a 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 bacf452..3d6167d 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 ace5cef..f69d592 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 fc5acd4..600495a 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 a6645d2..63b2ac8 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);
}
}
}
More information about the Libreoffice-commits
mailing list