summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svx/source/svdraw/svdedtv.cxx1
-rw-r--r--svx/source/svdraw/svdundo.cxx9
2 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index b019f26ae47a..fbde60ff197f 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -288,6 +288,7 @@ void SdrEditView::DeleteLayer(const OUString& rName)
if( bUndo )
{
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteLayer(nLayerNum, rLA, *mpModel));
+ // coverity[leaked_storage] - ownership transferred to UndoDeleteLayer
rLA.RemoveLayer(nLayerNum).release();
EndUndo();
}
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 792b62b7a76f..9d104230b36e 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1309,13 +1309,13 @@ SdrUndoLayer::~SdrUndoLayer()
}
}
-
void SdrUndoNewLayer::Undo()
{
DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer already belongs to UndoAction.");
bItsMine=true;
- SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNum).release();
- DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoNewLayer::Undo(): Removed layer is != pLayer.");
+ // coverity[leaked_storage] - owned by this SdrUndoNewLayer as pLayer
+ SdrLayer* pCmpLayer = pLayerAdmin->RemoveLayer(nNum).release();
+ assert(pCmpLayer == pLayer && "SdrUndoNewLayer::Undo(): Removed layer is != pLayer."); (void)pCmpLayer;
}
void SdrUndoNewLayer::Redo()
@@ -1342,8 +1342,9 @@ void SdrUndoDelLayer::Redo()
{
DBG_ASSERT(!bItsMine,"SdrUndoDelLayer::Undo(): Layer already belongs to UndoAction.");
bItsMine=true;
+ // coverity[leaked_storage] - owned by this SdrUndoNewLayer as pLayer
SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNum).release();
- DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoDelLayer::Redo(): Removed layer is != pLayer.");
+ assert(pCmpLayer == pLayer && "SdrUndoDelLayer::Redo(): Removed layer is != pLayer."); (void)pCmpLayer;
}
OUString SdrUndoDelLayer::GetComment() const