diff options
author | obo <obo@openoffice.org> | 2011-03-16 13:51:10 +0100 |
---|---|---|
committer | obo <obo@openoffice.org> | 2011-03-16 13:51:10 +0100 |
commit | 78f80b020fe009bc48e9e5f8b7862de51f1f8381 (patch) | |
tree | 29edfb9c85defc607eb245d26e0fbdd1c3818564 | |
parent | CWS-TOOLING: integrate CWS vcl120 (diff) | |
download | core-78f80b020fe009bc48e9e5f8b7862de51f1f8381.tar.gz core-78f80b020fe009bc48e9e5f8b7862de51f1f8381.zip |
masterfix DEV300: #i117352#,#i10000# WaE converting to non-pointer type sal_uInt16 from NULL
-rw-r--r-- | svl/source/undo/undo.cxx | 2 |
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(); } |