summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobo <obo@openoffice.org>2011-03-16 13:51:10 +0100
committerobo <obo@openoffice.org>2011-03-16 13:51:10 +0100
commit78f80b020fe009bc48e9e5f8b7862de51f1f8381 (patch)
tree29edfb9c85defc607eb245d26e0fbdd1c3818564
parent42aa6d935d8fb5552e1d647c0cd65aa1a53fcb36 (diff)
masterfix DEV300: #i117352#,#i10000# WaE converting to non-pointer type sal_uInt16 from NULL
Notes
split repo tag: libs-gui_ooo/DEV300_m103
-rw-r--r--svl/source/undo/undo.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index af22c04c79ff..fae0250e9002 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -711,7 +711,7 @@ sal_uInt16 SfxUndoManager::GetUndoActionId() const
DBG_ASSERT( m_pData->pActUndoArray->nCurUndoAction > 0, "svl::SfxUndoManager::GetUndoActionId(), illegal id!" );
if ( m_pData->pActUndoArray->nCurUndoAction == 0 )
- return NULL;
+ return 0;
return m_pData->pActUndoArray->aUndoActions[m_pData->pActUndoArray->nCurUndoAction-1].pAction->GetId();
}